From f3a63c0bf69834512c965e679e32b815c3a0352b Mon Sep 17 00:00:00 2001 From: Genevieve Buckley <30920819+GenevieveBuckley@users.noreply.github.com> Date: Wed, 10 May 2023 17:46:14 +1000 Subject: [PATCH 1/5] Drop Python 3.8, in accordance with NEP29 recommendation --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- continuous_integration/environment-3.8.yml | 20 -------------------- continuous_integration/environment-doc.yml | 4 ++-- continuous_integration/gpuci/axis.yaml | 4 ++-- setup.py | 1 - 5 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 continuous_integration/environment-3.8.yml diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f80967e8..1ec2a9d0 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -4,4 +4,4 @@ Before you submit a pull request, check that it meets these guidelines: 2. If the pull request adds functionality, the docs should be updated. Put your new functionality into a function with a docstring, and add the feature to the list in README.rst. -3. The pull request should work for Python 3.8, 3.9, 3.10 and 3.1. +3. The pull request should work for Python 3.9, 3.10 and 3.1. diff --git a/continuous_integration/environment-3.8.yml b/continuous_integration/environment-3.8.yml deleted file mode 100644 index 3743f314..00000000 --- a/continuous_integration/environment-3.8.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: dask-image-testenv - -channels: - - conda-forge - -dependencies: - - python=3.8.* - - pip==22.0.3 - - wheel==0.37.1 - - coverage==6.3.1 - - flake8==4.0.1 - - pytest==7.0.0 - - pytest-cov==4.0.0 - - pytest-flake8==1.0.7 - - dask==2021.10.0 - - numpy==1.22.2 - - scipy==1.8.0 - - scikit-image==0.19.1 - - pims==0.5 - - slicerator==1.0.0 diff --git a/continuous_integration/environment-doc.yml b/continuous_integration/environment-doc.yml index 2ca3be44..f0658962 100644 --- a/continuous_integration/environment-doc.yml +++ b/continuous_integration/environment-doc.yml @@ -4,12 +4,12 @@ channels: - conda-forge dependencies: - - python=3.8.* + - python=3.9.* - pip==22.3 - wheel==0.37.1 - sphinx==5.3.0 - jinja2<3.1 - - dask==2021.10.0 + - dask==2023.2.0 - numpy==1.23.4 - scipy==1.9.2 - scikit-image==0.19.3 diff --git a/continuous_integration/gpuci/axis.yaml b/continuous_integration/gpuci/axis.yaml index e39a72e8..e66da2c2 100644 --- a/continuous_integration/gpuci/axis.yaml +++ b/continuous_integration/gpuci/axis.yaml @@ -1,6 +1,6 @@ PYTHON_VER: -- "3.8" -- "3.10" +- "3.9" +- "3.11" CUDA_VER: - "11.5" diff --git a/setup.py b/setup.py index dad9a84f..82b20d2c 100644 --- a/setup.py +++ b/setup.py @@ -70,7 +70,6 @@ def run_tests(self): "License :: OSI Approved :: BSD License", "Natural Language :: English", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", From 8c919a7a97aa393f3ee39d805e8f9f92582549af Mon Sep 17 00:00:00 2001 From: Genevieve Buckley <30920819+GenevieveBuckley@users.noreply.github.com> Date: Wed, 10 May 2023 17:55:10 +1000 Subject: [PATCH 2/5] Remove python 3.8 from continuous integration matrix --- .github/workflows/test_and_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 64902de7..0b9c5ef1 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -16,7 +16,7 @@ jobs: fail-fast: true matrix: os: ["windows-latest", "ubuntu-latest", "macos-latest"] - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.9", "3.10", "3.11"] steps: - name: Checkout source From 0f91b2b4916629649a1303ebfbef897c2c4b23af Mon Sep 17 00:00:00 2001 From: Genevieve Buckley <30920819+GenevieveBuckley@users.noreply.github.com> Date: Wed, 10 May 2023 18:00:35 +1000 Subject: [PATCH 3/5] Pin min versions dask 2023.3.0 and pandas 2.0.0, for pandas compatibility --- continuous_integration/environment-3.10.yml | 1 + continuous_integration/environment-3.11.yml | 1 + continuous_integration/environment-3.9.yml | 3 ++- continuous_integration/environment-doc.yml | 1 + setup.py | 4 +++- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/continuous_integration/environment-3.10.yml b/continuous_integration/environment-3.10.yml index a4b3a8f1..e4b5f097 100644 --- a/continuous_integration/environment-3.10.yml +++ b/continuous_integration/environment-3.10.yml @@ -18,3 +18,4 @@ dependencies: - scikit-image==0.19.3 - pims==0.6.1 - slicerator==1.1.0 + - pandas==2.0.0 diff --git a/continuous_integration/environment-3.11.yml b/continuous_integration/environment-3.11.yml index 599b2275..b9019bbb 100644 --- a/continuous_integration/environment-3.11.yml +++ b/continuous_integration/environment-3.11.yml @@ -18,3 +18,4 @@ dependencies: - scikit-image==0.19.3 - pims==0.6.1 - slicerator==1.1.0 + - pandas==2.0.0 diff --git a/continuous_integration/environment-3.9.yml b/continuous_integration/environment-3.9.yml index 386e4655..9c4e79ac 100644 --- a/continuous_integration/environment-3.9.yml +++ b/continuous_integration/environment-3.9.yml @@ -12,9 +12,10 @@ dependencies: - pytest==6.2.5 - pytest-cov==4.0.0 - pytest-flake8==1.0.7 - - dask==2022.1.1 + - dask==2023.2.1 - numpy==1.22.1 - scipy==1.7.3 - scikit-image==0.19.1 - pims==0.5 - slicerator==1.0.0 + - pandas==2.0.0 diff --git a/continuous_integration/environment-doc.yml b/continuous_integration/environment-doc.yml index f0658962..1ab2e486 100644 --- a/continuous_integration/environment-doc.yml +++ b/continuous_integration/environment-doc.yml @@ -15,5 +15,6 @@ dependencies: - scikit-image==0.19.3 - pims==0.6.1 - slicerator==1.1.0 + - pandas==2.0.0 - pip: - dask-sphinx-theme>=3.0.0 diff --git a/setup.py b/setup.py index 82b20d2c..260d5e8b 100644 --- a/setup.py +++ b/setup.py @@ -29,11 +29,13 @@ def run_tests(self): history = history_file.read() requirements = [ - "dask[array] >=2021.10.0", + "dask[array] >=2023.2.0", + "dask[dataframe] >=2023.2.0", "numpy >=1.18", "scipy >=0.19.1", "pims >=0.4.1", "tifffile >=2018.10.18", + "pandas >=2.0.0", ] test_requirements = [ From 8f24e74b27959c3d90fdbece9032f3771b30053b Mon Sep 17 00:00:00 2001 From: Genevieve Buckley <30920819+GenevieveBuckley@users.noreply.github.com> Date: Wed, 10 May 2023 18:15:28 +1000 Subject: [PATCH 4/5] Remove pandas pinned version, will this fix the GPU CI? --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 260d5e8b..6de06b3c 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,6 @@ def run_tests(self): "scipy >=0.19.1", "pims >=0.4.1", "tifffile >=2018.10.18", - "pandas >=2.0.0", ] test_requirements = [ From 457f71751fd33e885eb15ff0add92c5c93418ec3 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 10 May 2023 14:10:18 -0700 Subject: [PATCH 5/5] Stick to Python 3.10 gpuCI images (not 3.11 yet) Python 3.11 images are not available yet. So stick to Python 3.10 images until that changes. Co-authored-by: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com> --- continuous_integration/gpuci/axis.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/continuous_integration/gpuci/axis.yaml b/continuous_integration/gpuci/axis.yaml index e66da2c2..225bd32a 100644 --- a/continuous_integration/gpuci/axis.yaml +++ b/continuous_integration/gpuci/axis.yaml @@ -1,6 +1,6 @@ PYTHON_VER: - "3.9" -- "3.11" +- "3.10" CUDA_VER: - "11.5"