Merge branch 'main' into zb-write-copy

Author: suni72

docs/source/changelog.rst

@@ -4,6 +4,14 @@ Changelog
 Note: in some releases, there are no changes, because we always guarantee
 releasing in step with fsspec.
 
+2025.12.0
+---------
+
+* Fix CI when run against rela SGC buckets (#71)
+* Run extended rests when env var is set (#712)
+* Support py3.14 and drop 3.9 (#709)
+* Introduce ExtendedGcsFileSystem for Zonal Bucket gRPC Read Path (#707)
+
 2025.10.0
 ---------
 

docs/source/developer.rst

@@ -23,6 +23,17 @@ provide appropriate GCSFS_TEST_BUCKET, GCSFS_TEST_VERSIONED_BUCKET
 GCSFS_ZONAL_TEST_BUCKET(To use for testing Rapid storage features) and GCSFS_TEST_PROJECT,
 as well as setting your default google credentials (or providing them via the fsspec config).
 
+When running tests against a real GCS endpoint, you have two options for test buckets:
+
+- **Provide existing buckets**: If you specify buckets that already exist, the
+  test suite will manage objects *within* them (creating, modifying, and deleting
+  objects as needed). The buckets themselves will **not** be deleted upon completion.
+  **Warning**: The test suite will clear the contents of the bucket at the beginning and end of the
+  test run, so be sure to use a bucket that does not contain important data.
+- **Let the tests create buckets**: If you specify bucket names that do not exist,
+  the test suite will create them for the test run and automatically delete them
+  during final cleanup.
+
 .. _fake-gcs-server: https://github.com/fsouza/fake-gcs-server
 
 .. raw:: html

gcsfs/tests/conftest.py

@@ -102,7 +102,15 @@ def factory(**kwargs):
 
 @pytest.fixture(scope="session")
 def buckets_to_delete():
-    """A set to keep track of buckets created during the test session."""
+    """
+    Provides a session-scoped set to track the names of GCS buckets that are
+    created by the test suite.
+
+    When tests run, they may create new GCS buckets. If these buckets are not
+    deleted, they will persist after the test run, leading to resource leakage.
+    This set acts as a registry of buckets that the `final_cleanup` fixture
+    should remove at the end of the entire test session.
+    """
     return set()
 
 
@@ -113,6 +121,11 @@ def gcs(gcs_factory, buckets_to_delete, populate=True):
         # Create the bucket if it doesn't exist, otherwise clean it.
         if not gcs.exists(TEST_BUCKET):
             gcs.mkdir(TEST_BUCKET)
+            # By adding the bucket name to this set, we are marking it for
+            # deletion at the end of the test session. This ensures that if
+            # the test suite creates the bucket, it will also be responsible
+            # for deleting it. If the bucket already existed, we assume it's
+            # managed externally and should not be deleted by the tests.
             buckets_to_delete.add(TEST_BUCKET)
         else:
             try:
@@ -138,41 +151,24 @@ def _cleanup_gcs(gcs):
 
 @pytest.fixture(scope="session", autouse=True)
 def final_cleanup(gcs_factory, buckets_to_delete):
-    """A session-scoped fixture to delete the test buckets after all tests are run."""
+    """
+    A session-scoped, auto-use fixture that deletes all buckets registered
+    in the `buckets_to_delete` set after the entire test session is complete.
+    """
     yield
     # This code runs after the entire test session finishes
-    use_extended_gcs = os.getenv(
-        "GCSFS_EXPERIMENTAL_ZB_HNS_SUPPORT", "false"
-    ).lower() in (
-        "true",
-        "1",
-    )
 
-    if use_extended_gcs:
-        is_real_gcs = (
-            os.environ.get("STORAGE_EMULATOR_HOST") == "https://storage.googleapis.com"
-        )
-        mock_authentication_manager = (
-            patch("google.auth.default", return_value=(None, "fake-project"))
-            if not is_real_gcs
-            else nullcontext()
-        )
-    else:
-        mock_authentication_manager = nullcontext()
-
-    with mock_authentication_manager:
-        gcs = gcs_factory()
-        for bucket in buckets_to_delete:
-            # For real GCS, only delete if created by the test suite.
-            # For emulators, always delete.
-            try:
-                if gcs.exists(bucket):
-                    gcs.rm(bucket, recursive=True)
-                    logging.info(f"Cleaned up bucket: {bucket}")
-            except Exception as e:
-                logging.warning(
-                    f"Failed to perform final cleanup for bucket {bucket}: {e}"
-                )
+    gcs = gcs_factory()
+    for bucket in buckets_to_delete:
+        # The cleanup logic attempts to delete every bucket that was
+        # added to the set during the session. For real GCS, only delete if
+        # created by the test suite.
+        try:
+            if gcs.exists(bucket):
+                gcs.rm(bucket, recursive=True)
+                logging.info(f"Cleaned up bucket: {bucket}")
+        except Exception as e:
+            logging.warning(f"Failed to perform final cleanup for bucket {bucket}: {e}")
 
 
 @pytest.fixture
@@ -219,6 +215,8 @@ def gcs_versioned(gcs_factory, buckets_to_delete):
             )
 
             if _VERSIONED_BUCKET_CREATED_BY_TESTS:
+                # If the versioned bucket was created by the test suite, it's added
+                # here for cleanup.
                 buckets_to_delete.add(TEST_VERSIONED_BUCKET)
         except ImportError:
             pass  # test_core_versioned is not being run
@@ -231,6 +229,8 @@ def gcs_versioned(gcs_factory, buckets_to_delete):
             except FileNotFoundError:
                 pass
             gcs.mkdir(TEST_VERSIONED_BUCKET, enable_versioning=True)
+            # When using the emulator, the versioned bucket is always recreated
+            # and added to the cleanup set.
             buckets_to_delete.add(TEST_VERSIONED_BUCKET)
         gcs.invalidate_cache()
         yield gcs

gcsfs/tests/test_zonal_file.py

@@ -113,7 +113,7 @@ def test_zonal_file_discard(extended_gcsfs, zonal_write_mocks):  # noqa: F841
             f.discard()
         mock_logger.warning.assert_called_once()
         assert (
-            "Discard is unavailable for Zonal Buckets"
+            "Discard is not applicable for Zonal Buckets"
             in mock_logger.warning.call_args[0][0]
         )
 

requirements.txt

@@ -1,6 +1,6 @@
 aiohttp!=4.0.0a0, !=4.0.0a1
 decorator>4.1.2
-fsspec==2025.10.0
+fsspec==2025.12.0
 google-auth>=1.2
 google-auth-oauthlib
 google-cloud-storage