Merge pull request #322 from mfarhan943/mfarhan/remove-constraints-mo…

…to-below-5.0

Remove moto<5.0 constraint and update dependencies

requirements/base.txt

@@ -6,9 +6,9 @@
 #
 boto==2.49.0
     # via google-compute-engine
-boto3==1.35.6
+boto3==1.35.73
     # via -r requirements/base.in
-botocore==1.35.6
+botocore==1.35.73
     # via
     #   -r requirements/base.in
     #   boto3
@@ -24,17 +24,17 @@ jmespath==1.0.1
     #   -r requirements/base.in
     #   boto3
     #   botocore
-markupsafe==2.1.5
+markupsafe==3.0.2
     # via jinja2
 python-dateutil==2.9.0.post0
     # via botocore
-s3transfer==0.10.2
+s3transfer==0.10.4
     # via boto3
 six==1.16.0
     # via
     #   -r requirements/base.in
     #   python-dateutil
-urllib3==2.2.2
+urllib3==2.2.3
     # via botocore
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/constraints.txt

@@ -10,7 +10,3 @@
 
 # This file contains all common constraints for edx-repos
 -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
-
-# moto==5.0 contains breaking changes in test env
-# neeeds to be fixed in a separate pr
-moto<5.0

requirements/pip.txt

@@ -4,11 +4,13 @@
 #
 #    make upgrade
 #
-wheel==0.44.0
+wheel==0.45.1
     # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
 pip==24.2
-    # via -r requirements/pip.in
-setuptools==73.0.1
+    # via
+    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+    #   -r requirements/pip.in
+setuptools==75.6.0
     # via -r requirements/pip.in

requirements/pip_tools.txt

@@ -4,19 +4,19 @@
 #
 #    make upgrade
 #
-build==1.2.1
+build==1.2.2.post1
     # via pip-tools
 click==8.1.7
     # via pip-tools
-packaging==24.1
+packaging==24.2
     # via build
 pip-tools==7.4.1
     # via -r requirements/pip_tools.in
-pyproject-hooks==1.1.0
+pyproject-hooks==1.2.0
     # via
     #   build
     #   pip-tools
-wheel==0.44.0
+wheel==0.45.1
     # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/test.txt

@@ -12,59 +12,53 @@ attrs==24.2.0
     # via
     #   jsonschema
     #   referencing
-aws-sam-translator==1.91.0
+aws-sam-translator==1.94.0
     # via cfn-lint
 aws-xray-sdk==2.14.0
     # via moto
 boto==2.49.0
     # via
     #   -r requirements/base.txt
     #   google-compute-engine
-boto3==1.35.6
+boto3==1.35.73
     # via
     #   -r requirements/base.txt
     #   aws-sam-translator
     #   moto
-botocore==1.35.6
+botocore==1.35.73
     # via
     #   -r requirements/base.txt
     #   aws-xray-sdk
     #   boto3
     #   moto
     #   s3transfer
-certifi==2024.7.4
+certifi==2024.8.30
     # via requests
-cffi==1.17.0
+cffi==1.17.1
     # via cryptography
-cfn-lint==1.10.3
+cfn-lint==1.20.2
     # via moto
-charset-normalizer==3.3.2
+charset-normalizer==3.4.0
     # via requests
-cryptography==43.0.0
+cryptography==44.0.0
     # via
+    #   joserfc
     #   moto
-    #   python-jose
-    #   sshpubkeys
-dill==0.3.8
+dill==0.3.9
     # via pylint
 distro==1.9.0
     # via
     #   -r requirements/base.txt
     #   google-compute-engine
 docker==7.1.0
     # via moto
-ecdsa==0.19.0
-    # via
-    #   moto
-    #   python-jose
-    #   sshpubkeys
 future==1.0.0
     # via pyresttest
 google-compute-engine==2.8.13
     # via -r requirements/base.txt
-graphql-core==3.2.3
+graphql-core==3.2.5
     # via moto
-idna==3.8
+idna==3.10
     # via requests
 iniconfig==2.0.0
     # via pytest
@@ -79,7 +73,9 @@ jmespath==1.0.1
     #   -r requirements/base.txt
     #   boto3
     #   botocore
-jsondiff==2.2.0
+joserfc==1.0.1
+    # via moto
+jsondiff==2.2.1
     # via moto
 jsonpatch==1.33
     # via cfn-lint
@@ -98,7 +94,7 @@ jsonschema-specifications==2023.12.1
     #   openapi-schema-validator
 lazy-object-proxy==1.10.0
     # via openapi-spec-validator
-markupsafe==2.1.5
+markupsafe==3.0.2
     # via
     #   -r requirements/base.txt
     #   jinja2
@@ -107,57 +103,51 @@ mccabe==0.7.0
     # via pylint
 mock==5.1.0
     # via -r requirements/test.in
-moto[cloudformation]==4.2.14
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/test.in
+moto[cloudformation]==5.0.22
+    # via -r requirements/test.in
 mpmath==1.3.0
     # via sympy
-networkx==3.3
+networkx==3.4.2
     # via cfn-lint
 openapi-schema-validator==0.6.2
     # via openapi-spec-validator
 openapi-spec-validator==0.7.1
     # via moto
-packaging==24.1
+packaging==24.2
     # via pytest
 pathable==0.4.3
     # via jsonschema-path
 pep8==1.7.1
     # via -r requirements/test.in
-platformdirs==4.2.2
+platformdirs==4.3.6
     # via pylint
 pluggy==1.5.0
     # via pytest
-py-partiql-parser==0.5.0
+py-partiql-parser==0.5.6
     # via moto
-pyasn1==0.6.0
-    # via
-    #   python-jose
-    #   rsa
 pycparser==2.22
     # via cffi
 pycurl==7.45.3
     # via pyresttest
-pydantic==2.8.2
+pydantic==2.10.2
     # via aws-sam-translator
-pydantic-core==2.20.1
+pydantic-core==2.27.1
     # via pydantic
 pylint==3.2.6
-    # via -r requirements/test.in
-pyparsing==3.1.4
+    # via
+    #   -c requirements/constraints.txt
+    #   -r requirements/test.in
+pyparsing==3.2.0
     # via moto
 pyresttest==1.7.1
     # via -r requirements/test.in
-pytest==8.3.2
+pytest==8.3.4
     # via -r requirements/test.in
 python-dateutil==2.9.0.post0
     # via
     #   -r requirements/base.txt
     #   botocore
     #   moto
-python-jose[cryptography]==3.3.0
-    # via moto
 pyyaml==6.0.2
     # via
     #   cfn-lint
@@ -171,7 +161,7 @@ referencing==0.35.1
     #   jsonschema
     #   jsonschema-path
     #   jsonschema-specifications
-regex==2024.7.24
+regex==2024.11.6
     # via cfn-lint
 requests==2.32.3
     # via
@@ -183,25 +173,20 @@ responses==0.25.3
     # via moto
 rfc3339-validator==0.1.4
     # via openapi-schema-validator
-rpds-py==0.20.0
+rpds-py==0.22.0
     # via
     #   jsonschema
     #   referencing
-rsa==4.9
-    # via python-jose
-s3transfer==0.10.2
+s3transfer==0.10.4
     # via
     #   -r requirements/base.txt
     #   boto3
 six==1.16.0
     # via
     #   -r requirements/base.txt
-    #   ecdsa
     #   python-dateutil
     #   rfc3339-validator
-sshpubkeys==3.3.1
-    # via moto
-sympy==1.13.2
+sympy==1.13.3
     # via cfn-lint
 tomlkit==0.13.2
     # via pylint
@@ -211,18 +196,18 @@ typing-extensions==4.12.2
     #   cfn-lint
     #   pydantic
     #   pydantic-core
-urllib3==2.2.2
+urllib3==2.2.3
     # via
     #   -r requirements/base.txt
     #   botocore
     #   docker
     #   requests
     #   responses
-werkzeug==3.0.4
+werkzeug==3.1.3
     # via moto
-wrapt==1.16.0
+wrapt==1.17.0
     # via aws-xray-sdk
-xmltodict==0.13.0
+xmltodict==0.14.2
     # via moto
 
 # The following packages are considered to be unsafe in a requirements file:

scripts/aws/tests/test_bootstrap.py

@@ -3,7 +3,6 @@
 """
 import boto3
 import pytest
-from moto import mock_apigateway, mock_route53
 from unittest import TestCase
 from bootstrap import get_domain, get_base_path, create_apigw_custom_domain_name,\
     create_route53_rs, bootstrap_api, create_base_path_mapping, file_arg_to_string

scripts/aws/tests/test_deploy_common.py

@@ -3,7 +3,7 @@
 """
 import boto3
 import pytest
-from moto import mock_apigateway
+from moto import mock_aws
 from unittest import TestCase
 from common.deploy import get_api_id, get_next_stage, deploy_api, update_stage
 
@@ -13,15 +13,15 @@ class DeployTest(TestCase):
     TestCase class for testing deploy.py
     """
 
-    @mock_apigateway
+    @mock_aws
     def setUp(self):
         self.rotation = ['red', 'black', 'turquoise']
         self.current_stage = 'black'
         self.api_base_domain = 'api.fake-host.com'
         self.swagger_filename = 'fixtures/swagger.json'
 
     @pytest.mark.skip(reason="moto does not yet support AWS:ApiGateway:GetBasePathMapping")
-    @mock_apigateway
+    @mock_aws
     def test_get_api_id(self):
         pass
 
@@ -45,11 +45,11 @@ def test_get_next_stage(self):
             get_next_stage([], 'red')
 
     @pytest.mark.skip(reason="moto does not yet support AWS:ApiGateway:PutRestApi")
-    @mock_apigateway
+    @mock_aws
     def test_deploy_api(self):
         pass
 
     @pytest.mark.skip(reason="moto does not yet support AWS:ApiGateway:UpdateStage")
-    @mock_apigateway
+    @mock_aws
     def test_update_stage(self):
         pass

scripts/aws/tests/test_flip.py

@@ -3,7 +3,6 @@
 """
 import boto3
 import pytest
-from moto import mock_apigateway
 from unittest import TestCase
 from flip import get_live_stage, update_base_path_mapping