Skip to content

Commit e2c0ce4

Browse files
authored
Merge branch 'main' into faster_delitems
2 parents 769e76e + a81db07 commit e2c0ce4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+761
-579
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ body:
2727
attributes:
2828
label: Python Version
2929
description: Version of Python interpreter
30-
placeholder: 3.8.5, 3.9, 3.10, etc.
30+
placeholder: 3.9, 3.10, 3.11, etc.
3131
validations:
3232
required: true
3333
- type: input

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ jobs:
3838

3939
steps:
4040
- name: Checkout repository
41-
uses: actions/checkout@v3
41+
uses: actions/checkout@v4
4242

4343
# Initializes the CodeQL tools for scanning.
4444
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@v2
45+
uses: github/codeql-action/init@v3
4646
with:
4747
languages: ${{ matrix.language }}
4848
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -56,7 +56,7 @@ jobs:
5656
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5757
# If this step fails, then you should remove it and run the build manually (see below)
5858
- name: Autobuild
59-
uses: github/codeql-action/autobuild@v2
59+
uses: github/codeql-action/autobuild@v3
6060

6161
# ℹ️ Command-line programs to run using the OS shell.
6262
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -69,4 +69,4 @@ jobs:
6969
# ./location_of_script_within_repo/buildscript.sh
7070

7171
- name: Perform CodeQL Analysis
72-
uses: github/codeql-action/analyze@v2
72+
uses: github/codeql-action/analyze@v3

.github/workflows/minimal.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313

1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717
- name: Setup Miniconda
18-
uses: conda-incubator/setup-miniconda@v2.2.0
18+
uses: conda-incubator/setup-miniconda@v3.0.1
1919
with:
2020
channels: conda-forge
2121
environment-file: environment.yml

.github/workflows/python-package.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ jobs:
1515
runs-on: ubuntu-latest
1616
strategy:
1717
matrix:
18-
python-version: ['3.8', '3.9', '3.10', '3.11']
19-
numpy_version: ['>=1.22.0', '==1.20.*']
18+
python-version: ['3.9', '3.10', '3.11']
19+
numpy_version: ['>=1.22.0', '==1.21.*']
2020
exclude:
2121
- python-version: '3.10'
22-
numpy_version: '==1.20.*'
22+
numpy_version: '==1.21.*'
2323
- python-version: '3.11'
24-
numpy_version: '==1.20.*'
24+
numpy_version: '==1.21.*'
2525
services:
2626
redis:
2727
image: redis
@@ -38,11 +38,11 @@ jobs:
3838
ports:
3939
- 27017:27017
4040
steps:
41-
- uses: actions/checkout@v3
41+
- uses: actions/checkout@v4
4242
with:
4343
fetch-depth: 0
4444
- name: Setup Miniconda
45-
uses: conda-incubator/setup-miniconda@v2.2.0
45+
uses: conda-incubator/setup-miniconda@v3.0.1
4646
with:
4747
channels: conda-forge
4848
python-version: ${{ matrix.python-version }}

.github/workflows/releases.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ jobs:
1111
fail-fast: false
1212

1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
with:
1616
submodules: true
1717
fetch-depth: 0
1818

19-
- uses: actions/setup-python@v4.6.0
19+
- uses: actions/setup-python@v5.0.0
2020
name: Install Python
2121
with:
22-
python-version: '3.8'
22+
python-version: '3.9'
2323

2424
- name: Install PyBuild
2525
run: |
@@ -36,7 +36,7 @@ jobs:
3636
else
3737
echo "All seem good"
3838
fi
39-
- uses: actions/upload-artifact@v3
39+
- uses: actions/upload-artifact@v4
4040
with:
4141
name: releases
4242
path: dist
@@ -45,7 +45,7 @@ jobs:
4545
needs: [build_artifacts]
4646
runs-on: ubuntu-latest
4747
steps:
48-
- uses: actions/download-artifact@v3
48+
- uses: actions/download-artifact@v4
4949
with:
5050
name: releases
5151
path: dist
@@ -60,11 +60,11 @@ jobs:
6060
runs-on: ubuntu-latest
6161
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
6262
steps:
63-
- uses: actions/download-artifact@v3
63+
- uses: actions/download-artifact@v4
6464
with:
6565
name: releases
6666
path: dist
67-
- uses: pypa/[email protected].10
67+
- uses: pypa/[email protected].11
6868
with:
6969
user: __token__
7070
password: ${{ secrets.pypi_password }}

.github/workflows/windows-testing.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
strategy:
1717
fail-fast: True
1818
matrix:
19-
python-version: ['3.8', '3.9', '3.10', '3.11']
19+
python-version: ['3.9', '3.10', '3.11']
2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222
with:
2323
fetch-depth: 0
24-
- uses: conda-incubator/setup-miniconda@v2.2.0
24+
- uses: conda-incubator/setup-miniconda@v3.0.1
2525
with:
2626
auto-update-conda: true
2727
python-version: ${{ matrix.python-version }}

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ coverage.xml
5151

5252
# Sphinx documentation
5353
docs/_build/
54+
docs/_autoapi/
5455

5556
# PyBuilder
5657
target/
@@ -77,3 +78,5 @@ zarr/version.py
7778
#doesnotexist
7879
#test_sync*
7980
data/*
81+
82+
.DS_Store

.pre-commit-config.yaml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,25 @@ default_stages: [commit, push]
66
default_language_version:
77
python: python3
88
repos:
9-
- repo: https://github.com/charliermarsh/ruff-pre-commit
9+
- repo: https://github.com/astral-sh/ruff-pre-commit
1010
# Ruff version.
11-
rev: 'v0.0.224'
11+
rev: 'v0.1.14'
1212
hooks:
1313
- id: ruff
14-
# Respect `exclude` and `extend-exclude` settings.
15-
args: ["--force-exclude"]
1614
- repo: https://github.com/psf/black
17-
rev: 22.12.0
15+
rev: 23.12.1
1816
hooks:
1917
- id: black
20-
language_version: python3.8
2118
- repo: https://github.com/codespell-project/codespell
22-
rev: v2.2.5
19+
rev: v2.2.6
2320
hooks:
2421
- id: codespell
25-
args: ["-L", "ba,ihs,kake,nd,noe,nwo,te,fo,zar", "-S", "fixture"]
2622
- repo: https://github.com/pre-commit/pre-commit-hooks
27-
rev: v4.4.0
23+
rev: v4.5.0
2824
hooks:
2925
- id: check-yaml
3026
- repo: https://github.com/pre-commit/mirrors-mypy
31-
rev: v1.3.0
27+
rev: v1.8.0
3228
hooks:
3329
- id: mypy
3430
files: zarr

.readthedocs.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@ build:
77

88
sphinx:
99
configuration: docs/conf.py
10+
fail_on_warning: true
1011

1112
python:
1213
install:
1314
- method: pip
1415
path: .
1516
extra_requirements:
1617
- docs
18+
19+
formats: all

CODE_OF_CONDUCT.md

Lines changed: 0 additions & 46 deletions
This file was deleted.

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2015-2022 Zarr Developers <https://github.com/zarr-developers>
3+
Copyright (c) 2015-2023 Zarr Developers <https://github.com/zarr-developers>
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

TEAM.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
## Active core-developers
2+
- @joshmoore (Josh Moore)
3+
- @jni (Juan Nunez-Iglesias)
4+
- @rabernat (Ryan Abernathey)
5+
- @jhamman (Joe Hamman)
6+
- @d-v-b (Davis Bennett)
7+
- @jakirkham (jakirkham)
8+
- @martindurant (Martin Durant)
9+
- @normanrz (Norman Rzepka)
10+
11+
## Emeritus core-developers
12+
- @alimanfoo (Alistair Miles)
13+
- @shoyer (Stephan Hoyer)
14+
- @ryan-williams (Ryan Williams)
15+
- @jrbourbeau (James Bourbeau)
16+
- @mzjp2 (Zain Patel)
17+
- @grlee77 (Gregory Lee)
18+
19+
## Former core-developers
20+
- @jeromekelleher (Jerome Kelleher)
21+
- @tjcrone (Tim Crone)
22+
- @funkey (Jan Funke)
23+
- @shikharsg
24+
- @Carreau (Matthias Bussonnier)
25+
- @dazzag24
26+
- @WardF (Ward Fisher)

bench/compress_normal.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from zarr import blosc
99

1010
if __name__ == "__main__":
11-
1211
sys.path.insert(0, "..")
1312

1413
# setup

docs/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33

44
# You can set these variables from the command line.
5-
SPHINXOPTS =
5+
SPHINXOPTS = -W --keep-going
66
SPHINXBUILD = sphinx-build
77
PAPER =
88
BUILDDIR = _build

docs/api/core.rst

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,5 @@
11
The Array class (``zarr.core``)
22
===============================
3-
.. module:: zarr.core
43

5-
.. autoclass:: Array
6-
7-
.. automethod:: __getitem__
8-
.. automethod:: __setitem__
9-
.. automethod:: get_basic_selection
10-
.. automethod:: set_basic_selection
11-
.. automethod:: get_mask_selection
12-
.. automethod:: set_mask_selection
13-
.. automethod:: get_block_selection
14-
.. automethod:: set_block_selection
15-
.. automethod:: get_coordinate_selection
16-
.. automethod:: set_coordinate_selection
17-
.. automethod:: get_orthogonal_selection
18-
.. automethod:: set_orthogonal_selection
19-
.. automethod:: digest
20-
.. automethod:: hexdigest
21-
.. automethod:: resize
22-
.. automethod:: append
23-
.. automethod:: view
24-
.. automethod:: astype
4+
.. automodapi:: zarr.core
5+
:no-heading:

docs/conf.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"sphinx.ext.autosummary",
4343
"sphinx.ext.viewcode",
4444
"sphinx.ext.intersphinx",
45+
"sphinx_automodapi.automodapi",
4546
"numpydoc",
4647
"sphinx_issues",
4748
"sphinx_copybutton",
@@ -52,6 +53,9 @@
5253
numpydoc_class_members_toctree = False
5354
issues_github_path = "zarr-developers/zarr-python"
5455

56+
automodapi_inheritance_diagram = False
57+
automodapi_toctreedirnm = "_autoapi"
58+
5559
# Add any paths that contain templates here, relative to this directory.
5660
templates_path = ["_templates"]
5761

@@ -68,7 +72,7 @@
6872

6973
# General information about the project.
7074
project = "zarr"
71-
copyright = "2022, Zarr Developers"
75+
copyright = "2023, Zarr Developers"
7276
author = "Zarr Developers"
7377

7478
version = zarr.__version__
@@ -144,6 +148,7 @@
144148
},
145149
],
146150
"collapse_navigation": True,
151+
"navigation_with_keys": False,
147152
}
148153

149154
# Add any paths that contain custom themes here, relative to this directory.
@@ -331,6 +336,7 @@ def setup(app):
331336
intersphinx_mapping = {
332337
"python": ("https://docs.python.org/", None),
333338
"numpy": ("https://numpy.org/doc/stable/", None),
339+
"numcodecs": ("https://numcodecs.readthedocs.io/en/stable/", None),
334340
}
335341

336342

docs/contributing.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ Creating a development environment
8585
To work with the Zarr source code, it is recommended to set up a Python virtual
8686
environment and install all Zarr dependencies using the same versions as are used by
8787
the core developers and continuous integration services. Assuming you have a Python
88-
3 interpreter already installed, and have also installed the virtualenv package, and
89-
you have cloned the Zarr source code and your current working directory is the root of
90-
the repository, you can do something like the following::
88+
3 interpreter already installed, and you have cloned the Zarr source code and your
89+
current working directory is the root of the repository, you can do something like
90+
the following::
9191

9292
$ mkdir -p ~/pyenv/zarr-dev
9393
$ python -m venv ~/pyenv/zarr-dev

0 commit comments

Comments
 (0)