diff --git a/.github/workflows/check-version.yml b/.github/workflows/check-version.yml index a5ded80..bcca1f9 100644 --- a/.github/workflows/check-version.yml +++ b/.github/workflows/check-version.yml @@ -29,7 +29,7 @@ jobs: GITHUB_RELEASE_VERSION=$(curl --silent "https://api.github.com/repos/climatepolicyradar/data-access/releases/latest" | jq -r '.tag_name') # remove the "v" from the version - GITHUB_RELEASE_VERSION=${GITHUB_RELEASE_VERSION:1} + GITHUB_RELEASE_VERSION=${GITHUB_RELEASE_VERSION#v} echo "GITHUB_RELEASE_VERSION=${GITHUB_RELEASE_VERSION}" # Check that semver tag is greater than the github release version diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 59c0b87..18036dc 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -23,7 +23,7 @@ jobs: - name: Install dependencies run: | - python -m pip install "poetry==1.3.2" && poetry install && poetry run pre-commit install + python -m pip install "poetry==1.3.2" && poetry install --with vespa,dev,extras - name: Run pre-commit checks run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bc5aea2..ca5e881 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: - name: Install dependencies run: | - python -m pip install "poetry==1.3.2" && poetry install + python -m pip install "poetry==1.3.2" && poetry install --with vespa,dev,extras - name: Run test suite run: | poetry run python -m pytest -vvv diff --git a/poetry.lock b/poetry.lock index c7d433a..111aa93 100644 --- a/poetry.lock +++ b/poetry.lock @@ -3703,4 +3703,4 @@ multidict = ">=4.0" [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "16e43ff73b9c4d264df4589423f58ceb4cd31c5f3b3e5bc8f8cd35b18378af4e" +content-hash = "034531234eae69f63115c9a43468ba64aafdc49941185037917bb74d74120f97" diff --git a/pyproject.toml b/pyproject.toml index 2d5f59d..4e74e79 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "cpr-data-access" -version = "0.2.9" +version = "0.3.0" description = "" authors = ["CPR Tech "] readme = "README.md" @@ -16,11 +16,19 @@ pandas = "^1.5.3" datasets = "^2.14.0" langdetect = "^1.0.9" deprecation = "^2.1.0" + +[tool.poetry.group.vespa] +optional = true + +[tool.poetry.group.vespa.dependencies] pyvespa = "^0.37.1" pyyaml = "^6.0.1" sentence-transformers = "^2.2.2" torch = "2.0.0" +[tool.poetry.group.dev] +optional = true + [tool.poetry.group.dev.dependencies] pre-commit = "^2.20.0" pyright = "^1.1.281" @@ -29,6 +37,8 @@ black = "^22.10.0" moto = "^4.0.11" pytest-dotenv = "^0.5.2" +[tool.poetry.group.extras] +optional = true [tool.poetry.group.extras.dependencies] spacy = "^3.5.1"