Merge branch 'feat/batch-creation' of github.com:d-v-b/zarr-python into feat/batch-creation

d-v-b · d-v-b · commit 60379a78b08b · 2025-01-28T23:21:27.000+01:00
diff --git a/changes/2533.bugfix.rst b/changes/2533.bugfix.rst
diff --git a/changes/2693.bugfix.1.rst b/changes/2693.bugfix.1.rst
@@ -0,0 +1 @@
+Match the errors raised by read only stores in StoreTests.
diff --git a/changes/2693.bugfix.2.rst b/changes/2693.bugfix.2.rst
@@ -0,0 +1 @@
+Use stdout rather than stderr as the default stream for LoggingStore.
diff --git a/changes/2693.bugfix.3.rst b/changes/2693.bugfix.3.rst
@@ -0,0 +1 @@
+Ensure that ZipStore is open before getting or setting any values.
diff --git a/changes/2693.bugfix.4.rst b/changes/2693.bugfix.4.rst
@@ -0,0 +1 @@
+Update equality for LoggingStore and WrapperStore such that 'other' must also be a LoggingStore or WrapperStore respectively, rather than only checking the types of the stores they wrap.
diff --git a/changes/2693.bugfix.rst b/changes/2693.bugfix.rst
diff --git a/changes/2693.feature.1.rst b/changes/2693.feature.1.rst
@@ -0,0 +1 @@
+Implemented open() for LoggingStore.
diff --git a/changes/2693.feature.2.rst b/changes/2693.feature.2.rst
@@ -0,0 +1 @@
+LoggingStore is now a generic class.
diff --git a/changes/2693.feature.3.rst b/changes/2693.feature.3.rst
@@ -0,0 +1,3 @@
+Change StoreTest's ``test_store_repr``, ``test_store_supports_writes``,
+``test_store_supports_partial_writes``, and ``test_store_supports_listing``
+to to be implemented using ``@abstractmethod``, rather raising ``NotImplementedError``.
diff --git a/changes/2693.feature.4.rst b/changes/2693.feature.4.rst
@@ -0,0 +1 @@
+Separate instantiating and opening a store in StoreTests.
diff --git a/changes/2693.feature.5.rst b/changes/2693.feature.5.rst
@@ -0,0 +1 @@
+Add a test for using Stores as a context managers in StoreTests.
diff --git a/changes/2693.feature.6.rst b/changes/2693.feature.6.rst
@@ -0,0 +1 @@
+Test that a ValueError is raised for invalid byte range syntax in StoreTests.
diff --git a/changes/2693.feature.7.rst b/changes/2693.feature.7.rst
@@ -0,0 +1 @@
+Test getsize() and getsize_prefix() in StoreTests.
diff --git a/changes/2693.feature.8.rst b/changes/2693.feature.8.rst
@@ -0,0 +1 @@
+Test the error raised for invalid buffer arguments in StoreTests.
diff --git a/changes/2693.feature.9.rst b/changes/2693.feature.9.rst
@@ -0,0 +1 @@
+Test that data can be written to a store that's not yet open using the store.set method in StoreTests
diff --git a/changes/2768.bugfix.1.rst b/changes/2768.bugfix.1.rst
@@ -0,0 +1 @@
+Updated the optional test dependencies to include ``botocore`` and ``fsspec``.
diff --git a/changes/2768.bugfix.2.rst b/changes/2768.bugfix.2.rst
@@ -0,0 +1,2 @@
+Fixed the fsspec tests to skip if ``botocore`` is not installed.
+Previously they would have failed with an import error.
diff --git a/pyproject.toml b/pyproject.toml
@@ -73,10 +73,12 @@ test = [
     "coverage",
     "pytest",
     "pytest-cov",
+    'zarr[remote]',
+    "botocore",
     "s3fs",
+    "moto[s3,server]",
     "pytest-asyncio",
     "pytest-accept",
-    "moto[s3,server]",
     "requests",
     "rich",
     "mypy",
diff --git a/tests/test_store/test_fsspec.py b/tests/test_store/test_fsspec.py
@@ -5,7 +5,6 @@
 from typing import TYPE_CHECKING
 
 import pytest
-from botocore.session import Session
 from packaging.version import parse as parse_version
 
 import zarr.api.asynchronous
@@ -26,6 +25,7 @@
 requests = pytest.importorskip("requests")
 moto_server = pytest.importorskip("moto.moto_server.threaded_moto_server")
 moto = pytest.importorskip("moto")
+botocore = pytest.importorskip("botocore")
 
 # ### amended from s3fs ### #
 test_bucket_name = "test"
@@ -52,7 +52,7 @@ def s3_base() -> Generator[None, None, None]:
 
 def get_boto3_client() -> botocore.client.BaseClient:
     # NB: we use the sync botocore client for setup
-    session = Session()
+    session = botocore.session.Session()
     return session.create_client("s3", endpoint_url=endpoint_url)
 
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Match the errors raised by read only stores in StoreTests.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Use stdout rather than stderr as the default stream for LoggingStore.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Ensure that ZipStore is open before getting or setting any values.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Update equality for LoggingStore and WrapperStore such that 'other' must also be a LoggingStore or WrapperStore respectively, rather than only checking the types of the stores they wrap.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+Change StoreTest's ``test_store_repr``, ``test_store_supports_writes``,
	`2`	+``test_store_supports_partial_writes``, and ``test_store_supports_listing``
	`3`	+to to be implemented using ``@abstractmethod``, rather raising ``NotImplementedError``.
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Separate instantiating and opening a store in StoreTests.`