From f9ba2a6de1843e9fca4606dfb252f67dcbe30a93 Mon Sep 17 00:00:00 2001 From: Tyler Romero Date: Tue, 3 Dec 2024 14:00:41 -0800 Subject: [PATCH 1/3] Temporarily remove Python 3.13 from test matrix --- .github/workflows/cicd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index b97926d2..082f1952 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -138,7 +138,7 @@ jobs: "3.10", "3.11", "3.12", - "3.13", + # "3.13", # TODO: fix poetry install issue with 3.13 ] install_extras: [true, false] steps: From adc41357d340f11a4eb1517ad996d82d7e4f0ab8 Mon Sep 17 00:00:00 2001 From: Tyler Romero Date: Tue, 3 Dec 2024 14:08:56 -0800 Subject: [PATCH 2/3] Try something else --- .github/workflows/cicd.yaml | 5 +++-- pyproject.toml | 18 +++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index 082f1952..de772556 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -119,7 +119,8 @@ jobs: if: >- github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') || - endsWith(github.ref, '-fulltest') + endsWith(github.ref, '-fulltest') || + endsWith(github.ref, '-from-tests-temp') needs: - test-simple - test-docs @@ -138,7 +139,7 @@ jobs: "3.10", "3.11", "3.12", - # "3.13", # TODO: fix poetry install issue with 3.13 + "3.13", ] install_extras: [true, false] steps: diff --git a/pyproject.toml b/pyproject.toml index 11c7fbc9..4119b161 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,8 +15,8 @@ version = "0.19.0" # For certifi, use ">=" instead of "^" since it upgrades its "major version" every year, not really following semver certifi = ">=2023.7.22" frozendict = "^2.3.2" -pillow = ">=9.0.0" # TODO: We may want to mark pillow (and numpy) as extra (https://python-poetry.org/docs/master/pyproject#extras) -pydantic = ">=2.0,<3.0.0" +pillow = ">=11.0.0" # TODO: We may want to mark pillow (and numpy) as extra (https://python-poetry.org/docs/master/pyproject#extras) +pydantic = "^2.0.0" python = ">=3.9,<4.0" python-dateutil = "^2.9.0" requests = "^2.28.2" @@ -42,14 +42,14 @@ types-requests = "^2.28.11.17" [tool.poetry.group.sphinx-deps.dependencies] # These are extra / stricter dependencies required to build the API reference docs -Sphinx = {version = "7.2.6", python = ">=3.9.0,<4.0"} -autodoc-pydantic = {version = "2.0.1", python = ">=3.9.0,<4.0"} -pillow = "^9.0.0" -pydantic = "^2.0" -python = ">=3.9.0,<4.0" +Sphinx = {version = "^7.2.6", python = ">=3.9,<4.0"} +autodoc-pydantic = {version = "^2.0.1", python = ">=3.9,<4.0"} +pillow = "^11.0.0" +pydantic = "^2.0.0" +python = ">=3.9,<4.0" python-dateutil = "^2.8.2" -sphinx-rtd-theme = {version = "1.3.0", python = ">=3.9.0,<4.0"} -toml = "0.10.2" +sphinx-rtd-theme = {version = "^1.3.0", python = ">=3.9,<4.0"} +toml = "^0.10.2" [tool.poetry.scripts] groundlight = "groundlight.cli:groundlight" From 858b0af1fb29559f6c7ff19683232f1dbd03de69 Mon Sep 17 00:00:00 2001 From: Tyler Romero Date: Tue, 3 Dec 2024 16:01:46 -0800 Subject: [PATCH 3/3] Apply suggestions from code review --- .github/workflows/cicd.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index de772556..b97926d2 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -119,8 +119,7 @@ jobs: if: >- github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') || - endsWith(github.ref, '-fulltest') || - endsWith(github.ref, '-from-tests-temp') + endsWith(github.ref, '-fulltest') needs: - test-simple - test-docs