From 5204ad9886eab57958873c262a8ed48ebc5a8385 Mon Sep 17 00:00:00 2001 From: Mark Date: Fri, 10 Nov 2023 10:57:06 +0000 Subject: [PATCH 1/7] Updating deps. --- poetry.lock | 2 +- pyproject.toml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/poetry.lock b/poetry.lock index c7d433a..be0b587 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 = "e71c4fce6d885bd448020e82bdda3c06f8d82abeff35846d4305f0e0419c8e5b" diff --git a/pyproject.toml b/pyproject.toml index 2d5f59d..d3e5a30 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,6 +16,8 @@ pandas = "^1.5.3" datasets = "^2.14.0" langdetect = "^1.0.9" deprecation = "^2.1.0" + +[tool.poetry.group.vespa.dependencies] pyvespa = "^0.37.1" pyyaml = "^6.0.1" sentence-transformers = "^2.2.2" From d7d3b8c6d5fc6fb07cbf24036286305df66e6286 Mon Sep 17 00:00:00 2001 From: Mark Date: Fri, 10 Nov 2023 16:25:54 +0000 Subject: [PATCH 2/7] Updating group deps. --- poetry.lock | 2 +- pyproject.toml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/poetry.lock b/poetry.lock index be0b587..9a0bf0c 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 = "e71c4fce6d885bd448020e82bdda3c06f8d82abeff35846d4305f0e0419c8e5b" +content-hash = "ddd79ce6c238c065d84f216822da76c58f05bbc543ab6c9ae8936d4bd9943c4b" diff --git a/pyproject.toml b/pyproject.toml index d3e5a30..eaf3fb5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,6 +17,9 @@ 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" From 38a199d5d580e97faeb6b863aa8c27b66f81097a Mon Sep 17 00:00:00 2001 From: Mark Date: Fri, 10 Nov 2023 16:28:20 +0000 Subject: [PATCH 3/7] Installing with group. --- .github/workflows/pre-commit.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 59c0b87..9c151c1 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 && poetry run pre-commit install - name: Run pre-commit checks run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bc5aea2..8084df7 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 - name: Run test suite run: | poetry run python -m pytest -vvv From ddd6ac7c066566fe39f81c29d49d36e1c89a13c5 Mon Sep 17 00:00:00 2001 From: Mark Date: Fri, 10 Nov 2023 16:32:40 +0000 Subject: [PATCH 4/7] Updating version. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index eaf3fb5..bbef7a3 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" From 7a82400bce89be34008a8bd2fa4d26c14c936072 Mon Sep 17 00:00:00 2001 From: Mark Date: Fri, 10 Nov 2023 16:39:25 +0000 Subject: [PATCH 5/7] Remove the v not the first element. --- .github/workflows/check-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From c0045ed3d2ce3f3fcdad0db80c00c53a272657a4 Mon Sep 17 00:00:00 2001 From: Mark Date: Mon, 13 Nov 2023 09:31:52 +0000 Subject: [PATCH 6/7] Adding dev as an optional dep. --- .github/workflows/pre-commit.yml | 2 +- .github/workflows/test.yml | 2 +- poetry.lock | 2 +- pyproject.toml | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 9c151c1..003894b 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 --with vespa && poetry run pre-commit install + python -m pip install "poetry==1.3.2" && poetry install --with vespa --with dev - name: Run pre-commit checks run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8084df7..a412d62 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 --with vespa + python -m pip install "poetry==1.3.2" && poetry install --with vespa --with dev - name: Run test suite run: | poetry run python -m pytest -vvv diff --git a/poetry.lock b/poetry.lock index 9a0bf0c..082566a 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 = "ddd79ce6c238c065d84f216822da76c58f05bbc543ab6c9ae8936d4bd9943c4b" +content-hash = "b8e1b06d327f3a6406f6b1a9969697a6804e9e0455eb8d8f4a67ae74f93866d6" diff --git a/pyproject.toml b/pyproject.toml index bbef7a3..2c659b8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,6 +26,9 @@ 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" From ff9530c552d1792392a9bdc6283e4ded65dc12c8 Mon Sep 17 00:00:00 2001 From: Mark Date: Mon, 13 Nov 2023 09:38:27 +0000 Subject: [PATCH 7/7] Adding extras as optional. --- .github/workflows/pre-commit.yml | 2 +- .github/workflows/test.yml | 2 +- poetry.lock | 2 +- pyproject.toml | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 003894b..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 --with vespa --with dev + 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 a412d62..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 --with vespa --with dev + 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 082566a..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 = "b8e1b06d327f3a6406f6b1a9969697a6804e9e0455eb8d8f4a67ae74f93866d6" +content-hash = "034531234eae69f63115c9a43468ba64aafdc49941185037917bb74d74120f97" diff --git a/pyproject.toml b/pyproject.toml index 2c659b8..4e74e79 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,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"