Merge pull request #26 from asfadmin/rew/unpin-s3fs

Allow later versions of s3fs

README.md

@@ -6,12 +6,12 @@ A generic framework for writing satellite data ingest systems
 ## Installing
 Mandible can be installed from GitHub using `pip`.
 ```
-$ pip install git+https://github.com/asfadmin/mandible@v0.2.0
+$ pip install git+https://github.com/asfadmin/mandible@v0.7.1
 ```
 
 To install with all extra dependencies:
 ```
-$ pip install git+https://github.com/asfadmin/mandible@v0.2.0#egg=mandible[all]
+$ pip install git+https://github.com/asfadmin/mandible@v0.7.1#egg=mandible[all]
 ```
 
 To install the latest development version:

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mandible"
-version = "0.7.0"
+version = "0.7.1"
 description = "A generic framework for writing satellite data ingest systems"
 authors = ["Rohan Weeden <[email protected]>", "Matt Perry <[email protected]>"]
 license = "APACHE-2"
@@ -15,7 +15,7 @@ build-backend = "poetry.core.masonry.api"
 python = ">=3.8"
 
 # Required
-s3fs = "^0.4.2"
+s3fs = ">=0.4.2"
 
 # Optional
 h5py = { version = "^3.6.0", optional = true }
@@ -32,7 +32,7 @@ xml = ["lxml"]
 
 [tool.poetry.group.dev.dependencies]
 boto3 = "^1.18"
-moto = "^4.0.1"
+moto = "^5.0.0"
 pytest = "^8.0.2"
 pytest-cov = "^4.0.0"
 pytest-mock = "^3.8.2"

tests/conftest.py

@@ -3,7 +3,7 @@
 
 import boto3
 import pytest
-from moto import mock_s3
+from moto import mock_aws
 
 
 @pytest.fixture
@@ -18,7 +18,7 @@ def aws_credentials():
 
 @pytest.fixture
 def s3_resource(aws_credentials):
-    with mock_s3():
+    with mock_aws():
         yield boto3.resource("s3")
 
 

tox.ini

@@ -16,12 +16,15 @@ python =
 allowlist_externals = poetry
 deps =
     boto3~=1.18
-    moto~=4.0
-    pytest~=7.1
-    pytest-mock~=3.8.2
+    moto~=5.0
+    pytest~=8.1
+    pytest-mock~=3.8
     jp14: jsonpath-ng~=1.4.0
     jp15: jsonpath-ng~=1.5.0
     jp16: jsonpath-ng~=1.6.0
+    # s3fs + moto breaks due to an issue with aiobotocore.
+    # https://github.com/aio-libs/aiobotocore/issues/755
+    s3fs~=0.4.2
 extras =
     Xnone:
     Xall: all