From c576d5c57c5914dbf2e46fdd85c89e163e2a808e Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Tue, 31 Oct 2023 10:15:48 +0100 Subject: [PATCH 1/6] Drop 3.8 and add 3.12 --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- .github/workflows/python-package.yml | 2 +- .github/workflows/releases.yml | 2 +- .github/workflows/windows-testing.yml | 2 +- pyproject.toml | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index ba05f23fcc..ec98af029e 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -27,7 +27,7 @@ body: attributes: label: Python Version description: Version of Python interpreter - placeholder: 3.8.5, 3.9, 3.10, etc. + placeholder: 3.9, 3.10, 3.11, etc. validations: required: true - type: input diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index cdf230bc7c..9c28512ce1 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11'] + python-version: ['3.9', '3.10', '3.11', '3.12'] numpy_version: ['>=1.22.0', '==1.20.*'] exclude: - python-version: '3.10' diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index c08bfc6677..85b19a89b7 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/setup-python@v4.7.1 name: Install Python with: - python-version: '3.8' + python-version: '3.9' - name: Install PyBuild run: | diff --git a/.github/workflows/windows-testing.yml b/.github/workflows/windows-testing.yml index 3afa8c467e..3f8ba5f192 100644 --- a/.github/workflows/windows-testing.yml +++ b/.github/workflows/windows-testing.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: True matrix: - python-version: ['3.8', '3.9', '3.10', '3.11'] + python-version: ['3.9', '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v4 with: diff --git a/pyproject.toml b/pyproject.toml index 292bfddded..97435b57ff 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ readme = { file = "README.md", content-type = "text/markdown" } maintainers = [ { name = "Alistair Miles", email = "alimanfoo@googlemail.com" } ] -requires-python = ">=3.8" +requires-python = ">=3.9" dependencies = [ 'asciitree', 'numpy>=1.20,!=1.21.0', @@ -30,10 +30,10 @@ classifiers = [ 'Topic :: Software Development :: Libraries :: Python Modules', 'Operating System :: Unix', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', ] license = { text = "MIT" } @@ -119,7 +119,7 @@ exclude = ''' ''' [tool.mypy] -python_version = "3.8" +python_version = "3.9" ignore_missing_imports = true follow_imports = "silent" From 837854bec99a9d25aece2ead9666f01690d228cc Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Tue, 31 Oct 2023 10:34:52 +0100 Subject: [PATCH 2/6] Try removing line_profiler --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 9c28512ce1..4d49f160ca 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -60,7 +60,7 @@ jobs: run: | conda activate zarr-env python -m pip install --upgrade pip - python -m pip install -U pip setuptools wheel line_profiler + python -m pip install -U pip setuptools wheel python -m pip install -rrequirements_dev_minimal.txt numpy${{matrix.numpy_version}} -rrequirements_dev_optional.txt pymongo redis python -m pip install . python -m pip freeze From e2f6f2b18630f19eec7d8a9086071d2314ac910e Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Tue, 31 Oct 2023 10:51:04 +0100 Subject: [PATCH 3/6] Also bump the minimal numpy to 1.21 --- .github/workflows/python-package.yml | 6 +++--- environment.yml | 2 +- pyproject.toml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 4d49f160ca..9a545d31bb 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -16,12 +16,12 @@ jobs: strategy: matrix: python-version: ['3.9', '3.10', '3.11', '3.12'] - numpy_version: ['>=1.22.0', '==1.20.*'] + numpy_version: ['>=1.22.0', '==1.21.*'] exclude: - python-version: '3.10' - numpy_version: '==1.20.*' + numpy_version: '==1.21.*' - python-version: '3.11' - numpy_version: '==1.20.*' + numpy_version: '==1.21.*' services: redis: image: redis diff --git a/environment.yml b/environment.yml index dc99507427..ff2f9eedef 100644 --- a/environment.yml +++ b/environment.yml @@ -4,7 +4,7 @@ channels: dependencies: - wheel - numcodecs >= 0.6.4 - - numpy >= 1.20 + - numpy >= 1.21 - pip - pip: - asciitree diff --git a/pyproject.toml b/pyproject.toml index 97435b57ff..2ac9614eec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ maintainers = [ requires-python = ">=3.9" dependencies = [ 'asciitree', - 'numpy>=1.20,!=1.21.0', + 'numpy>=1.21.1', 'fasteners', 'numcodecs>=0.10.0', ] From bf2dc8cb575a946bb8620181acd6922f67d92376 Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Tue, 31 Oct 2023 11:25:13 +0100 Subject: [PATCH 4/6] Drop 3.12 again --- .github/workflows/python-package.yml | 2 +- .github/workflows/windows-testing.yml | 2 +- pyproject.toml | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 9a545d31bb..fd41f66a5d 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.9', '3.10', '3.11', '3.12'] + python-version: ['3.9', '3.10', '3.11'] numpy_version: ['>=1.22.0', '==1.21.*'] exclude: - python-version: '3.10' diff --git a/.github/workflows/windows-testing.yml b/.github/workflows/windows-testing.yml index 3f8ba5f192..9332b85e19 100644 --- a/.github/workflows/windows-testing.yml +++ b/.github/workflows/windows-testing.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: True matrix: - python-version: ['3.9', '3.10', '3.11', '3.12'] + python-version: ['3.9', '3.10', '3.11'] steps: - uses: actions/checkout@v4 with: diff --git a/pyproject.toml b/pyproject.toml index 2ac9614eec..18a33261ed 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,7 +33,6 @@ classifiers = [ 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', - 'Programming Language :: Python :: 3.12', ] license = { text = "MIT" } From 420921d464ef9db0f2731660f6f44bbdb17b9f80 Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Tue, 31 Oct 2023 11:38:23 +0100 Subject: [PATCH 5/6] Revert "Try removing line_profiler" This reverts commit 837854bec99a9d25aece2ead9666f01690d228cc. --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index fd41f66a5d..176ea56fc3 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -60,7 +60,7 @@ jobs: run: | conda activate zarr-env python -m pip install --upgrade pip - python -m pip install -U pip setuptools wheel + python -m pip install -U pip setuptools wheel line_profiler python -m pip install -rrequirements_dev_minimal.txt numpy${{matrix.numpy_version}} -rrequirements_dev_optional.txt pymongo redis python -m pip install . python -m pip freeze From 9f217a65f0a3a5b6e26fff135afe1e98c4a7bb3d Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Wed, 27 Dec 2023 12:30:38 +0100 Subject: [PATCH 6/6] Update release.rst --- docs/release.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/release.rst b/docs/release.rst index c18e0b8c20..a3e0831ba4 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -49,6 +49,9 @@ Docs Maintenance ~~~~~~~~~~~ +* Drop Python 3.8 and NumPy 1.20 + By :user:`Josh Moore `; :issue:`1557`. + * Cache result of ``FSStore._fsspec_installed()``. By :user:`Janick Martinez Esturo ` :issue:`1581`.