Support moto 4 & 5

piskvorky · Feb 19, 2024 · 7aeff9d · 7aeff9d
1 parent 2ad2305
commit 7aeff9d
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 61 deletions.
diff --git a/setup.py b/setup.py
@@ -44,7 +44,7 @@ def read(fname):
 
 all_deps = aws_deps + gcs_deps + azure_deps + http_deps + ssh_deps
 tests_require = all_deps + [
-    'moto[server]<5.0',
+    'moto[server]',
     'responses',
     'boto3',
     'pytest',

diff --git a/smart_open/tests/test_s3.py b/smart_open/tests/test_s3.py
@@ -21,9 +21,13 @@
 import boto3
 import botocore.client
 import botocore.endpoint
-import moto
 import pytest
 
+try:
+    from moto import mock_s3
+except ImportError:
+    from moto import mock_aws as mock_s3
+
 import smart_open
 import smart_open.s3
 
@@ -189,7 +193,7 @@ def test_every_second_read_fails(self):
             mock_sleep.reset_mock()
 
 
-@moto.mock_s3
+@mock_s3
 class ReaderTest(BaseTest):
     def setUp(self):
         # lower the multipart upload size, to speed up these tests
@@ -411,7 +415,7 @@ def test_read_empty_file_no_actual_size(self):
         self.assertEqual(data, b'')
 
 
-@moto.mock_s3
+@mock_s3
 class MultipartWriterTest(unittest.TestCase):
     """
     Test writing into s3 files.
@@ -566,7 +570,7 @@ def test_writebuffer(self):
             assert actual == contents
 
 
-@moto.mock_s3
+@mock_s3
 class SinglepartWriterTest(unittest.TestCase):
     """
     Test writing into s3 files using single part upload.
@@ -676,7 +680,7 @@ def test_writebuffer(self):
 ARBITRARY_CLIENT_ERROR = botocore.client.ClientError(error_response={}, operation_name='bar')
 
 
-@moto.mock_s3
+@mock_s3
 class IterBucketTest(unittest.TestCase):
     def setUp(self):
         ignore_resource_warnings()
@@ -766,7 +770,7 @@ def test_list_bucket_long(self):
         self.assertEqual(sorted(keys), sorted(expected))
 
 
-@moto.mock_s3
+@mock_s3
 @pytest.mark.skipif(
     condition=not smart_open.concurrency._CONCURRENT_FUTURES,
     reason='concurrent.futures unavailable',
@@ -797,7 +801,7 @@ def test(self):
         self.assertEqual(sorted(keys), sorted(expected))
 
 
-@moto.mock_s3
+@mock_s3
 @pytest.mark.skipif(
     condition=not smart_open.concurrency._MULTIPROCESSING,
     reason='multiprocessing unavailable',
@@ -828,7 +832,7 @@ def test(self):
         self.assertEqual(sorted(keys), sorted(expected))
 
 
-@moto.mock_s3
+@mock_s3
 class IterBucketSingleProcessTest(unittest.TestCase):
     def setUp(self):
         self.old_flag_multi = smart_open.concurrency._MULTIPROCESSING
@@ -858,7 +862,7 @@ def test(self):
 # This has to be a separate test because we cannot run it against real S3
 # (we don't want to expose our real S3 credentials).
 #
-@moto.mock_s3
+@mock_s3
 class IterBucketCredentialsTest(unittest.TestCase):
     def test(self):
         _resource('s3').create_bucket(Bucket=BUCKET_NAME).wait_until_exists()
@@ -875,7 +879,7 @@ def test(self):
         self.assertEqual(len(result), num_keys)
 
 
-@moto.mock_s3
+@mock_s3
 class DownloadKeyTest(unittest.TestCase):
     def setUp(self):
         ignore_resource_warnings()
@@ -920,7 +924,7 @@ def test_propagates_other_exception(self):
                               KEY_NAME, bucket_name=BUCKET_NAME)
 
 
-@moto.mock_s3
+@mock_s3
 class OpenTest(unittest.TestCase):
     def setUp(self):
         ignore_resource_warnings()
@@ -962,7 +966,7 @@ def test_failure(self):
         self.assertEqual(partial.call_count, 3)
 
 
-@moto.mock_s3()
+@mock_s3
 def test_client_propagation_singlepart():
     """Does the client parameter make it from the caller to Boto3?"""
     #
@@ -985,7 +989,7 @@ def test_client_propagation_singlepart():
         assert id(writer._client.client) == id(client)
 
 
-@moto.mock_s3()
+@mock_s3
 def test_client_propagation_multipart():
     """Does the resource parameter make it from the caller to Boto3?"""
     session = boto3.Session()
@@ -1004,7 +1008,7 @@ def test_client_propagation_multipart():
         assert id(writer._client.client) == id(client)
 
 
-@moto.mock_s3()
+@mock_s3
 def test_resource_propagation_reader():
     """Does the resource parameter make it from the caller to Boto3?"""
     session = boto3.Session()

diff --git a/smart_open/tests/test_s3_version.py b/smart_open/tests/test_s3_version.py
@@ -6,10 +6,13 @@
 import time
 
 import boto3
-import moto
 
-from smart_open import open
+try:
+    from moto import mock_s3
+except ImportError:
+    from moto import mock_aws as mock_s3
 
+from smart_open import open
 
 BUCKET_NAME = 'test-smartopen'
 KEY_NAME = 'test-key'
@@ -32,7 +35,7 @@ def get_versions(bucket, key):
     ]
 
 
-@moto.mock_s3
+@mock_s3
 class TestVersionId(unittest.TestCase):
     def setUp(self):
         #