Skip to content

Commit a87025f

Browse files
authored
Merge branch 'main' into f-strings
2 parents 3bb2aeb + 5954ff9 commit a87025f

Some content is hidden

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

41 files changed

+75
-409
lines changed

.github/workflows/minimal.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
with:
6565
name: releases
6666
path: dist
67-
- uses: pypa/gh-action-pypi-publish@v1.8.10
67+
- uses: pypa/gh-action-pypi-publish@v1.8.11
6868
with:
6969
user: __token__
7070
password: ${{ secrets.pypi_password }}

.github/workflows/windows-testing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- 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: 1 addition & 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/

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ repos:
1414
# Respect `exclude` and `extend-exclude` settings.
1515
args: ["--force-exclude"]
1616
- repo: https://github.com/psf/black
17-
rev: 22.12.0
17+
rev: 23.10.1
1818
hooks:
1919
- id: black
2020
- repo: https://github.com/codespell-project/codespell

CODE_OF_CONDUCT.md

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

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/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: 4 additions & 0 deletions
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

0 commit comments

Comments
 (0)