Making cfripper compatible with Python3.10 (#219)

* first iteration for making cfripper compatible with Python3.10 * update changelog and version * update version to 1.9.0 * PR suggestions - removing docker dev dependency and including extra requirements provided by moto * update CHANGELOG.md Co-authored-by: Ramon <[email protected]> Co-authored-by: Jordi Soucheiron <[email protected]>
Skyscanner · Apr 19, 2022 · f567d4e · f567d4e
1 parent e1dea01
commit f567d4e
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 8 deletions.
diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8', '3.9']
+        python-version: ['3.7', '3.8', '3.9', '3.10']
 
     name: Python ${{ matrix.python-version }}
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,8 +3,12 @@ All notable changes to this project will be documented in this file.
 
 ## [1.9.0]
 ### Improvements
+- CFRipper is now compatible with Python3.10
 - CFRipper is now able to detect new types of wildcard usage.
 
+### Updates
+- Bump dev dependency `moto` to allow `>=3.0.0`.
+
 ## [1.8.0]
 ### Improvements
 - Pin `click` to at least version `8.0.0`.

diff --git a/cfripper/__version__.py b/cfripper/__version__.py
@@ -1,3 +1,3 @@
-VERSION = (1, 8, 0)
+VERSION = (1, 9, 0)
 
 __version__ = ".".join(map(str, VERSION))
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
+# This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
 #    make freeze

diff --git a/setup.py b/setup.py
@@ -23,7 +23,7 @@
     "pytest>=3.6",
     "pytest-cov>=2.5.1",
     "pip-tools>=5.3.1",
-    "moto==1.3.14",
+    "moto[cloudformation,s3]>=3.0.0",
 ]
 
 docs_requires = [

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -46,3 +46,8 @@ def default_allow_all_config():
             ),
         ],
     )
+
+
+@pytest.fixture
+def default_aws_region() -> str:
+    return "eu-west-1"
diff --git a/tests/test_boto3_client.py b/tests/test_boto3_client.py
@@ -18,16 +18,18 @@
 
 
 @pytest.fixture
-def s3_bucket():
+def s3_bucket(default_aws_region):
     with mock_s3():
-        boto3.client("s3").create_bucket(Bucket=TEST_BUCKET_NAME)
+        boto3.client("s3").create_bucket(
+            Bucket=TEST_BUCKET_NAME, CreateBucketConfiguration={"LocationConstraint": default_aws_region}
+        )
         yield boto3.resource("s3").Bucket(TEST_BUCKET_NAME)
 
 
 @pytest.fixture
-def boto3_client():
+def boto3_client(default_aws_region):
     with mock_sts():
-        yield Boto3Client("123456789", "eu-west-1", "stack-id")
+        yield Boto3Client("123456789", default_aws_region, "stack-id")
 
 
 @pytest.mark.parametrize(