Merge branch 'main' into release

Author: Martin Durant

s3fs/core.py

@@ -1637,6 +1637,14 @@ async def _bulk_delete(self, pathlist, **kwargs):
             self.invalidate_cache(self._parent(path))
         await self._call_s3("delete_objects", kwargs, Bucket=bucket, Delete=delete_keys)
 
+    async def _rm_file(self, path, **kwargs):
+        bucket, key, _ = self.split_path(path)
+
+        try:
+            await self._call_s3("delete_object", Bucket=bucket, Key=key)
+        except ClientError as e:
+            raise translate_boto_error(e)
+
     async def _rm(self, path, recursive=False, **kwargs):
         if recursive and isinstance(path, str):
             bucket, key, _ = self.split_path(path)

s3fs/tests/test_s3fs.py

@@ -2162,3 +2162,11 @@ def test_upload_recursive_to_bucket(s3, tmpdir):
     for f in files:
         open(f, "w").write("hello")
     s3.put(folders[0], "newbucket", recursive=True)
+
+
+def test_rm_file(s3):
+    target = test_bucket_name + "/to_be_removed/file"
+    s3.touch(target)
+    s3.rm_file(target)
+    assert not s3.exists(target)
+    assert not s3.exists(test_bucket_name + "/to_be_removed")