Merge pull request #959 from rkingsbury/main

update decorators for moto v5

pyproject.toml

@@ -71,7 +71,7 @@ testing = [
             "pytest-asyncio",
             "pytest-xdist",
             "pre-commit",
-            "moto",
+            "moto>=5.0", # mock_s3 changed to mock_aws in v5
             "ruff",
             "responses<0.22.0",
             "types-pyYAML",

requirements/macos-latest_py3.10_extras.txt

@@ -226,7 +226,7 @@ monty==2023.11.3
     # via maggma (setup.py)
 montydb==2.5.2
     # via maggma (setup.py)
-moto==4.2.11
+moto==5.0.9
     # via maggma (setup.py)
 msal==1.26.0
     # via

requirements/macos-latest_py3.11_extras.txt

@@ -221,7 +221,7 @@ monty==2023.11.3
     # via maggma (setup.py)
 montydb==2.5.2
     # via maggma (setup.py)
-moto==4.2.11
+moto==5.0.9
     # via maggma (setup.py)
 msal==1.26.0
     # via

requirements/macos-latest_py3.12_extras.txt

@@ -221,7 +221,7 @@ monty==2023.11.3
     # via maggma (setup.py)
 montydb==2.5.3
     # via maggma (setup.py)
-moto==4.2.11
+moto==5.0.9
     # via maggma (setup.py)
 msal==1.26.0
     # via

requirements/macos-latest_py3.9_extras.txt

@@ -231,7 +231,7 @@ monty==2023.11.3
     # via maggma (setup.py)
 montydb==2.5.2
     # via maggma (setup.py)
-moto==4.2.11
+moto==5.0.9
     # via maggma (setup.py)
 msal==1.26.0
     # via

requirements/ubuntu-latest_py3.10_extras.txt

@@ -226,7 +226,7 @@ monty==2023.11.3
     # via maggma (setup.py)
 montydb==2.5.2
     # via maggma (setup.py)
-moto==4.2.11
+moto==5.0.9
     # via maggma (setup.py)
 msal==1.26.0
     # via

requirements/ubuntu-latest_py3.11_extras.txt

@@ -221,7 +221,7 @@ monty==2023.11.3
     # via maggma (setup.py)
 montydb==2.5.2
     # via maggma (setup.py)
-moto==4.2.11
+moto==5.0.9
     # via maggma (setup.py)
 msal==1.26.0
     # via

requirements/ubuntu-latest_py3.12_extras.txt

@@ -221,7 +221,7 @@ monty==2023.11.3
     # via maggma (setup.py)
 montydb==2.5.3
     # via maggma (setup.py)
-moto==4.2.11
+moto==5.0.9
     # via maggma (setup.py)
 msal==1.26.0
     # via

requirements/ubuntu-latest_py3.9_extras.txt

@@ -231,7 +231,7 @@ monty==2023.11.3
     # via maggma (setup.py)
 montydb==2.5.2
     # via maggma (setup.py)
-moto==4.2.11
+moto==5.0.9
     # via maggma (setup.py)
 msal==1.26.0
     # via

tests/stores/test_aws.py

@@ -4,7 +4,7 @@
 import boto3
 import pytest
 from botocore.exceptions import ClientError
-from moto import mock_s3
+from moto import mock_aws
 from sshtunnel import BaseSSHTunnelForwarderError
 
 from maggma.stores import MemoryStore, MongoStore, S3Store
@@ -32,7 +32,7 @@ def ssh_tunnel():
 
 @pytest.fixture()
 def s3store():
-    with mock_s3():
+    with mock_aws():
         conn = boto3.resource("s3", region_name="us-east-1")
         conn.create_bucket(Bucket="bucket1")
 
@@ -64,7 +64,7 @@ def s3store():
 
 @pytest.fixture()
 def s3store_w_subdir():
-    with mock_s3():
+    with mock_aws():
         conn = boto3.resource("s3", region_name="us-east-1")
         conn.create_bucket(Bucket="bucket1")
 
@@ -77,7 +77,7 @@ def s3store_w_subdir():
 
 @pytest.fixture()
 def s3store_multi():
-    with mock_s3():
+    with mock_aws():
         conn = boto3.resource("s3", region_name="us-east-1")
         conn.create_bucket(Bucket="bucket1")
 
@@ -90,7 +90,7 @@ def s3store_multi():
 
 @pytest.fixture()
 def s3store_with_tunnel(ssh_tunnel):
-    with mock_s3():
+    with mock_aws():
         conn = boto3.resource("s3", region_name="us-east-1")
         conn.create_bucket(Bucket="bucket1")
 
@@ -102,7 +102,7 @@ def s3store_with_tunnel(ssh_tunnel):
 
 
 def test_keys():
-    with mock_s3():
+    with mock_aws():
         conn = boto3.resource("s3", region_name="us-east-1")
         conn.create_bucket(Bucket="bucket1")
         index = MemoryStore("index", key=1)
@@ -306,7 +306,7 @@ def test_searchable_fields(s3store):
 
 
 def test_newer_in(s3store):
-    with mock_s3():
+    with mock_aws():
         tic = datetime(2018, 4, 12, 16)
         tic2 = datetime.utcnow()
         conn = boto3.client("s3")
@@ -358,7 +358,7 @@ def test_get_session(s3store):
 
 
 def test_no_bucket():
-    with mock_s3():
+    with mock_aws():
         conn = boto3.resource("s3", region_name="us-east-1")
         conn.create_bucket(Bucket="bucket1")
 
@@ -431,7 +431,7 @@ def local_address(self):
             return "ADDRESS", "PORT"
 
     def get_store():
-        with mock_s3():
+        with mock_aws():
             conn = boto3.resource("s3", region_name="us-east-1")
             conn.create_bucket(Bucket="bucket1")
 

tests/stores/test_open_data.py

@@ -8,7 +8,7 @@
 import pandas as pd
 import pytest
 from bson import json_util
-from moto import mock_s3
+from moto import mock_aws
 
 from maggma.stores.open_data import OpenDataStore, PandasMemoryStore, S3IndexStore, TasksOpenDataStore
 
@@ -203,7 +203,7 @@ def test_pdmems_update(memstore):
 @pytest.fixture()
 def s3indexstore():
     data = [{"task_id": "mp-1", "last_updated": datetime.utcnow()}]
-    with mock_s3():
+    with mock_aws():
         conn = boto3.resource("s3", region_name="us-east-1")
         conn.create_bucket(Bucket="bucket1")
         client = boto3.client("s3", region_name="us-east-1")
@@ -232,7 +232,7 @@ def test_s3is_pickle(s3indexstore):
 
 def test_s3is_connect_retrieve_manifest(s3indexstore):
     assert s3indexstore.retrieve_manifest().equals(s3indexstore._data)
-    with mock_s3():
+    with mock_aws():
         with pytest.raises(s3indexstore.s3_client.exceptions.NoSuchBucket):
             S3IndexStore(collection_name="foo", bucket="bucket2", key="task_id").retrieve_manifest()
         with pytest.raises(RuntimeError):
@@ -247,7 +247,7 @@ def test_s3is_connect_retrieve_manifest(s3indexstore):
 
 
 def test_s3is_store_manifest():
-    with mock_s3():
+    with mock_aws():
         conn = boto3.resource("s3", region_name="us-east-1")
         conn.create_bucket(Bucket="bucket2")
         s3is = S3IndexStore(collection_name="foo", bucket="bucket2", key="task_id")
@@ -276,7 +276,7 @@ def test_s3is_close(s3indexstore):
 
 @pytest.fixture()
 def s3store():
-    with mock_s3():
+    with mock_aws():
         conn = boto3.resource("s3", region_name="us-east-1")
         conn.create_bucket(Bucket="bucket1")
 
@@ -309,7 +309,7 @@ def s3store():
 
 @pytest.fixture()
 def s3store_w_subdir():
-    with mock_s3():
+    with mock_aws():
         conn = boto3.resource("s3", region_name="us-east-1")
         conn.create_bucket(Bucket="bucket1")
         conn.create_bucket(Bucket="bucket2")
@@ -364,7 +364,7 @@ def test_read_doc_from_s3():
         {"task_id": "mp-1", "last_updated": datetime.utcnow(), "group": "foo", "also_group": "boo"},
         {"task_id": "mp-2", "last_updated": datetime.utcnow(), "group": "foo", "also_group": "boo"},
     ]
-    with mock_s3():
+    with mock_aws():
         conn = boto3.resource("s3", region_name="us-east-1")
         conn.create_bucket(Bucket="bucket1")
         client = boto3.client("s3", region_name="us-east-1")
@@ -560,7 +560,7 @@ def test_additional_metadata(s3store):
 
 def test_rebuild_index_from_s3_for_tasks_store():
     data = [{"task_id": "mp-2", "data": "asd", "last_updated": datetime.utcnow(), "group": {"level_two": 4}}]
-    with mock_s3():
+    with mock_aws():
         conn = boto3.resource("s3", region_name="us-east-1")
         conn.create_bucket(Bucket="bucket1")
 
@@ -590,7 +590,7 @@ def test_rebuild_index_from_s3_for_tasks_store():
 
 
 def test_no_update_for_tasks_store():
-    with mock_s3():
+    with mock_aws():
         conn = boto3.resource("s3", region_name="us-east-1")
         conn.create_bucket(Bucket="bucket1")
         store = TasksOpenDataStore(