changes necessary for linting with regression tests

Author: d-v-b

pyproject.toml

@@ -283,6 +283,7 @@ extend-exclude = [
     "notebooks", # temporary, until we achieve compatibility with ruff ≥ 0.6
     "venv",
     "docs",
+    "tests/test_regression/scripts/", # these are scripts that use a different version of python
     "src/zarr/v2/",
     "tests/v2/",
 ]
@@ -353,7 +354,6 @@ strict = true
 warn_unreachable = true
 enable_error_code = ["ignore-without-code", "redundant-expr", "truthy-bool"]
 
-
 [[tool.mypy.overrides]]
 module = [
     "tests.package_with_entrypoint.*",
@@ -383,6 +383,7 @@ module = [
     "tests.test_properties",
     "tests.test_sync",
     "tests.test_v2",
+    "tests.test_regression.scripts.*"
 ]
 ignore_errors = true
 

src/zarr/core/dtype/wrapper.py

@@ -39,6 +39,7 @@
 # This is the bound for the dtypes that we support. If we support non-numpy dtypes,
 # then this bound will need to be widened.
 TBaseDType = np.dtype[np.generic]
+
 # These two type parameters are covariant because we want
 # x : ZDType[BaseDType, BaseScalar] = ZDType[SubDType, SubScalar]
 # to type check

tests/test_dtype/test_wrapper.py

@@ -91,7 +91,7 @@ def scalar_equals(self, scalar1: object, scalar2: object) -> bool:
         # but some classes may need to override this for special cases
         return scalar1 == scalar2
 
-    def test_check_dtype_valid(self, valid_dtype: object) -> None:
+    def test_check_dtype_valid(self, valid_dtype: TBaseDType) -> None:
         assert self.test_cls.check_dtype(valid_dtype)
 
     def test_check_dtype_invalid(self, invalid_dtype: object) -> None:

tests/test_regression/scripts/__init__.py

@@ -2,6 +2,7 @@
 from dataclasses import dataclass
 from itertools import product
 from pathlib import Path
+from typing import TYPE_CHECKING
 
 import numcodecs
 import numpy as np
@@ -10,9 +11,13 @@
 
 import zarr
 from zarr.core.array import Array
+from zarr.core.chunk_key_encodings import V2ChunkKeyEncoding
 from zarr.core.dtype.npy.string import VariableLengthString
 from zarr.storage import LocalStore
 
+if TYPE_CHECKING:
+    from zarr.core.dtype import ZDTypeLike
+
 
 def runner_installed() -> bool:
     """
@@ -69,8 +74,10 @@ def source_array(tmp_path: Path, request: pytest.FixtureRequest) -> Array:
     store = LocalStore(dest)
     array_params: ArrayParams = request.param
     compressor = array_params.compressor
+    chunk_key_encoding = V2ChunkKeyEncoding(separator="/")
+    dtype: ZDTypeLike
     if array_params.values.dtype == np.dtype("|O"):
-        dtype = VariableLengthString()
+        dtype = VariableLengthString()  # type: ignore[assignment]
     else:
         dtype = array_params.values.dtype
     z = zarr.create_array(
@@ -82,25 +89,30 @@ def source_array(tmp_path: Path, request: pytest.FixtureRequest) -> Array:
         fill_value=array_params.fill_value,
         order="C",
         filters=None,
-        chunk_key_encoding={"name": "v2", "configuration": {"separator": "/"}},
+        chunk_key_encoding=chunk_key_encoding,
         write_data=True,
         zarr_format=2,
     )
     z[:] = array_params.values
     return z
 
 
+# TODO: make this dynamic based on the installed scripts
+script_paths = [Path(__file__).resolve().parent / "scripts" / "v2.18.py"]
+
+
 @pytest.mark.skipif(not runner_installed(), reason="no python script runner installed")
 @pytest.mark.parametrize(
     "source_array", array_cases, indirect=True, ids=tuple(map(str, array_cases))
 )
-def test_roundtrip(source_array: Array, tmp_path: Path) -> None:
+@pytest.mark.parametrize("script_path", script_paths)
+def test_roundtrip(source_array: Array, tmp_path: Path, script_path: Path) -> None:
     out_path = tmp_path / "out"
     copy_op = subprocess.run(
         [
             "uv",
             "run",
-            Path(__file__).resolve().parent / "v2.18.py",
+            script_path,
             str(source_array.store).removeprefix("file://"),
             str(out_path),
         ],