From a054afbbdaf7c8560d0ce5df77af969bc863e335 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Sat, 10 Aug 2024 09:16:40 +0100 Subject: [PATCH 01/20] Drop support for Python 3.9 --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- .github/workflows/python-package.yml | 2 +- .github/workflows/releases.yml | 2 +- .readthedocs.yaml | 2 +- docs/release.rst | 10 ++++++++-- pyproject.toml | 4 ++-- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index ec98af029e..7b0c4dcfc4 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.9, 3.10, 3.11, etc. + placeholder: 3.10, 3.11, 3.12 etc. validations: required: true - type: input diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index f53cb2d9a9..61124b8e8e 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.10', '3.11', '3.12'] numpy_version: ['>=1.24.0', '==1.23.*'] exclude: - python-version: '3.10' diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index 8ac76c899b..f94711ad63 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/setup-python@v5.1.0 name: Install Python with: - python-version: '3.9' + python-version: '3.11' - name: Install PyBuild run: | diff --git a/.readthedocs.yaml b/.readthedocs.yaml index e45cae1b45..d7190b4771 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -3,7 +3,7 @@ version: 2 build: os: ubuntu-20.04 tools: - python: "3.9" + python: "3.11" sphinx: configuration: docs/conf.py diff --git a/docs/release.rst b/docs/release.rst index 6c7ba5139b..703fec8df6 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -24,7 +24,13 @@ Enhancements ~~~~~~~~~~~~ * Add Zstd codec to old V3 code path. - By :user:`Ryan Abernathey ` + By :user:`Ryan Abernathey ` + +Maintenance +~~~~~~~~~~~ + +* Removed support for Python 3.9. + By :user:`David Stansby ` .. _release_2.18.1: @@ -51,7 +57,7 @@ Maintenance * Enable ruff/bugbear rules (B) and fix issues. By :user:`Dimitri Papadopoulos Orfanos ` :issue:`1702`. -* Minor updates to use `np.inf` instead of `np.PINF` / `np.NINF` in preparation for NumPy 2.0.0 release. +* Minor updates to use `np.inf` instead of `np.PINF` / `np.NINF` in preparation for NumPy 2.0.0 release. By :user:`Joe Hamman ` :issue:`1842`. Deprecations diff --git a/pyproject.toml b/pyproject.toml index dacd45ec2c..a0525a8d8a 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.9" +requires-python = ">=3.10" dependencies = [ 'asciitree', 'numpy>=1.23', @@ -30,9 +30,9 @@ classifiers = [ 'Topic :: Software Development :: Libraries :: Python Modules', 'Operating System :: Unix', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', ] license = { text = "MIT" } From 5437386047323657a7d3ecc5bf775352ef30f800 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Sat, 10 Aug 2024 09:19:06 +0100 Subject: [PATCH 02/20] Revert "Drop support for Python 3.9" This reverts commit a054afbbdaf7c8560d0ce5df77af969bc863e335. --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- .github/workflows/python-package.yml | 2 +- .github/workflows/releases.yml | 2 +- .readthedocs.yaml | 2 +- docs/release.rst | 10 ++-------- pyproject.toml | 4 ++-- 6 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 7b0c4dcfc4..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.10, 3.11, 3.12 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 61124b8e8e..f53cb2d9a9 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.10', '3.11', '3.12'] + python-version: ['3.9', '3.10', '3.11', '3.12'] numpy_version: ['>=1.24.0', '==1.23.*'] exclude: - python-version: '3.10' diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index f94711ad63..8ac76c899b 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/setup-python@v5.1.0 name: Install Python with: - python-version: '3.11' + python-version: '3.9' - name: Install PyBuild run: | diff --git a/.readthedocs.yaml b/.readthedocs.yaml index d7190b4771..e45cae1b45 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -3,7 +3,7 @@ version: 2 build: os: ubuntu-20.04 tools: - python: "3.11" + python: "3.9" sphinx: configuration: docs/conf.py diff --git a/docs/release.rst b/docs/release.rst index 703fec8df6..6c7ba5139b 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -24,13 +24,7 @@ Enhancements ~~~~~~~~~~~~ * Add Zstd codec to old V3 code path. - By :user:`Ryan Abernathey ` - -Maintenance -~~~~~~~~~~~ - -* Removed support for Python 3.9. - By :user:`David Stansby ` + By :user:`Ryan Abernathey ` .. _release_2.18.1: @@ -57,7 +51,7 @@ Maintenance * Enable ruff/bugbear rules (B) and fix issues. By :user:`Dimitri Papadopoulos Orfanos ` :issue:`1702`. -* Minor updates to use `np.inf` instead of `np.PINF` / `np.NINF` in preparation for NumPy 2.0.0 release. +* Minor updates to use `np.inf` instead of `np.PINF` / `np.NINF` in preparation for NumPy 2.0.0 release. By :user:`Joe Hamman ` :issue:`1842`. Deprecations diff --git a/pyproject.toml b/pyproject.toml index a0525a8d8a..dacd45ec2c 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.10" +requires-python = ">=3.9" dependencies = [ 'asciitree', 'numpy>=1.23', @@ -30,9 +30,9 @@ classifiers = [ 'Topic :: Software Development :: Libraries :: Python Modules', 'Operating System :: Unix', 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', - 'Programming Language :: Python :: 3.12', ] license = { text = "MIT" } From 6888c593a74eedf0d153e763005754e68955bd9f Mon Sep 17 00:00:00 2001 From: Joe Hamman Date: Sun, 11 Aug 2024 04:42:44 -0700 Subject: [PATCH 03/20] Update TEAM.md (#2071) --- TEAM.md | 1 + 1 file changed, 1 insertion(+) diff --git a/TEAM.md b/TEAM.md index 6a22d83d1f..824e57fa7f 100644 --- a/TEAM.md +++ b/TEAM.md @@ -7,6 +7,7 @@ - @jakirkham (jakirkham) - @martindurant (Martin Durant) - @normanrz (Norman Rzepka) +- @dstansby (David Stansby) ## Emeritus core-developers - @alimanfoo (Alistair Miles) From c72d0e2a14caffcde2035e182eb4235ecbdfee1c Mon Sep 17 00:00:00 2001 From: David Stansby Date: Wed, 14 Aug 2024 08:46:38 +0100 Subject: [PATCH 04/20] [v2] Fix doctests with numpy 2.0 (#2073) --- pyproject.toml | 4 ++++ zarr/core.py | 22 +++++++++++----------- zarr/creation.py | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index dacd45ec2c..a5668d0d90 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -145,6 +145,10 @@ filterwarnings = [ "ignore:The .* is deprecated and will be removed in a Zarr-Python version 3*:FutureWarning", "ignore:The experimental Zarr V3 implementation in this version .*:FutureWarning", ] +doctest_subpackage_requires =[ + "zarr/core.py = numpy>=2", + "zarr/creation.py = numpy>=2" +] [tool.codespell] diff --git a/zarr/core.py b/zarr/core.py index b1ccd203db..4f3080e46c 100644 --- a/zarr/core.py +++ b/zarr/core.py @@ -609,11 +609,11 @@ def islice(self, start=None, end=None): Iterate over part of the array: >>> for value in z.islice(25, 30): value; - 25 - 26 - 27 - 28 - 29 + np.int64(25) + np.int64(26) + np.int64(27) + np.int64(28) + np.int64(29) """ if len(self.shape) == 0: @@ -679,7 +679,7 @@ def __getitem__(self, selection): Retrieve a single item:: >>> z[5] - 5 + np.int64(5) Retrieve a region via slicing:: @@ -706,7 +706,7 @@ def __getitem__(self, selection): Retrieve an item:: >>> z[2, 2] - 22 + np.int64(22) Retrieve a region via slicing:: @@ -830,7 +830,7 @@ def get_basic_selection(self, selection=Ellipsis, out=None, fields=None): Retrieve a single item:: >>> z.get_basic_selection(5) - 5 + np.int64(5) Retrieve a region via slicing:: @@ -852,7 +852,7 @@ def get_basic_selection(self, selection=Ellipsis, out=None, fields=None): Retrieve an item:: >>> z.get_basic_selection((2, 2)) - 22 + np.int64(22) Retrieve a region via slicing:: @@ -2819,7 +2819,7 @@ def view( >>> v[:] array([False, False, True, ..., True, False, False]) >>> np.all(a[:].view(dtype=bool) == v[:]) - True + np.True_ An array can be viewed with a dtype with a different item size, however some care is needed to adjust the shape and chunk shape so that chunk @@ -2833,7 +2833,7 @@ def view( >>> v[:10] array([0, 0, 1, 0, 2, 0, 3, 0, 4, 0], dtype=uint8) >>> np.all(a[:].view('u1') == v[:]) - True + np.True_ Change fill value for uninitialized chunks: diff --git a/zarr/creation.py b/zarr/creation.py index 9b2b1d6d4c..f7f3d5a094 100644 --- a/zarr/creation.py +++ b/zarr/creation.py @@ -569,7 +569,7 @@ def open_array( >>> z2 >>> np.all(z1[:] == z2[:]) - True + np.True_ Notes ----- From f231bb2bbbbbc96bfdf3afdb56acb66baeff9699 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Wed, 14 Aug 2024 09:18:51 +0100 Subject: [PATCH 05/20] Fix version number in built docs (#2044) --- docs/conf.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 048e77f51d..886160382f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -16,11 +16,8 @@ import os import sys -# The version info for the project you're documenting, acts as replacement for -# |version| and |release|, also used in various other places throughout the -# built documents. -# -# The short X.Y version. +from importlib.metadata import version as get_version + import zarr # If extensions (or modules to document with autodoc) are in another directory, @@ -75,9 +72,8 @@ copyright = "2024, Zarr Developers" author = "Zarr Developers" -version = zarr.__version__ -# The full version, including alpha/beta/rc tags. -release = zarr.__version__ +version = get_version("zarr") +release = get_version("zarr") # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. From 11fd8db8f06372ffc1f6f7e22315d43e4702ec60 Mon Sep 17 00:00:00 2001 From: Deepak Cherian Date: Wed, 14 Aug 2024 13:48:25 -0600 Subject: [PATCH 06/20] Fix orthogonal indexing with scalar. (#1947) Co-authored-by: David Stansby --- docs/release.rst | 11 +++++++++++ zarr/core.py | 7 ++++++- zarr/tests/test_core.py | 17 +++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/docs/release.rst b/docs/release.rst index 6c7ba5139b..c40ff5c0d3 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -18,6 +18,17 @@ Release notes See `GH1777 `_ for more details on the upcoming 3.0 release. +.. _release_2.18.3: + +2.18.3 +------ + +Maintenance +~~~~~~~~~~~ +* Fix a regression when using orthogonal indexing with a scalar. + By :user:`Deepak Cherian ` :issue:`1931` + + .. _release_2.18.2: Enhancements diff --git a/zarr/core.py b/zarr/core.py index 4f3080e46c..141190a0c8 100644 --- a/zarr/core.py +++ b/zarr/core.py @@ -2053,7 +2053,12 @@ def _process_chunk( if isinstance(cdata, UncompressedPartialReadBufferV3): cdata = cdata.read_full() chunk = ensure_ndarray_like(cdata).view(self._dtype) - chunk = chunk.reshape(self._chunks, order=self._order) + # dest.shape is not self._chunks when a dimensions is squeezed out + # For example, assume self._chunks = (5, 5, 1) + # and the selection is [:, :, 0] + # Then out_selection is (slice(5), slice(5)) + # See https://github.com/zarr-developers/zarr-python/issues/1931 + chunk = chunk.reshape(dest.shape, order=self._order) np.copyto(dest, chunk) return diff --git a/zarr/tests/test_core.py b/zarr/tests/test_core.py index 01a78ecd68..4729dc01b6 100644 --- a/zarr/tests/test_core.py +++ b/zarr/tests/test_core.py @@ -3206,3 +3206,20 @@ def test_object_array_indexing(): elem = [1, 3] arr[1] = elem assert arr[1] == elem + + +@pytest.mark.parametrize("shape", ((1, 1, 1), (5, 5, 1), (1, 5, 5))) +def test_scalar_orthogonal_indexing(shape): + # regression test for https://github.com/zarr-developers/zarr-python/issues/1931 + store = zarr.MemoryStore({}) + data = np.random.randint(0, 255, shape) + arr = zarr.zeros( + shape=shape, chunks=shape[:-1] + (1,), compressor=None, store=store, dtype="u1" + ) + arr[:, :, :] = data + store.close() + + zf = zarr.open(store, "r") + assert_array_equal(zf[0, :, :], data[0, :, :]) + assert_array_equal(zf[:, 0, :], data[:, 0, :]) + assert_array_equal(zf[:, :, 0], data[:, :, 0]) From ee43bb861c1910879c5de5a01e24cc2c2516def4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Aug 2024 09:37:03 +0100 Subject: [PATCH 07/20] Bump the requirements group across 1 directory with 7 updates (#2092) Bumps the requirements group with 7 updates in the / directory: | Package | From | To | | --- | --- | --- | | [numpy](https://github.com/numpy/numpy) | `1.26.4` | `2.0.1` | | [ipywidgets](https://github.com/jupyter-widgets/ipywidgets) | `8.1.2` | `8.1.3` | | [setuptools-scm](https://github.com/pypa/setuptools_scm) | `8.0.4` | `8.1.0` | | [pytest](https://github.com/pytest-dev/pytest) | `8.1.1` | `8.3.2` | | [lmdb](https://github.com/jnwatson/py-lmdb) | `1.4.1` | `1.5.1` | | [redis](https://github.com/redis/redis-py) | `5.0.4` | `5.0.8` | | [pymongo](https://github.com/mongodb/mongo-python-driver) | `4.6.3` | `4.8.0` | Updates `numpy` from 1.26.4 to 2.0.1 - [Release notes](https://github.com/numpy/numpy/releases) - [Changelog](https://github.com/numpy/numpy/blob/main/doc/RELEASE_WALKTHROUGH.rst) - [Commits](https://github.com/numpy/numpy/compare/v1.26.4...v2.0.1) Updates `ipywidgets` from 8.1.2 to 8.1.3 - [Release notes](https://github.com/jupyter-widgets/ipywidgets/releases) - [Commits](https://github.com/jupyter-widgets/ipywidgets/compare/8.1.2...8.1.3) Updates `setuptools-scm` from 8.0.4 to 8.1.0 - [Release notes](https://github.com/pypa/setuptools_scm/releases) - [Changelog](https://github.com/pypa/setuptools_scm/blob/main/CHANGELOG.md) - [Commits](https://github.com/pypa/setuptools_scm/compare/v8.0.4...v8.1.0) Updates `pytest` from 8.1.1 to 8.3.2 - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/8.1.1...8.3.2) Updates `lmdb` from 1.4.1 to 1.5.1 - [Changelog](https://github.com/jnwatson/py-lmdb/blob/master/ChangeLog) - [Commits](https://github.com/jnwatson/py-lmdb/compare/py-lmdb_1.4.1...py-lmdb_1.5.1) Updates `redis` from 5.0.4 to 5.0.8 - [Release notes](https://github.com/redis/redis-py/releases) - [Changelog](https://github.com/redis/redis-py/blob/master/CHANGES) - [Commits](https://github.com/redis/redis-py/compare/v5.0.4...v5.0.8) Updates `pymongo` from 4.6.3 to 4.8.0 - [Release notes](https://github.com/mongodb/mongo-python-driver/releases) - [Changelog](https://github.com/mongodb/mongo-python-driver/blob/master/doc/changelog.rst) - [Commits](https://github.com/mongodb/mongo-python-driver/compare/4.6.3...4.8.0) --- updated-dependencies: - dependency-name: numpy dependency-type: direct:development update-type: version-update:semver-major dependency-group: requirements - dependency-name: ipywidgets dependency-type: direct:development update-type: version-update:semver-patch dependency-group: requirements - dependency-name: setuptools-scm dependency-type: direct:development update-type: version-update:semver-minor dependency-group: requirements - dependency-name: pytest dependency-type: direct:development update-type: version-update:semver-minor dependency-group: requirements - dependency-name: lmdb dependency-type: direct:development update-type: version-update:semver-minor dependency-group: requirements - dependency-name: redis dependency-type: direct:development update-type: version-update:semver-patch dependency-group: requirements - dependency-name: pymongo dependency-type: direct:development update-type: version-update:semver-minor dependency-group: requirements ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements_dev_minimal.txt | 4 ++-- requirements_dev_numpy.txt | 2 +- requirements_dev_optional.txt | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements_dev_minimal.txt b/requirements_dev_minimal.txt index 5d156db655..df96c608b6 100644 --- a/requirements_dev_minimal.txt +++ b/requirements_dev_minimal.txt @@ -3,6 +3,6 @@ asciitree==0.3.3 fasteners==0.19 numcodecs==0.12.1 msgpack-python==0.5.6 -setuptools-scm==8.0.4 +setuptools-scm==8.1.0 # test requirements -pytest==8.1.1 +pytest==8.3.2 diff --git a/requirements_dev_numpy.txt b/requirements_dev_numpy.txt index d8d6c3d097..d53ec456a7 100644 --- a/requirements_dev_numpy.txt +++ b/requirements_dev_numpy.txt @@ -1,4 +1,4 @@ # Break this out into a separate file to allow testing against # different versions of numpy. This file should pin to the latest # numpy version. -numpy==1.26.4 +numpy==2.0.1 diff --git a/requirements_dev_optional.txt b/requirements_dev_optional.txt index 3456cca21a..87c9538a3c 100644 --- a/requirements_dev_optional.txt +++ b/requirements_dev_optional.txt @@ -1,17 +1,17 @@ # optional library requirements # bsddb3==6.2.6; sys_platform != 'win32' -lmdb==1.4.1; sys_platform != 'win32' +lmdb==1.5.1; sys_platform != 'win32' # optional library requirements for Jupyter ipytree==0.2.2 -ipywidgets==8.1.2 +ipywidgets==8.1.3 # optional library requirements for services # don't let pyup change pinning for azure-storage-blob, need to pin to older # version to get compatibility with azure storage emulator on appveyor (FIXME) azure-storage-blob==12.16.0 # pyup: ignore -redis==5.0.4 +redis==5.0.8 types-redis types-setuptools -pymongo==4.6.3 +pymongo==4.8.0 # optional test requirements coverage pytest-cov==5.0.0 From addc39dfc53fd0f992f59196f91e78b81395f494 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Aug 2024 09:37:27 +0100 Subject: [PATCH 08/20] Bump the actions group with 2 updates (#2087) Bumps the actions group with 2 updates: [actions/setup-python](https://github.com/actions/setup-python) and [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish). Updates `actions/setup-python` from 5.1.0 to 5.1.1 - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v5.1.0...v5.1.1) Updates `pypa/gh-action-pypi-publish` from 1.8.14 to 1.9.0 - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.8.14...v1.9.0) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-patch dependency-group: actions - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/releases.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index 8ac76c899b..20cb5890b4 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -16,7 +16,7 @@ jobs: submodules: true fetch-depth: 0 - - uses: actions/setup-python@v5.1.0 + - uses: actions/setup-python@v5.1.1 name: Install Python with: python-version: '3.9' @@ -64,7 +64,7 @@ jobs: with: name: releases path: dist - - uses: pypa/gh-action-pypi-publish@v1.8.14 + - uses: pypa/gh-action-pypi-publish@v1.9.0 with: user: __token__ password: ${{ secrets.pypi_password }} From c5c4698baed2f74a545c163950ce8968306cfc99 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Sat, 17 Aug 2024 08:50:21 +0100 Subject: [PATCH 09/20] [v2] Drop support for Python 3.9 (#2074) * Drop support for Python 3.9 * Ignore B905 ruff rule * Fix release notes --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- .github/workflows/python-package.yml | 2 +- .github/workflows/releases.yml | 2 +- .readthedocs.yaml | 2 +- docs/release.rst | 11 +++++++++-- pyproject.toml | 5 +++-- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index ec98af029e..7b0c4dcfc4 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.9, 3.10, 3.11, etc. + placeholder: 3.10, 3.11, 3.12 etc. validations: required: true - type: input diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index f53cb2d9a9..61124b8e8e 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.10', '3.11', '3.12'] numpy_version: ['>=1.24.0', '==1.23.*'] exclude: - python-version: '3.10' diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index 20cb5890b4..ec0601f0f4 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/setup-python@v5.1.1 name: Install Python with: - python-version: '3.9' + python-version: '3.11' - name: Install PyBuild run: | diff --git a/.readthedocs.yaml b/.readthedocs.yaml index e45cae1b45..d7190b4771 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -3,7 +3,7 @@ version: 2 build: os: ubuntu-20.04 tools: - python: "3.9" + python: "3.11" sphinx: configuration: docs/conf.py diff --git a/docs/release.rst b/docs/release.rst index c40ff5c0d3..9c2840a70a 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -18,6 +18,7 @@ Release notes See `GH1777 `_ for more details on the upcoming 3.0 release. + .. _release_2.18.3: 2.18.3 @@ -25,17 +26,23 @@ Release notes Maintenance ~~~~~~~~~~~ +* Removed support for Python 3.9. + By :user:`David Stansby ` + * Fix a regression when using orthogonal indexing with a scalar. By :user:`Deepak Cherian ` :issue:`1931` .. _release_2.18.2: +2.18.2 +------ + Enhancements ~~~~~~~~~~~~ * Add Zstd codec to old V3 code path. - By :user:`Ryan Abernathey ` + By :user:`Ryan Abernathey ` .. _release_2.18.1: @@ -62,7 +69,7 @@ Maintenance * Enable ruff/bugbear rules (B) and fix issues. By :user:`Dimitri Papadopoulos Orfanos ` :issue:`1702`. -* Minor updates to use `np.inf` instead of `np.PINF` / `np.NINF` in preparation for NumPy 2.0.0 release. +* Minor updates to use `np.inf` instead of `np.PINF` / `np.NINF` in preparation for NumPy 2.0.0 release. By :user:`Joe Hamman ` :issue:`1842`. Deprecations diff --git a/pyproject.toml b/pyproject.toml index a5668d0d90..da5fb34d89 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.9" +requires-python = ">=3.10" dependencies = [ 'asciitree', 'numpy>=1.23', @@ -30,9 +30,9 @@ classifiers = [ 'Topic :: Software Development :: Libraries :: Python Modules', 'Operating System :: Unix', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', ] license = { text = "MIT" } @@ -107,6 +107,7 @@ exclude = [ extend-select = [ "B" ] +ignore = ["B905"] # zip-without-explicit-strict [tool.black] line-length = 100 From 35e8106278e94edd91dad370bab33f5633167044 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Fri, 23 Aug 2024 12:02:29 +0100 Subject: [PATCH 10/20] Fix Array.__array__ for numpy 2.1 (#2106) * Fix Array.__array__ for numpy 2.1 * Add changelog * Depend on np.array for array coercions --- docs/release.rst | 11 ++++++++++- zarr/core.py | 7 ++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/docs/release.rst b/docs/release.rst index 9c2840a70a..697dfde3b8 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -24,14 +24,23 @@ Release notes 2.18.3 ------ +Enhancements +~~~~~~~~~~~~ +* Added support for creating a copy of data when converting a `zarr.Array` + to a numpy array. + By :user:`David Stansby ` + Maintenance ~~~~~~~~~~~ * Removed support for Python 3.9. By :user:`David Stansby ` - + * Fix a regression when using orthogonal indexing with a scalar. By :user:`Deepak Cherian ` :issue:`1931` +* Added compatibility with numpy 2.1. + By :user:`David Stansby ` + .. _release_2.18.2: diff --git a/zarr/core.py b/zarr/core.py index 141190a0c8..08234e193c 100644 --- a/zarr/core.py +++ b/zarr/core.py @@ -575,11 +575,8 @@ def __eq__(self, other): # store comparison ) - def __array__(self, *args): - a = self[...] - if args: - a = a.astype(args[0]) - return a + def __array__(self, dtype=None, copy=None): + return np.array(self[...], dtype=dtype, copy=copy) def islice(self, start=None, end=None): """ From 025e1031fc43b6e672b0dc9a53953afb1b9eef5d Mon Sep 17 00:00:00 2001 From: David Stansby Date: Mon, 26 Aug 2024 16:57:00 +0100 Subject: [PATCH 11/20] Bump test version of numcodecs (#2114) * Bump test version of numcodecs * Fix test for numcodecs 0.13 --- requirements_dev_minimal.txt | 2 +- zarr/tests/test_meta.py | 34 +++++++++++++--------------------- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/requirements_dev_minimal.txt b/requirements_dev_minimal.txt index df96c608b6..2991d99299 100644 --- a/requirements_dev_minimal.txt +++ b/requirements_dev_minimal.txt @@ -1,7 +1,7 @@ # library requirements asciitree==0.3.3 fasteners==0.19 -numcodecs==0.12.1 +numcodecs==0.13.0 msgpack-python==0.5.6 setuptools-scm==8.1.0 # test requirements diff --git a/zarr/tests/test_meta.py b/zarr/tests/test_meta.py index 7b7d526476..57ab9a0781 100644 --- a/zarr/tests/test_meta.py +++ b/zarr/tests/test_meta.py @@ -282,36 +282,28 @@ def test_encode_decode_array_dtype_shape_v3(cname): fill_value=None, chunk_memory_layout="C", ) - - meta_json = ( - """{ + meta_expected = { "attributes": {}, - "chunk_grid": { - "chunk_shape": [10], - "separator": "/", - "type": "regular" - }, + "chunk_grid": {"chunk_shape": [10], "separator": "/", "type": "regular"}, "chunk_memory_layout": "C", "compressor": { - """ - + f""" - "codec": "https://purl.org/zarr/spec/codec/{cname}/1.0", - """ - + """ - "configuration": { - "level": 1 - } + "codec": f"https://purl.org/zarr/spec/codec/{cname}/1.0", + "configuration": {"level": 1}, }, "data_type": " Date: Mon, 26 Aug 2024 12:56:20 -0700 Subject: [PATCH 12/20] fix: numpy 1.24 compat for Array.__array__ (#2123) --- zarr/core.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zarr/core.py b/zarr/core.py index 08234e193c..d13da27bc6 100644 --- a/zarr/core.py +++ b/zarr/core.py @@ -575,8 +575,8 @@ def __eq__(self, other): # store comparison ) - def __array__(self, dtype=None, copy=None): - return np.array(self[...], dtype=dtype, copy=copy) + def __array__(self, *args, **kwargs): + return np.array(self[...], *args, **kwargs) def islice(self, start=None, end=None): """ From 2e928b145c5ffdb088c9973641d71ac2937e5e49 Mon Sep 17 00:00:00 2001 From: Joe Hamman Date: Mon, 26 Aug 2024 14:32:22 -0700 Subject: [PATCH 13/20] Deprecate N5Store (#2103) * deprecate(n5): add deprecation warning to N5Store * also deprecate N5FSStore * docs * fix doc --- docs/release.rst | 11 +++++++++-- zarr/n5.py | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/docs/release.rst b/docs/release.rst index 697dfde3b8..05110f8ce1 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -28,12 +28,13 @@ Enhancements ~~~~~~~~~~~~ * Added support for creating a copy of data when converting a `zarr.Array` to a numpy array. - By :user:`David Stansby ` + By :user:`David Stansby ` (:issue:`2106`) and + :user:`Joe Hamman ` (:issue:`2123`). Maintenance ~~~~~~~~~~~ * Removed support for Python 3.9. - By :user:`David Stansby ` + By :user:`David Stansby ` (:issue:`2074`). * Fix a regression when using orthogonal indexing with a scalar. By :user:`Deepak Cherian ` :issue:`1931` @@ -41,6 +42,12 @@ Maintenance * Added compatibility with numpy 2.1. By :user:`David Stansby ` +Deprecations +~~~~~~~~~~~~ + +* Deprecate :class:`zarr.n5.N5Store` and :class:`zarr.n5.N5FSStore`. These + stores are slated to be removed in Zarr Python 3.0. + By :user:`Joe Hamman ` :issue:`2085`. .. _release_2.18.2: diff --git a/zarr/n5.py b/zarr/n5.py index 3d3e9afa26..3bb7093128 100644 --- a/zarr/n5.py +++ b/zarr/n5.py @@ -69,8 +69,20 @@ class N5Store(NestedDirectoryStore): Safe to write in multiple threads or processes. + .. deprecated:: 2.18.3 + `N5Store` will be removed in Zarr 3.0.0. """ + def __init__(self, *args: Any, **kwargs: Any) -> None: + super().__init__(*args, **kwargs) + warnings.warn( + "The N5Store is deprecated and will be removed in a Zarr-Python version 3, " + "see https://github.com/zarr-developers/zarr-python/issues/1274 and " + "https://github.com/zarr-developers/n5py for more information.", + FutureWarning, + stacklevel=2, + ) + def __getitem__(self, key: str) -> bytes: if key.endswith(zarr_group_meta_key): key_new = key.replace(zarr_group_meta_key, n5_attrs_key) @@ -322,6 +334,9 @@ class N5FSStore(FSStore): storage, and this procedure requires chunk keys with "." separated dimensions, hence the Zarr arrays targeting N5 have the deceptive "." dimension separator. + + .. deprecated:: 2.18.3 + `N5FSStore` will be removed in Zarr 3.0.0. """ _array_meta_key = "attributes.json" @@ -329,6 +344,13 @@ class N5FSStore(FSStore): _attrs_key = "attributes.json" def __init__(self, *args, **kwargs): + warnings.warn( + "The N5FSStore is deprecated and will be removed in a Zarr-Python version 3, " + "see https://github.com/zarr-developers/zarr-python/issues/1274 and " + "https://github.com/zarr-developers/n5py for more information.", + FutureWarning, + stacklevel=2, + ) if "dimension_separator" in kwargs: kwargs.pop("dimension_separator") warnings.warn( From 5bf57bd7492159823f83937fc7ccab2fdb61eeb5 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Mon, 26 Aug 2024 23:31:38 +0100 Subject: [PATCH 14/20] Run tests on numpy 1.23 (#2124) --- .github/workflows/python-package.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 61124b8e8e..f50fa7d9e0 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -18,8 +18,6 @@ jobs: python-version: ['3.10', '3.11', '3.12'] numpy_version: ['>=1.24.0', '==1.23.*'] exclude: - - python-version: '3.10' - numpy_version: '==1.23.*' - python-version: '3.11' numpy_version: '==1.23.*' - python-version: '3.12' From 9e0b5e88d9473fb3403a9cb35eff0526a75197cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 17:37:09 +0100 Subject: [PATCH 15/20] Bump the requirements group across 1 directory with 3 updates (#2129) Bumps the requirements group with 3 updates in the / directory: [numpy](https://github.com/numpy/numpy), [ipywidgets](https://github.com/jupyter-widgets/ipywidgets) and [azure-storage-blob](https://github.com/Azure/azure-sdk-for-python). Updates `numpy` from 2.0.1 to 2.1.0 - [Release notes](https://github.com/numpy/numpy/releases) - [Changelog](https://github.com/numpy/numpy/blob/main/doc/RELEASE_WALKTHROUGH.rst) - [Commits](https://github.com/numpy/numpy/compare/v2.0.1...v2.1.0) Updates `ipywidgets` from 8.1.3 to 8.1.5 - [Release notes](https://github.com/jupyter-widgets/ipywidgets/releases) - [Commits](https://github.com/jupyter-widgets/ipywidgets/compare/8.1.3...8.1.5) Updates `azure-storage-blob` from 12.16.0 to 12.21.0 - [Release notes](https://github.com/Azure/azure-sdk-for-python/releases) - [Changelog](https://github.com/Azure/azure-sdk-for-python/blob/main/doc/esrp_release.md) - [Commits](https://github.com/Azure/azure-sdk-for-python/compare/azure-storage-blob_12.16.0...azure-storage-blob_12.21.0) --- updated-dependencies: - dependency-name: numpy dependency-type: direct:development update-type: version-update:semver-minor dependency-group: requirements - dependency-name: ipywidgets dependency-type: direct:development update-type: version-update:semver-patch dependency-group: requirements - dependency-name: azure-storage-blob dependency-type: direct:development update-type: version-update:semver-minor dependency-group: requirements ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements_dev_numpy.txt | 2 +- requirements_dev_optional.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements_dev_numpy.txt b/requirements_dev_numpy.txt index d53ec456a7..6423997a29 100644 --- a/requirements_dev_numpy.txt +++ b/requirements_dev_numpy.txt @@ -1,4 +1,4 @@ # Break this out into a separate file to allow testing against # different versions of numpy. This file should pin to the latest # numpy version. -numpy==2.0.1 +numpy==2.1.0 diff --git a/requirements_dev_optional.txt b/requirements_dev_optional.txt index 87c9538a3c..9d75d78e44 100644 --- a/requirements_dev_optional.txt +++ b/requirements_dev_optional.txt @@ -3,11 +3,11 @@ lmdb==1.5.1; sys_platform != 'win32' # optional library requirements for Jupyter ipytree==0.2.2 -ipywidgets==8.1.3 +ipywidgets==8.1.5 # optional library requirements for services # don't let pyup change pinning for azure-storage-blob, need to pin to older # version to get compatibility with azure storage emulator on appveyor (FIXME) -azure-storage-blob==12.16.0 # pyup: ignore +azure-storage-blob==12.21.0 # pyup: ignore redis==5.0.8 types-redis types-setuptools From cc2cdeeccca4a0db2adf4bcde0b7f91b2100bbec Mon Sep 17 00:00:00 2001 From: Joe Hamman Date: Tue, 27 Aug 2024 10:10:37 -0700 Subject: [PATCH 16/20] chore: bump minimum numpy version to 1.24 (#2127) * chore: bump minimum version to 1.24 * Update .github/workflows/python-package.yml --- .github/workflows/python-package.yml | 8 +++----- docs/release.rst | 5 ++++- pyproject.toml | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index f50fa7d9e0..76ae9f982e 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -16,12 +16,10 @@ jobs: strategy: matrix: python-version: ['3.10', '3.11', '3.12'] - numpy_version: ['>=1.24.0', '==1.23.*'] + numpy_version: ['>=2.1', '==1.24.*'] exclude: - - python-version: '3.11' - numpy_version: '==1.23.*' - python-version: '3.12' - numpy_version: '==1.23.*' + numpy_version: '==1.24.*' services: redis: image: redis @@ -61,7 +59,7 @@ jobs: conda activate zarr-env python -m pip install --upgrade pip 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 -r requirements_dev_minimal.txt numpy${{matrix.numpy_version}} -r requirements_dev_optional.txt pymongo redis python -m pip install -e . python -m pip freeze - name: Tests diff --git a/docs/release.rst b/docs/release.rst index 05110f8ce1..69616d6052 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -39,9 +39,12 @@ Maintenance * Fix a regression when using orthogonal indexing with a scalar. By :user:`Deepak Cherian ` :issue:`1931` -* Added compatibility with numpy 2.1. +* Added compatibility with NumPy 2.1. By :user:`David Stansby ` +* Bump minimum NumPy version to 1.24. + :user:`Joe Hamman ` (:issue:`2127`). + Deprecations ~~~~~~~~~~~~ diff --git a/pyproject.toml b/pyproject.toml index da5fb34d89..ec06b63a96 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ maintainers = [ requires-python = ">=3.10" dependencies = [ 'asciitree', - 'numpy>=1.23', + 'numpy>=1.24', 'fasteners; sys_platform != "emscripten"', 'numcodecs>=0.10.0', ] From cb2c669526c4ba78a8b2f077de9f3cdbc356e56a Mon Sep 17 00:00:00 2001 From: David Stansby Date: Thu, 29 Aug 2024 13:12:17 +0100 Subject: [PATCH 17/20] Remove un-needed package installs in CI (#2095) --- .github/workflows/python-package.yml | 5 ++--- .github/workflows/windows-testing.yml | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 76ae9f982e..b1be7e425d 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -50,7 +50,7 @@ jobs: - name: Create Conda environment with the rights deps shell: "bash -l {0}" run: | - conda create -n zarr-env python==${{matrix.python-version}} bsddb3 numcodecs lmdb pip nodejs flake8 mypy + conda create -n zarr-env python==${{matrix.python-version}} bsddb3 pip nodejs conda activate zarr-env npm install -g azurite - name: Install dependencies @@ -58,8 +58,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 -r requirements_dev_minimal.txt numpy${{matrix.numpy_version}} -r requirements_dev_optional.txt pymongo redis + python -m pip install -r requirements_dev_minimal.txt numpy${{matrix.numpy_version}} -r requirements_dev_optional.txt line_profiler pymongo redis python -m pip install -e . python -m pip freeze - name: Tests diff --git a/.github/workflows/windows-testing.yml b/.github/workflows/windows-testing.yml index ab86831aae..1e22fec6d1 100644 --- a/.github/workflows/windows-testing.yml +++ b/.github/workflows/windows-testing.yml @@ -31,13 +31,12 @@ jobs: - name: Create Conda environment with the rights deps shell: bash -l {0} run: | - conda create -n zarr-env python==${{matrix.python-version}} numcodecs pip nodejs + conda create -n zarr-env python==${{matrix.python-version}} pip nodejs - name: Install dependencies shell: bash -l {0} run: | conda activate zarr-env python -m pip install --upgrade pip - python -m pip install -U pip setuptools wheel python -m pip install -r requirements_dev_numpy.txt -r requirements_dev_minimal.txt -r requirements_dev_optional.txt python -m pip install . python -m pip freeze From 6656d1a2d8f95dfb29724327d9dcff69667dc9d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 11:41:00 +0100 Subject: [PATCH 18/20] Bump the actions group with 2 updates (#2146) Bumps the actions group with 2 updates: [actions/setup-python](https://github.com/actions/setup-python) and [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish). Updates `actions/setup-python` from 5.1.1 to 5.2.0 - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v5.1.1...v5.2.0) Updates `pypa/gh-action-pypi-publish` from 1.9.0 to 1.10.0 - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.9.0...v1.10.0) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/releases.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index ec0601f0f4..9f115ba3e6 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -16,7 +16,7 @@ jobs: submodules: true fetch-depth: 0 - - uses: actions/setup-python@v5.1.1 + - uses: actions/setup-python@v5.2.0 name: Install Python with: python-version: '3.11' @@ -64,7 +64,7 @@ jobs: with: name: releases path: dist - - uses: pypa/gh-action-pypi-publish@v1.9.0 + - uses: pypa/gh-action-pypi-publish@v1.10.0 with: user: __token__ password: ${{ secrets.pypi_password }} From f1978dde52b11a7803a1a06937e69948acc8fe84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 12:23:21 +0100 Subject: [PATCH 19/20] Bump numpy from 2.1.0 to 2.1.1 in the requirements group (#2151) Bumps the requirements group with 1 update: [numpy](https://github.com/numpy/numpy). Updates `numpy` from 2.1.0 to 2.1.1 - [Release notes](https://github.com/numpy/numpy/releases) - [Changelog](https://github.com/numpy/numpy/blob/main/doc/RELEASE_WALKTHROUGH.rst) - [Commits](https://github.com/numpy/numpy/compare/v2.1.0...v2.1.1) --- updated-dependencies: - dependency-name: numpy dependency-type: direct:development update-type: version-update:semver-patch dependency-group: requirements ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements_dev_numpy.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_dev_numpy.txt b/requirements_dev_numpy.txt index 6423997a29..190610d3d3 100644 --- a/requirements_dev_numpy.txt +++ b/requirements_dev_numpy.txt @@ -1,4 +1,4 @@ # Break this out into a separate file to allow testing against # different versions of numpy. This file should pin to the latest # numpy version. -numpy==2.1.0 +numpy==2.1.1 From 88b2100ed3f0fed4c5b0a0bc38d29348d44e1ea0 Mon Sep 17 00:00:00 2001 From: Joe Hamman Date: Thu, 5 Sep 2024 05:40:20 -0700 Subject: [PATCH 20/20] chore(docs): update release notes ahead of 2.18.4 (#2152) --- docs/release.rst | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/release.rst b/docs/release.rst index 69616d6052..a62d6a653c 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -18,6 +18,19 @@ Release notes See `GH1777 `_ for more details on the upcoming 3.0 release. +.. _release_2.18.4: + +2.18.4 (unreleased) +------------------- + +Enhancements +~~~~~~~~~~~~ + +Maintenance +~~~~~~~~~~~ + +Deprecations +~~~~~~~~~~~~ .. _release_2.18.3: