remove gcs scheme support

Author: jhamman

pyproject.toml

@@ -434,7 +434,6 @@ file = "zarr.storage._builtin_adapters:FileSystemAdapter"
 memory = "zarr.storage._builtin_adapters:MemoryAdapter"
 https = "zarr.storage._builtin_adapters:HttpsAdapter"
 s3 = "zarr.storage._builtin_adapters:S3Adapter"
-gcs = "zarr.storage._builtin_adapters:GCSAdapter"
 gs = "zarr.storage._builtin_adapters:GSAdapter"
 log = "zarr.storage._builtin_adapters:LoggingAdapter"
 zip = "zarr.storage._builtin_adapters:ZipAdapter"

src/zarr/storage/_builtin_adapters.py

@@ -26,7 +26,6 @@
 
 __all__ = [
     "FileSystemAdapter",
-    "GCSAdapter",
     "HttpsAdapter",
     "LoggingAdapter",
     "MemoryAdapter",
@@ -117,7 +116,7 @@ class RemoteAdapter(StoreAdapter):
 
     Supports any URL scheme that fsspec can handle, including:
     - S3: s3://bucket/path
-    - Google Cloud Storage: gs://bucket/path, gcs://bucket/path
+    - Google Cloud Storage: gs://bucket/path
     - HTTP(S): https://example.com/file.zip, http://example.com/file.zip
     - Azure: abfs://container/path, az://container/path
     - And many more via fsspec ecosystem
@@ -192,9 +191,6 @@ def _determine_read_only_mode(cls, url: str, **kwargs: Any) -> bool:
     @classmethod
     def _normalize_url(cls, url: str, scheme: str) -> str:
         """Apply scheme-specific URL normalization."""
-        if scheme == "gcs":
-            # Normalize gcs:// to gs:// (fsspec standard)
-            return "gs://" + url[6:]
         return url
 
     @classmethod
@@ -206,7 +202,6 @@ def get_supported_schemes(cls) -> list[str]:
         return [
             "s3",
             "gs",
-            "gcs",  # Google Cloud Storage
             "http",
             "https",  # HTTP(S)
             "abfs",
@@ -237,21 +232,14 @@ def get_supported_schemes(cls) -> list[str]:
         return ["s3"]
 
 
-class GCSAdapter(RemoteAdapter):
+class GSAdapter(RemoteAdapter):
     """Store adapter for Google Cloud Storage URLs using fsspec."""
 
-    adapter_name = "gcs"
+    adapter_name = "gs"
 
     @classmethod
     def get_supported_schemes(cls) -> list[str]:
-        return ["gcs", "gs"]
-
-
-# Additional adapter for gs scheme (alias for gcs)
-class GSAdapter(GCSAdapter):
-    """Alias adapter for gs:// URLs (same as gcs)."""
-
-    adapter_name = "gs"
+        return ["gs"]
 
 
 class LoggingAdapter(StoreAdapter):
@@ -442,7 +430,7 @@ def _get_fsspec_protocol(cls, url: str) -> str:
         """Get the fsspec protocol name for installation hints."""
         if url.startswith("s3://"):
             return "s3"
-        elif url.startswith(("gs://", "gcs://")):
+        elif url.startswith("gs://"):
             return "gs"
         elif url.startswith(("http://", "https://")):
             return "http"

src/zarr/storage/_register_adapters.py

@@ -17,7 +17,6 @@ def register_builtin_adapters() -> None:
 
     from zarr.storage._builtin_adapters import (
         FileSystemAdapter,
-        GCSAdapter,
         GSAdapter,
         HttpsAdapter,
         LoggingAdapter,
@@ -34,7 +33,6 @@ def register_builtin_adapters() -> None:
         MemoryAdapter,
         HttpsAdapter,
         S3Adapter,
-        GCSAdapter,
         GSAdapter,
         LoggingAdapter,
         ZipAdapter,

tests/test_store/test_zep8.py

@@ -18,7 +18,7 @@
 from zarr.core.buffer import default_buffer_prototype
 from zarr.registry import get_store_adapter, register_store_adapter
 from zarr.storage import FsspecStore, LocalStore, LoggingStore, MemoryStore, ZipStore
-from zarr.storage._builtin_adapters import GCSAdapter, HttpsAdapter, LoggingAdapter, S3Adapter
+from zarr.storage._builtin_adapters import GSAdapter, HttpsAdapter, LoggingAdapter, S3Adapter
 from zarr.storage._common import make_store_path
 from zarr.storage._zep8 import URLParser, URLStoreResolver, ZEP8URLError, is_zep8_url
 
@@ -428,8 +428,8 @@ def test_fsspec_store_adapters_registered() -> None:
     https_adapter = get_store_adapter("https")
     assert https_adapter is not None
 
-    gcs_adapter = get_store_adapter("gcs")
-    assert gcs_adapter is not None
+    gs_adapter = get_store_adapter("gs")
+    assert gs_adapter is not None
 
 
 async def test_fsspec_s3_url_resolution() -> None:
@@ -496,7 +496,7 @@ async def test_make_store_path_with_fsspec_urls() -> None:
 
     # Test that fsspec URLs still work with make_store_path
     # Note: These will fail to connect but should parse correctly
-    fsspec_urls = ["s3://bucket/path", "gcs://bucket/path", "https://example.com/data"]
+    fsspec_urls = ["s3://bucket/path", "gs://bucket/path", "https://example.com/data"]
 
     for url in fsspec_urls:
         # These should not be detected as ZEP 8 URLs
@@ -514,7 +514,7 @@ def test_fsspec_zep8_url_detection() -> None:
     zep8_urls = [
         "s3://bucket/data.zip|zip:",
         "https://example.com/data|zip:|zarr3:",
-        "gcs://bucket/data.zarr|zarr2:",
+        "gs://bucket/data.zarr|zarr2:",
     ]
 
     for url in zep8_urls:
@@ -524,7 +524,7 @@ def test_fsspec_zep8_url_detection() -> None:
     regular_urls = [
         "s3://bucket/data.zarr",
         "https://example.com/data.zarr",
-        "gcs://bucket/data",
+        "gs://bucket/data",
     ]
 
     for url in regular_urls:
@@ -574,10 +574,10 @@ def test_fsspec_schemes_support() -> None:
     assert set(HttpsAdapter.get_supported_schemes()) == {"http", "https"}
 
     # Test GCS adapter
-    assert GCSAdapter.can_handle_scheme("gcs")
-    # GCS adapter supports both gcs:// and gs:// schemes
-    supported_schemes = GCSAdapter.get_supported_schemes()
-    assert "gcs" in supported_schemes or "gs" in supported_schemes
+    assert GSAdapter.can_handle_scheme("gs")
+    # GCS adapter only supports gs:// scheme
+    supported_schemes = GSAdapter.get_supported_schemes()
+    assert "gs" in supported_schemes
 
 
 async def test_fsspec_url_chain_parsing() -> None:
@@ -590,7 +590,7 @@ async def test_fsspec_url_chain_parsing() -> None:
     complex_urls = [
         "s3://bucket/archive.zip|zip:data/|zarr3:group",
         "https://example.com/data.tar.gz|tar:|zip:|zarr2:",
-        "gcs://bucket/dataset.zarr|zarr3:array/subarray",
+        "gs://bucket/dataset.zarr|zarr3:array/subarray",
     ]
 
     for url in complex_urls:
@@ -1236,27 +1236,16 @@ async def test_s3_adapter_functionality() -> None:
 
 
 async def test_gcs_adapter_functionality() -> None:
-    """Test GCSAdapter functionality."""
-    from zarr.storage._builtin_adapters import GCSAdapter
+    """Test GSAdapter functionality."""
 
     # Test can_handle_scheme
-    assert GCSAdapter.can_handle_scheme("gs")
-    assert GCSAdapter.can_handle_scheme("gcs")
-    assert not GCSAdapter.can_handle_scheme("s3")
+    assert GSAdapter.can_handle_scheme("gs")
+    assert not GSAdapter.can_handle_scheme("s3")
 
     # Test get_supported_schemes
-    schemes = GCSAdapter.get_supported_schemes()
-    assert "gs" in schemes
-    assert "gcs" in schemes
-
-
-async def test_gs_adapter_functionality() -> None:
-    """Test GSAdapter (alias) functionality."""
-    from zarr.storage._builtin_adapters import GSAdapter
-
-    # GSAdapter is an alias for GCSAdapter
     schemes = GSAdapter.get_supported_schemes()
     assert "gs" in schemes
+    assert len(schemes) == 1  # Should only support gs now
 
 
 async def test_https_adapter_functionality() -> None:
@@ -1351,7 +1340,6 @@ def test_builtin_adapters_imports_and_module_structure() -> None:
     # Test that all adapter classes can be imported
     from zarr.storage._builtin_adapters import (
         FileSystemAdapter,
-        GCSAdapter,
         GSAdapter,
         HttpsAdapter,
         LoggingAdapter,
@@ -1366,16 +1354,14 @@ def test_builtin_adapters_imports_and_module_structure() -> None:
     assert MemoryAdapter.adapter_name == "memory"
     assert RemoteAdapter.adapter_name == "remote"
     assert S3Adapter.adapter_name == "s3"
-    assert GCSAdapter.adapter_name == "gcs"
     assert GSAdapter.adapter_name == "gs"
     assert HttpsAdapter.adapter_name == "https"
     assert LoggingAdapter.adapter_name == "log"
     assert ZipAdapter.adapter_name == "zip"
 
     # Test inheritance relationships
     assert issubclass(S3Adapter, RemoteAdapter)
-    assert issubclass(GCSAdapter, RemoteAdapter)
-    assert issubclass(GSAdapter, GCSAdapter)
+    assert issubclass(GSAdapter, RemoteAdapter)
     assert issubclass(HttpsAdapter, RemoteAdapter)