s3fs 2025.5.1__tar.gz → 2025.9.0__tar.gz

{s3fs-2025.5.1 → s3fs-2025.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: s3fs
-Version: 2025.5.1
+Version: 2025.9.0
 Summary: Convenient Filesystem interface over S3
 Home-page: http://github.com/fsspec/s3fs/
 Maintainer: Martin Durant
@@ -17,15 +17,18 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >= 3.9
+Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: aiobotocore<3.0.0,>=2.5.4
-Requires-Dist: fsspec==2025.5.1
+Requires-Dist: fsspec==2025.9.0
 Requires-Dist: aiohttp!=4.0.0a0,!=4.0.0a1
 Provides-Extra: awscli
 Requires-Dist: aiobotocore[awscli]<3.0.0,>=2.5.4; extra == "awscli"
 Provides-Extra: boto3
 Requires-Dist: aiobotocore[boto3]<3.0.0,>=2.5.4; extra == "boto3"
 Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
@@ -37,21 +40,4 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-s3fs
-====
-
-|Build Status| |Doc Status|
-
-S3FS builds on aiobotocore_ to provide a convenient Python filesystem interface for S3.
-
-View the documentation_ for s3fs.
-
-.. _documentation: http://s3fs.readthedocs.io/en/latest/
-.. _aiobotocore: https://aiobotocore.readthedocs.io/en/latest/
-
-.. |Build Status| image:: https://github.com/fsspec/s3fs/workflows/CI/badge.svg
-    :target: https://github.com/fsspec/s3fs/actions
-    :alt: Build Status
-.. |Doc Status| image:: https://readthedocs.org/projects/s3fs/badge/?version=latest
-    :target: https://s3fs.readthedocs.io/en/latest/?badge=latest
-    :alt: Documentation Status
+README.md

s3fs-2025.9.0/README.md

@@ -0,0 +1,18 @@
+s3fs
+====
+
+[|Build Status|](https://github.com/fsspec/s3fs/actions)
+[|Documentation|](https://s3fs.readthedocs.io/en/latest/?badge=latest)
+
+S3FS builds on [aiobotocore](https://aiobotocore.readthedocs.io/en/latest/)
+to provide a convenient Python filesystem interface for S3.
+
+
+Support
+-------
+
+Work on this repository is supported in part by:
+
+"Anaconda, Inc. - Advancing AI through open source."
+
+<a href="https://anaconda.com/"><img src="https://camo.githubusercontent.com/b8555ef2222598ed37ce38ac86955febbd25de7619931bb7dd3c58432181d3b6/68747470733a2f2f626565776172652e6f72672f636f6d6d756e6974792f6d656d626572732f616e61636f6e64612f616e61636f6e64612d6c617267652e706e67" alt="anaconda logo" width="40%"/></a>

{s3fs-2025.5.1 → s3fs-2025.9.0}/docs/source/changelog.rst

@@ -1,6 +1,18 @@
 Changelog
 =========
 
+2025.9.0
+--------
+
+- update README for distribution compliance
+
+2025.7.0
+--------
+
+- fix exclusive write for small files (#974)
+- acknowledge Anaconda support (#972)
+- fix test typo (#970)
+
 2025.5.1
 --------
 

{s3fs-2025.5.1 → s3fs-2025.9.0}/requirements.txt

@@ -1,3 +1,3 @@
 aiobotocore>=2.5.4,<3.0.0
-fsspec==2025.5.1
+fsspec==2025.9.0
 aiohttp!=4.0.0a0, !=4.0.0a1

{s3fs-2025.5.1 → s3fs-2025.9.0}/s3fs/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-05-24T08:13:30-0400",
+ "date": "2025-09-02T15:17:31-0400",
  "dirty": false,
  "error": null,
- "full-revisionid": "2f3c76d9c36025c7daefa766a8f81c79fc4010e7",
- "version": "2025.5.1"
+ "full-revisionid": "380b2c6ad868dd90cf8967c862bac1b3154b357b",
+ "version": "2025.9.0"
 }
 '''  # END VERSION_JSON
 

{s3fs-2025.5.1 → s3fs-2025.9.0}/s3fs/core.py

@@ -2458,6 +2458,7 @@ class S3File(AbstractBufferedFile):
 
     def commit(self):
         logger.debug("Commit %s" % self)
+        match = {"IfNoneMatch": "*"} if "x" in self.mode else {}
         if self.tell() == 0:
             if self.buffer is not None:
                 logger.debug("Empty file committed %s" % self)
@@ -2471,15 +2472,11 @@ class S3File(AbstractBufferedFile):
                 kw = dict(Key=self.key, Bucket=self.bucket, Body=data, **self.kwargs)
                 if self.acl:
                     kw["ACL"] = self.acl
-                write_result = self._call_s3("put_object", **kw)
+                write_result = self._call_s3("put_object", **kw, **match)
             else:
                 raise RuntimeError
         else:
             logger.debug("Complete multi-part upload for %s " % self)
-            if "x" in self.mode:
-                match = {"IfNoneMatch": "*"}
-            else:
-                match = {}
             part_info = {"Parts": self.parts}
             write_result = self._call_s3(
                 "complete_multipart_upload",

{s3fs-2025.5.1 → s3fs-2025.9.0}/s3fs/tests/derived/s3fs_test.py

@@ -33,7 +33,6 @@ class TestS3fsPipe(abstract.AbstractPipeTests, S3fsFixtures):
 
 
 class TestS3fsOpen(abstract.AbstractOpenTests, S3fsFixtures):
-
     test_open_exclusive = pytest.mark.xfail(
         reason="complete_multipart_upload doesn't implement condition in moto"
     )(abstract.AbstractOpenTests.test_open_exclusive)

{s3fs-2025.5.1 → s3fs-2025.9.0}/s3fs/tests/test_s3fs.py

@@ -18,6 +18,7 @@ from itertools import chain
 import fsspec.core
 from dateutil.tz import tzutc
 
+import botocore
 import s3fs.core
 from s3fs.core import S3FileSystem
 from s3fs.utils import ignoring, SSEParams
@@ -2759,7 +2760,7 @@ def test_async_stream(s3_base):
         )
         await fs._mkdir(test_bucket_name)
         await fs._pipe(fn, data)
-        f = await fs.open_async(fn, mode="rb", block_seze=1000)
+        f = await fs.open_async(fn, mode="rb", block_size=1000)
         while True:
             got = await f.read(1000)
             assert f.size == len(data)
@@ -2888,7 +2889,14 @@ def test_exist_after_delete(s3):
     assert not s3.exists(test_dir)
 
 
-@pytest.mark.xfail(reason="moto doesn't support conditional MPU")
+# condition: True if running on botocore < 1.36.0
+# The below tests for exclusive writes will fail on older versions of botocore.
+old_botocore = version.parse(botocore.__version__) < version.parse("1.36.0")
+
+
+@pytest.mark.xfail(
+    reason="moto doesn't support IfNoneMatch for MPU when object created via MPU"
+)
 def test_pipe_exclusive_big(s3):
     chunksize = 5 * 2**20  # minimum allowed
     data = b"x" * chunksize * 3
@@ -2899,17 +2907,82 @@ def test_pipe_exclusive_big(s3):
     assert not s3.list_multipart_uploads(test_bucket_name)
 
 
-@pytest.mark.xfail(reason="moto doesn't support conditional MPU")
-def test_put_exclusive_big(s3, tempdir):
+@pytest.mark.xfail(
+    old_botocore, reason="botocore<1.33.0 lacks IfNoneMatch support", strict=True
+)
+def test_pipe_exclusive_big_after_small(s3):
+    """Test conditional MPU after creating object via put_object
+
+    This test is required because moto's implementation of IfNoneMatch for MPU
+    only works when the object is initially created via put_object and not via
+    MPU.
+    """
     chunksize = 5 * 2**20  # minimum allowed
-    data = b"x" * chunksize * 3
-    fn = f"{tempdir}/afile"
-    with open(fn, "wb") as f:
-        f.write(fn)
-    s3.put(fn, f"{test_bucket_name}/afile", data, mode="overwrite", chunksize=chunksize)
-    s3.put(fn, f"{test_bucket_name}/afile", data, mode="overwrite", chunksize=chunksize)
+
+    # First, create object via put_object (small upload)
+    s3.pipe(f"{test_bucket_name}/afile", b"small", mode="overwrite")
+
+    # Now try multipart upload with mode="create" (should fail)
     with pytest.raises(FileExistsError):
-        s3.put(
-            fn, f"{test_bucket_name}/afile", data, mode="create", chunksize=chunksize
+        s3.pipe(
+            f"{test_bucket_name}/afile",
+            b"c" * chunksize * 3,
+            mode="create",
+            chunksize=chunksize,
         )
+
+    assert not s3.list_multipart_uploads(test_bucket_name)
+
+
+@pytest.mark.xfail(
+    reason="moto doesn't support IfNoneMatch for MPU when object created via MPU"
+)
+def test_put_exclusive_big(s3, tmpdir):
+    chunksize = 5 * 2**20  # minimum allowed
+    fn = f"{tmpdir}/afile"
+    with open(fn, "wb") as f:
+        f.write(b"x" * chunksize * 3)
+    s3.put(fn, f"{test_bucket_name}/afile", mode="overwrite", chunksize=chunksize)
+    s3.put(fn, f"{test_bucket_name}/afile", mode="overwrite", chunksize=chunksize)
+    with pytest.raises(FileExistsError):
+        s3.put(fn, f"{test_bucket_name}/afile", mode="create", chunksize=chunksize)
+    assert not s3.list_multipart_uploads(test_bucket_name)
+
+
+@pytest.mark.xfail(
+    old_botocore, reason="botocore<1.33.0 lacks IfNoneMatch support", strict=True
+)
+def test_put_exclusive_big_after_small(s3, tmpdir):
+    """Test conditional MPU after creating object via put_object.
+
+    This test is required because moto's implementation of IfNoneMatch for MPU
+    only works when the object is initially created via put_object and not via
+    MPU.
+    """
+    chunksize = 5 * 2**20  # minimum allowed
+    fn = str(tmpdir.join("afile"))
+    with open(fn, "wb") as f:
+        f.write(b"x" * chunksize * 3)
+
+    # First, create object via put_object (small upload)
+    s3.pipe(f"{test_bucket_name}/afile", b"small", mode="overwrite")
+
+    # Now try multipart upload with mode="create" (should fail)
+    with pytest.raises(FileExistsError):
+        s3.put(fn, f"{test_bucket_name}/afile", mode="create", chunksize=chunksize)
+
+    assert not s3.list_multipart_uploads(test_bucket_name)
+
+
+@pytest.mark.xfail(
+    old_botocore, reason="botocore<1.33.0 lacks IfNoneMatch support", strict=True
+)
+def test_put_exclusive_small(s3, tmpdir):
+    fn = f"{tmpdir}/afile"
+    with open(fn, "wb") as f:
+        f.write(b"x")
+    s3.put(fn, f"{test_bucket_name}/afile", mode="overwrite")
+    s3.put(fn, f"{test_bucket_name}/afile", mode="overwrite")
+    with pytest.raises(FileExistsError):
+        s3.put(fn, f"{test_bucket_name}/afile", mode="create")
     assert not s3.list_multipart_uploads(test_bucket_name)

{s3fs-2025.5.1 → s3fs-2025.9.0}/s3fs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: s3fs
-Version: 2025.5.1
+Version: 2025.9.0
 Summary: Convenient Filesystem interface over S3
 Home-page: http://github.com/fsspec/s3fs/
 Maintainer: Martin Durant
@@ -17,15 +17,18 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >= 3.9
+Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: aiobotocore<3.0.0,>=2.5.4
-Requires-Dist: fsspec==2025.5.1
+Requires-Dist: fsspec==2025.9.0
 Requires-Dist: aiohttp!=4.0.0a0,!=4.0.0a1
 Provides-Extra: awscli
 Requires-Dist: aiobotocore[awscli]<3.0.0,>=2.5.4; extra == "awscli"
 Provides-Extra: boto3
 Requires-Dist: aiobotocore[boto3]<3.0.0,>=2.5.4; extra == "boto3"
 Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
@@ -37,21 +40,4 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-s3fs
-====
-
-|Build Status| |Doc Status|
-
-S3FS builds on aiobotocore_ to provide a convenient Python filesystem interface for S3.
-
-View the documentation_ for s3fs.
-
-.. _documentation: http://s3fs.readthedocs.io/en/latest/
-.. _aiobotocore: https://aiobotocore.readthedocs.io/en/latest/
-
-.. |Build Status| image:: https://github.com/fsspec/s3fs/workflows/CI/badge.svg
-    :target: https://github.com/fsspec/s3fs/actions
-    :alt: Build Status
-.. |Doc Status| image:: https://readthedocs.org/projects/s3fs/badge/?version=latest
-    :target: https://s3fs.readthedocs.io/en/latest/?badge=latest
-    :alt: Documentation Status
+README.md

{s3fs-2025.5.1 → s3fs-2025.9.0}/s3fs.egg-info/SOURCES.txt

@@ -1,6 +1,6 @@
 LICENSE.txt
 MANIFEST.in
-README.rst
+README.md
 requirements.txt
 setup.cfg
 setup.py

{s3fs-2025.5.1 → s3fs-2025.9.0}/s3fs.egg-info/requires.txt

@@ -1,5 +1,5 @@
 aiobotocore<3.0.0,>=2.5.4
-fsspec==2025.5.1
+fsspec==2025.9.0
 aiohttp!=4.0.0a0,!=4.0.0a1
 
 [awscli]

{s3fs-2025.5.1 → s3fs-2025.9.0}/setup.py

@@ -39,5 +39,7 @@ setup(
         "awscli": [f"aiobotocore[awscli]{aiobotocore_version_suffix}"],
         "boto3": [f"aiobotocore[boto3]{aiobotocore_version_suffix}"],
     },
+    long_description="README.md",
+    long_description_content_type="text/markdown",
     zip_safe=False,
 )

s3fs-2025.5.1/README.rst

@@ -1,18 +0,0 @@
-s3fs
-====
-
-|Build Status| |Doc Status|
-
-S3FS builds on aiobotocore_ to provide a convenient Python filesystem interface for S3.
-
-View the documentation_ for s3fs.
-
-.. _documentation: http://s3fs.readthedocs.io/en/latest/
-.. _aiobotocore: https://aiobotocore.readthedocs.io/en/latest/
-
-.. |Build Status| image:: https://github.com/fsspec/s3fs/workflows/CI/badge.svg
-    :target: https://github.com/fsspec/s3fs/actions
-    :alt: Build Status
-.. |Doc Status| image:: https://readthedocs.org/projects/s3fs/badge/?version=latest
-    :target: https://s3fs.readthedocs.io/en/latest/?badge=latest
-    :alt: Documentation Status