Merge branch 'main' into ruff

Author: jhamman

.github/workflows/gpu_test.yml

@@ -1,13 +1,13 @@
 # This workflow will install Python dependencies, run tests and lint with a variety of Python versions
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-name: GPU Test V3
+name: GPU Test
 
 on:
   push:
-    branches: [ v3 ]
+    branches: [ main ]
   pull_request:
-    branches: [ v3 ]
+    branches: [ main ]
   workflow_dispatch:
 
 env:

.github/workflows/hypothesis.yaml

@@ -3,11 +3,9 @@ on:
   push:
     branches:
       - "main"
-      - "v3"
   pull_request:
     branches:
       - "main"
-      - "v3"
     types: [opened, reopened, synchronize, labeled]
   schedule:
     - cron: "0 0 * * *" # Daily “At 00:00” UTC

.github/workflows/test.yml

@@ -1,13 +1,13 @@
 # This workflow will install Python dependencies, run tests and lint with a variety of Python versions
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-name: Test V3
+name: Test
 
 on:
   push:
-    branches: [ v3 ]
+    branches: [ main ]
   pull_request:
-    branches: [ v3 ]
+    branches: [ main ]
   workflow_dispatch:
 
 concurrency:

docs/conf.py

@@ -21,7 +21,6 @@
 
 from importlib.metadata import version as get_version
 
-import zarr
 import sphinx
 
 # If extensions (or modules to document with autodoc) are in another directory,

docs/index.rst

@@ -16,6 +16,7 @@ Zarr-Python
     release
     license
     contributing
+    roadmap
 
 **Version**: |version|
 

docs/roadmap.rst

@@ -211,6 +211,7 @@ extend-select = [
     "B",   # flake8-bugbear
     "C4",  # flake8-comprehensions
     "FLY", # flynt
+    "G",   # flake8-logging-format
     "I",   # isort
     "ISC", # flake8-implicit-str-concat
     "PGH", # pygrep-hooks
@@ -222,6 +223,7 @@ extend-select = [
     "TCH", # flake8-type-checking
     "TRY", # tryceratops
     "UP",  # pyupgrade
+    "W",   # pycodestyle warnings
 ]
 ignore = [
     "ANN003",

pyproject.toml

@@ -2,7 +2,6 @@
 
 from abc import ABC, abstractmethod
 from asyncio import gather
-from types import TracebackType
 from typing import TYPE_CHECKING, NamedTuple, Protocol, runtime_checkable
 
 if TYPE_CHECKING:

src/zarr/abc/store.py

@@ -133,7 +133,7 @@ def sync(
 
     finished, unfinished = wait([future], return_when=asyncio.ALL_COMPLETED, timeout=timeout)
     if len(unfinished) > 0:
-        raise TimeoutError(f"Coroutine {coro} failed to finish in within {timeout}s")
+        raise TimeoutError(f"Coroutine {coro} failed to finish within {timeout} s")
     assert len(finished) == 1
     return_result = next(iter(finished)).result()
 

src/zarr/core/sync.py

@@ -48,9 +48,9 @@ def register(self, cls: type[T]) -> None:
 __ndbuffer_registry: Registry[NDBuffer] = Registry()
 
 """
-The registry module is responsible for managing implementations of codecs, pipelines, buffers and ndbuffers and 
-collecting them from entrypoints.
-The implementation used is determined by the config
+The registry module is responsible for managing implementations of codecs,
+pipelines, buffers and ndbuffers and collecting them from entrypoints.
+The implementation used is determined by the config.
 """