Merge branch 'main' into pre-commit-ci-update-config

Author: d-v-b

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# lint codebase with black and ruff
+4e348d6b80c96da461fd866576c971b8a659ba15

.github/workflows/releases.yml

@@ -64,7 +64,7 @@ jobs:
         with:
           name: releases
           path: dist
-      - uses: pypa/[email protected].6
+      - uses: pypa/[email protected].7
         with:
           user: __token__
           password: ${{ secrets.pypi_password }}

.gitignore

@@ -8,6 +8,7 @@ __pycache__/
 # Distribution / packaging
 .Python
 env/
+.venv/
 build/
 develop-eggs/
 dist/

.pre-commit-config.yaml

@@ -5,20 +5,23 @@ default_stages: [commit, push]
 default_language_version:
   python: python3
 repos:
-  - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    # Ruff version.
+    rev: 'v0.0.224'
     hooks:
-    - id: flake8
-      args: [
-        --max-line-length=100
-      ]
-      exclude: ^(venv/|docs/)
-      types: ['python']
+    - id: ruff
+      # Respect `exclude` and `extend-exclude` settings.
+      args: ["--force-exclude"]
+  - repo: https://github.com/psf/black
+    rev: 22.12.0
+    hooks:
+    - id: black
+      language_version: python3.8
   - repo: https://github.com/codespell-project/codespell
     rev: v2.2.5
     hooks:
       - id: codespell
-        args: ["-L", "ba,ihs,kake,nd,noe,nwo,te,fo", "-S", "fixture"]
+        args: ["-L", "ba,ihs,kake,nd,noe,nwo,te,fo,zar", "-S", "fixture"]
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0
     hooks:

bench/compress_normal.py

@@ -9,36 +9,39 @@
 
 if __name__ == "__main__":
 
-    sys.path.insert(0, '..')
+    sys.path.insert(0, "..")
 
     # setup
-    a = np.random.normal(2000, 1000, size=200000000).astype('u2')
-    z = zarr.empty_like(a, chunks=1000000,
-                        compression='blosc',
-                        compression_opts=dict(cname='lz4', clevel=5, shuffle=2))
+    a = np.random.normal(2000, 1000, size=200000000).astype("u2")
+    z = zarr.empty_like(
+        a,
+        chunks=1000000,
+        compression="blosc",
+        compression_opts=dict(cname="lz4", clevel=5, shuffle=2),
+    )
     print(z)
 
-    print('*' * 79)
+    print("*" * 79)
 
     # time
-    t = timeit.repeat('z[:] = a', repeat=10, number=1, globals=globals())
+    t = timeit.repeat("z[:] = a", repeat=10, number=1, globals=globals())
     print(t)
     print(min(t))
     print(z)
 
     # profile
     profile = line_profiler.LineProfiler(blosc.compress)
-    profile.run('z[:] = a')
+    profile.run("z[:] = a")
     profile.print_stats()
 
-    print('*' * 79)
+    print("*" * 79)
 
     # time
-    t = timeit.repeat('z[:]', repeat=10, number=1, globals=globals())
+    t = timeit.repeat("z[:]", repeat=10, number=1, globals=globals())
     print(t)
     print(min(t))
 
     # profile
     profile = line_profiler.LineProfiler(blosc.decompress)
-    profile.run('z[:]')
+    profile.run("z[:]")
     profile.print_stats()

docs/api/core.rst

@@ -10,6 +10,8 @@ The Array class (``zarr.core``)
     .. automethod:: set_basic_selection
     .. automethod:: get_mask_selection
     .. automethod:: set_mask_selection
+    .. automethod:: get_block_selection
+    .. automethod:: set_block_selection
     .. automethod:: get_coordinate_selection
     .. automethod:: set_coordinate_selection
     .. automethod:: get_orthogonal_selection