Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Python 3.13, drop Python 3.10 #2344

Merged
merged 3 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ body:
attributes:
label: Python Version
description: Version of Python interpreter
placeholder: 3.10, 3.11, 3.12 etc.
placeholder: 3.11, 3.12, 3.13 etc.
validations:
required: true
- type: input
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.10', '3.11', '3.12']
python-version: ['3.11', '3.12', '3.13']
numpy_version: ['>=2.1', '==1.24.*']
exclude:
- python-version: '3.12'
numpy_version: '==1.24.*'
- python-version: '3.13'
numpy_version: '==1.24.*'
services:
redis:
image: redis
Expand Down Expand Up @@ -50,7 +52,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 pip nodejs
conda create -n zarr-env python==${{matrix.python-version}} pip nodejs
conda activate zarr-env
npm install -g azurite
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: True
matrix:
python-version: ['3.10', '3.11']
python-version: ['3.11', '3.12']
steps:
- uses: actions/checkout@v4
with:
Expand Down
10 changes: 9 additions & 1 deletion docs/release.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,17 @@ Release notes

Enhancements
~~~~~~~~~~~~
* Added testing on Python 3.13.

Maintenance
~~~~~~~~~~~
* Dropped support for Python 3.10.
By :user:`David Stansby <dstansby>` (:issue:`2344`).
* Removed testing for compatibility with the ``bsddb3`` package.
``bsddb3`` was last released four years ago, and should still work with
``zarr-python`` if you can install it, but to reduce our maintenance
burden we will no longer run our compatibility tests for it.
By :user:`David Stansby <dstansby>` (:issue:`2344`).

Deprecations
~~~~~~~~~~~~
Expand All @@ -41,7 +49,7 @@ Enhancements
~~~~~~~~~~~~
* Added support for creating a copy of data when converting a `zarr.Array`
to a numpy array.
By :user:`David Stansby <dstansby>` (:issue:`2106`) and
By :user:`David Stansby <dstansby>` (:issue:`2106`) and
:user:`Joe Hamman <jhamman>` (:issue:`2123`).

Maintenance
Expand Down
6 changes: 4 additions & 2 deletions docs/tutorial.rst
Original file line number Diff line number Diff line change
Expand Up @@ -811,6 +811,8 @@ storing an array or group. Here is an example using a Berkeley DB B-tree
database for storage (requires `bsddb3
<https://www.jcea.es/programacion/pybsddb.htm>`_ to be installed)::

.. doctest-requires:: bsddb3

>>> import bsddb3
>>> store = zarr.DBMStore('data/example.bdb', open=bsddb3.btopen)
>>> root = zarr.group(store=store, overwrite=True)
Expand Down Expand Up @@ -1009,12 +1011,12 @@ class from ``fsspec``. The following example demonstrates how to access
a ZIP-archived Zarr group on s3 using `s3fs <https://s3fs.readthedocs.io/en/latest/>`_ and ``ZipFileSystem``:

>>> s3_path = "s3://path/to/my.zarr.zip"
>>>
>>>
>>> s3 = s3fs.S3FileSystem()
>>> f = s3.open(s3_path)
>>> fs = ZipFileSystem(f, mode="r")
>>> store = FSMap("", fs, check=False)
>>>
>>>
>>> # caching may improve performance when repeatedly reading the same data
>>> cache = zarr.storage.LRUStoreCache(store, max_size=2**28)
>>> z = zarr.group(store=cache)
Expand Down
41 changes: 13 additions & 28 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,15 @@ build-backend = "setuptools.build_meta"
name = "zarr"
description = "An implementation of chunked, compressed, N-dimensional arrays for Python"
readme = { file = "README.md", content-type = "text/markdown" }
maintainers = [
{ name = "Alistair Miles", email = "[email protected]" }
]
requires-python = ">=3.10"
maintainers = [{ name = "Alistair Miles", email = "[email protected]" }]
requires-python = ">=3.11"
dependencies = [
'asciitree',
'numpy>=1.24',
'fasteners; sys_platform != "emscripten"',
'numcodecs>=0.10.0',
]
dynamic = [
"version",
]
dynamic = ["version"]
classifiers = [
'Development Status :: 6 - Mature',
'Intended Audience :: Developers',
Expand All @@ -30,18 +26,14 @@ classifiers = [
'Topic :: Software Development :: Libraries :: Python Modules',
'Operating System :: Unix',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Programming Language :: Python :: 3.13',
]
license = { text = "MIT" }

[project.optional-dependencies]
jupyter = [
'notebook',
'ipytree>=0.2.2',
'ipywidgets>=8.0.0',
]
jupyter = ['notebook', 'ipytree>=0.2.2', 'ipywidgets>=8.0.0']
docs = [
'sphinx',
'sphinx-automodapi',
Expand All @@ -64,14 +56,11 @@ Homepage = "https://github.com/zarr-developers/zarr-python"
exclude_lines = [
"pragma: no cover",
"pragma: ${PY_MAJOR_VERSION} no cover",
'.*\.\.\.' # Ignore "..." lines
'.*\.\.\.', # Ignore "..." lines
]

[tool.coverage.run]
omit = [
"zarr/meta_v1.py",
"bench/compress_normal.py",
]
omit = ["zarr/meta_v1.py", "bench/compress_normal.py"]

[tool.setuptools]
packages = ["zarr", "zarr._storage", "zarr.tests"]
Expand Down Expand Up @@ -100,14 +89,12 @@ exclude = [
"build",
"dist",
"venv",
"docs"
"docs",
]

[tool.ruff.lint]
extend-select = [
"B"
]
ignore = ["B905"] # zip-without-explicit-strict
extend-select = ["B"]
ignore = ["B905"] # zip-without-explicit-strict

[tool.black]
line-length = 100
Expand Down Expand Up @@ -136,19 +123,17 @@ doctest_optionflags = [
"ELLIPSIS",
"IGNORE_EXCEPTION_DETAIL",
]
addopts = [
"--durations=10",
]
addopts = ["--durations=10"]
filterwarnings = [
"error:::zarr.*",
"ignore:PY_SSIZE_T_CLEAN will be required.*:DeprecationWarning",
"ignore:The loop argument is deprecated since Python 3.8.*:DeprecationWarning",
"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 =[
doctest_subpackage_requires = [
"zarr/core.py = numpy>=2",
"zarr/creation.py = numpy>=2"
"zarr/creation.py = numpy>=2",
]


Expand Down
3 changes: 2 additions & 1 deletion zarr/storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -1686,7 +1686,6 @@ class NestedDirectoryStore(DirectoryStore):
def __init__(
self, path, normalize_keys=False, dimension_separator: Optional[DIMENSION_SEPARATOR] = "/"
):

warnings.warn(
V3_DEPRECATION_MESSAGE.format(store=self.__class__.__name__),
FutureWarning,
Expand Down Expand Up @@ -2070,6 +2069,8 @@ class DBMStore(Store):
<https://www.jcea.es/programacion/pybsddb.htm>`_ package is installed, a
Berkeley DB database can be used::

.. doctest-requires:: bsddb3

>>> import bsddb3
>>> store = zarr.DBMStore('data/array.bdb', open=bsddb3.btopen)
>>> z = zarr.zeros((10, 10), chunks=(5, 5), store=store, overwrite=True)
Expand Down