From 3c953ccb10b906f08d54b765129225eacfab8d7c Mon Sep 17 00:00:00 2001 From: Austin Noto-Moniz Date: Wed, 7 Feb 2024 09:33:18 -0500 Subject: [PATCH] Fix Sphinx and pint dependencies. Python 3.8 support requires a bit more tightly bound requirements. Namely, Sphinx can only go up to 7.1.x, and pint must be kept <= 0.20. --- .github/workflows/pr-checks.yml | 1 + .github/workflows/pr-tests.yml | 2 ++ setup.py | 4 +++- test_requirements.txt | 4 ++-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index bdb2d58c4..2e0e2e418 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -4,6 +4,7 @@ on: pull_request: branches: - main + - 'release/**' jobs: check-version: diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml index 5e4c9eb4f..effb72a15 100644 --- a/.github/workflows/pr-tests.yml +++ b/.github/workflows/pr-tests.yml @@ -4,11 +4,13 @@ on: pull_request: branches: - main + - 'release/**' jobs: run-tests: name: Execute unit tests runs-on: ubuntu-latest + continue-on-error: true strategy: matrix: python-version: ["3.8", "3.9", "3.10", "3.11"] diff --git a/setup.py b/setup.py index afd592ca0..011fee4af 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,9 @@ "boto3>=1.34.35,<2", "deprecation>=2.1.0,<3", "urllib3>=1.26.18,<3", - "tqdm>=4.27.0,<5" + "tqdm>=4.27.0,<5", + "pint<=0.20; python_version < '3.9'", + "pint<0.24; python_version >= '3.9'" ], extras_require={ "../tests": [ diff --git a/test_requirements.txt b/test_requirements.txt index 5151ad7fd..9581b6e0c 100644 --- a/test_requirements.txt +++ b/test_requirements.txt @@ -7,6 +7,6 @@ pytest==8.0.0 pytest-cov==4.1.0 pytz==2024.1 requests-mock==1.11.0 -sphinx==7.2.6 +sphinx==7.1.2 sphinx-rtd-theme==2.0.0 -sphinxcontrib-apidoc==0.5.0 +sphinxcontrib-apidoc==0.4.0