From 3ceb5ab210840d3abec329897022c76e083d3bef Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Tue, 30 Jan 2024 10:21:09 -0500 Subject: [PATCH 1/2] chore: Updating Python Requirements --- requirements/base.txt | 8 ++++---- requirements/devstack.txt | 26 ++++++++++++------------ requirements/docs.txt | 2 +- requirements/local.txt | 26 ++++++++++++------------ requirements/monitoring/requirements.txt | 26 ++++++++++++------------ requirements/production.txt | 12 +++++------ requirements/test.txt | 26 ++++++++++++------------ 7 files changed, 63 insertions(+), 63 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index adc1a15d..b0f43f4e 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -35,7 +35,7 @@ charset-normalizer==3.3.2 # via requests click==8.1.7 # via edx-django-utils -cryptography==42.0.0 +cryptography==42.0.1 # via # pyjwt # social-auth-core @@ -118,7 +118,7 @@ edx-django-utils==5.10.1 # via # edx-drf-extensions # edx-rest-api-client -edx-drf-extensions==9.1.2 +edx-drf-extensions==10.1.0 # via -r requirements/base.in edx-opaque-keys==2.5.1 # via edx-drf-extensions @@ -164,7 +164,7 @@ python-dateutil==2.8.2 # via analytics-python python3-openid==3.2.0 # via social-auth-core -pytz==2023.3.post1 +pytz==2023.4 # via # -r requirements/base.in # celery @@ -200,7 +200,7 @@ social-auth-app-django==5.4.0 # via # -r requirements/base.in # edx-auth-backends -social-auth-core==4.5.1 +social-auth-core==4.5.2 # via # edx-auth-backends # social-auth-app-django diff --git a/requirements/devstack.txt b/requirements/devstack.txt index 6cbee330..75ae21ab 100644 --- a/requirements/devstack.txt +++ b/requirements/devstack.txt @@ -53,12 +53,12 @@ billiard==3.6.4.0 # via # -r requirements/local.txt # celery -boto3==1.34.25 +boto3==1.34.30 # via # -c requirements/constraints.txt # -r requirements/local.txt # moto -botocore==1.34.25 +botocore==1.34.30 # via # -r requirements/local.txt # boto3 @@ -114,12 +114,12 @@ configobj==5.0.8 # via # -r requirements/local.txt # ruamel-yaml-cmd -coverage[toml]==7.4.0 +coverage[toml]==7.4.1 # via # -r requirements/local.txt # coverage # pytest-cov -cryptography==42.0.0 +cryptography==42.0.1 # via # -r requirements/local.txt # moto @@ -132,7 +132,7 @@ defusedxml==0.8.0rc2 # -r requirements/local.txt # python3-openid # social-auth-core -dill==0.3.7 +dill==0.3.8 # via # -r requirements/local.txt # pylint @@ -232,7 +232,7 @@ edx-django-utils==5.10.1 # -r requirements/local.txt # edx-drf-extensions # edx-rest-api-client -edx-drf-extensions==9.1.2 +edx-drf-extensions==10.1.0 # via -r requirements/local.txt edx-i18n-tools==1.3.0 # via -r requirements/local.txt @@ -250,7 +250,7 @@ exceptiongroup==1.2.0 # pytest factory-boy==3.3.0 # via -r requirements/local.txt -faker==22.5.0 +faker==22.6.0 # via # -r requirements/local.txt # factory-boy @@ -322,7 +322,7 @@ monotonic==1.6 # via # -r requirements/local.txt # analytics-python -moto==4.2.13 +moto==5.0.0 # via -r requirements/local.txt mysqlclient==2.2.1 # via -r requirements/nonlocal.txt @@ -363,7 +363,7 @@ platformdirs==4.1.0 # pylint # tox # virtualenv -pluggy==1.3.0 +pluggy==1.4.0 # via # -r requirements/local.txt # pytest @@ -435,14 +435,14 @@ pyproject-api==1.6.1 # via # -r requirements/local.txt # tox -pytest==7.4.4 +pytest==8.0.0 # via # -r requirements/local.txt # pytest-cov # pytest-django pytest-cov==4.1.0 # via -r requirements/local.txt -pytest-django==4.7.0 +pytest-django==4.8.0 # via -r requirements/local.txt python-dateutil==2.8.2 # via @@ -464,7 +464,7 @@ python3-openid==3.2.0 # via # -r requirements/local.txt # social-auth-core -pytz==2023.3.post1 +pytz==2023.4 # via # -r requirements/local.txt # babel @@ -554,7 +554,7 @@ social-auth-app-django==5.4.0 # via # -r requirements/local.txt # edx-auth-backends -social-auth-core==4.5.1 +social-auth-core==4.5.2 # via # -r requirements/local.txt # edx-auth-backends diff --git a/requirements/docs.txt b/requirements/docs.txt index 39d80fe8..8640e34a 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -43,7 +43,7 @@ pygments==2.17.2 # accessible-pygments # pydata-sphinx-theme # sphinx -pytz==2023.3.post1 +pytz==2023.4 # via babel requests==2.31.0 # via sphinx diff --git a/requirements/local.txt b/requirements/local.txt index 6372c6e3..e8355e50 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -53,12 +53,12 @@ billiard==3.6.4.0 # via # -r requirements/test.txt # celery -boto3==1.34.25 +boto3==1.34.30 # via # -c requirements/constraints.txt # -r requirements/test.txt # moto -botocore==1.34.25 +botocore==1.34.30 # via # -r requirements/test.txt # boto3 @@ -114,12 +114,12 @@ colorama==0.4.6 # tox configobj==5.0.8 # via ruamel-yaml-cmd -coverage[toml]==7.4.0 +coverage[toml]==7.4.1 # via # -r requirements/test.txt # coverage # pytest-cov -cryptography==42.0.0 +cryptography==42.0.1 # via # -r requirements/test.txt # moto @@ -132,7 +132,7 @@ defusedxml==0.8.0rc2 # -r requirements/test.txt # python3-openid # social-auth-core -dill==0.3.7 +dill==0.3.8 # via # -r requirements/test.txt # pylint @@ -232,7 +232,7 @@ edx-django-utils==5.10.1 # -r requirements/test.txt # edx-drf-extensions # edx-rest-api-client -edx-drf-extensions==9.1.2 +edx-drf-extensions==10.1.0 # via -r requirements/test.txt edx-i18n-tools==1.3.0 # via -r requirements/local.in @@ -250,7 +250,7 @@ exceptiongroup==1.2.0 # pytest factory-boy==3.3.0 # via -r requirements/test.txt -faker==22.5.0 +faker==22.6.0 # via # -r requirements/test.txt # factory-boy @@ -321,7 +321,7 @@ monotonic==1.6 # via # -r requirements/test.txt # analytics-python -moto==4.2.13 +moto==5.0.0 # via -r requirements/test.txt newrelic==5.24.0.153 # via @@ -359,7 +359,7 @@ platformdirs==4.1.0 # pylint # tox # virtualenv -pluggy==1.3.0 +pluggy==1.4.0 # via # -r requirements/test.txt # pytest @@ -427,14 +427,14 @@ pyproject-api==1.6.1 # via # -r requirements/test.txt # tox -pytest==7.4.4 +pytest==8.0.0 # via # -r requirements/test.txt # pytest-cov # pytest-django pytest-cov==4.1.0 # via -r requirements/test.txt -pytest-django==4.7.0 +pytest-django==4.8.0 # via -r requirements/test.txt python-dateutil==2.8.2 # via @@ -454,7 +454,7 @@ python3-openid==3.2.0 # via # -r requirements/test.txt # social-auth-core -pytz==2023.3.post1 +pytz==2023.4 # via # -r requirements/docs.txt # -r requirements/test.txt @@ -539,7 +539,7 @@ social-auth-app-django==5.4.0 # via # -r requirements/test.txt # edx-auth-backends -social-auth-core==4.5.1 +social-auth-core==4.5.2 # via # -r requirements/test.txt # edx-auth-backends diff --git a/requirements/monitoring/requirements.txt b/requirements/monitoring/requirements.txt index cde76388..698039cb 100644 --- a/requirements/monitoring/requirements.txt +++ b/requirements/monitoring/requirements.txt @@ -81,14 +81,14 @@ billiard==3.6.4.0 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # celery -boto3==1.34.25 +boto3==1.34.30 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # moto -botocore==1.34.25 +botocore==1.34.30 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -171,14 +171,14 @@ configobj==5.0.8 # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # ruamel-yaml-cmd -coverage[toml]==7.4.0 +coverage[toml]==7.4.1 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt # coverage # pytest-cov -cryptography==42.0.0 +cryptography==42.0.1 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -200,7 +200,7 @@ defusedxml==0.8.0rc2 # -r requirements/monitoring/../test.txt # python3-openid # social-auth-core -dill==0.3.7 +dill==0.3.8 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -369,7 +369,7 @@ edx-django-utils==5.10.1 # -r requirements/monitoring/../test.txt # edx-drf-extensions # edx-rest-api-client -edx-drf-extensions==9.1.2 +edx-drf-extensions==10.1.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -408,7 +408,7 @@ factory-boy==3.3.0 # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt -faker==22.5.0 +faker==22.6.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -524,7 +524,7 @@ monotonic==1.6 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # analytics-python -moto==4.2.13 +moto==5.0.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -588,7 +588,7 @@ platformdirs==4.1.0 # pylint # tox # virtualenv -pluggy==1.3.0 +pluggy==1.4.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -695,7 +695,7 @@ pyproject-api==1.6.1 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt # tox -pytest==7.4.4 +pytest==8.0.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -707,7 +707,7 @@ pytest-cov==4.1.0 # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt -pytest-django==4.7.0 +pytest-django==4.8.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -741,7 +741,7 @@ python3-openid==3.2.0 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # social-auth-core -pytz==2023.3.post1 +pytz==2023.4 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -872,7 +872,7 @@ social-auth-app-django==5.4.0 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # edx-auth-backends -social-auth-core==4.5.1 +social-auth-core==4.5.2 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt diff --git a/requirements/production.txt b/requirements/production.txt index 27ad0b4a..0454d27b 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -31,11 +31,11 @@ billiard==3.6.4.0 # via # -r requirements/base.txt # celery -boto3==1.34.25 +boto3==1.34.30 # via # -c requirements/constraints.txt # -r requirements/production.in -botocore==1.34.25 +botocore==1.34.30 # via # boto3 # s3transfer @@ -61,7 +61,7 @@ click==8.1.7 # via # -r requirements/base.txt # edx-django-utils -cryptography==42.0.0 +cryptography==42.0.1 # via # -r requirements/base.txt # pyjwt @@ -152,7 +152,7 @@ edx-django-utils==5.10.1 # -r requirements/base.txt # edx-drf-extensions # edx-rest-api-client -edx-drf-extensions==9.1.2 +edx-drf-extensions==10.1.0 # via -r requirements/base.txt edx-opaque-keys==2.5.1 # via @@ -247,7 +247,7 @@ python3-openid==3.2.0 # via # -r requirements/base.txt # social-auth-core -pytz==2023.3.post1 +pytz==2023.4 # via # -r requirements/base.txt # celery @@ -295,7 +295,7 @@ social-auth-app-django==5.4.0 # via # -r requirements/base.txt # edx-auth-backends -social-auth-core==4.5.1 +social-auth-core==4.5.2 # via # -r requirements/base.txt # edx-auth-backends diff --git a/requirements/test.txt b/requirements/test.txt index 819b152c..b53afbda 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -35,11 +35,11 @@ billiard==3.6.4.0 # via # -r requirements/base.txt # celery -boto3==1.34.25 +boto3==1.34.30 # via # -c requirements/constraints.txt # moto -botocore==1.34.25 +botocore==1.34.30 # via # boto3 # moto @@ -82,11 +82,11 @@ code-annotations==1.5.0 # edx-lint colorama==0.4.6 # via tox -coverage[toml]==7.4.0 +coverage[toml]==7.4.1 # via # -r requirements/test.in # pytest-cov -cryptography==42.0.0 +cryptography==42.0.1 # via # -r requirements/base.txt # moto @@ -99,7 +99,7 @@ defusedxml==0.8.0rc2 # -r requirements/base.txt # python3-openid # social-auth-core -dill==0.3.7 +dill==0.3.8 # via pylint distlib==0.3.8 # via virtualenv @@ -185,7 +185,7 @@ edx-django-utils==5.10.1 # -r requirements/base.txt # edx-drf-extensions # edx-rest-api-client -edx-drf-extensions==9.1.2 +edx-drf-extensions==10.1.0 # via -r requirements/base.txt edx-lint==5.3.6 # via -r requirements/test.in @@ -199,7 +199,7 @@ exceptiongroup==1.2.0 # via pytest factory-boy==3.3.0 # via -r requirements/test.in -faker==22.5.0 +faker==22.6.0 # via # -r requirements/test.in # factory-boy @@ -245,7 +245,7 @@ monotonic==1.6 # via # -r requirements/base.txt # analytics-python -moto==4.2.13 +moto==5.0.0 # via -r requirements/test.in newrelic==5.24.0.153 # via @@ -275,7 +275,7 @@ platformdirs==4.1.0 # pylint # tox # virtualenv -pluggy==1.3.0 +pluggy==1.4.0 # via # pytest # tox @@ -322,14 +322,14 @@ pynacl==1.5.0 # edx-django-utils pyproject-api==1.6.1 # via tox -pytest==7.4.4 +pytest==8.0.0 # via # -r requirements/test.in # pytest-cov # pytest-django pytest-cov==4.1.0 # via -r requirements/test.in -pytest-django==4.7.0 +pytest-django==4.8.0 # via -r requirements/test.in python-dateutil==2.8.2 # via @@ -347,7 +347,7 @@ python3-openid==3.2.0 # via # -r requirements/base.txt # social-auth-core -pytz==2023.3.post1 +pytz==2023.4 # via # -r requirements/base.txt # celery @@ -405,7 +405,7 @@ social-auth-app-django==5.4.0 # via # -r requirements/base.txt # edx-auth-backends -social-auth-core==4.5.1 +social-auth-core==4.5.2 # via # -r requirements/base.txt # edx-auth-backends From 91b6e84000213072c28514a98df10b68210ff392 Mon Sep 17 00:00:00 2001 From: michaelroytman Date: Wed, 31 Jan 2024 08:07:18 -0500 Subject: [PATCH 2/2] fix: update references to moto.mock_s3 to moto.mock_aws Version 5.0.0 of the moto library replaces the mock_s3 decorator with the mock_aws decorator. This caused many tests to fail, because they used the mock_s3 decorator. This commit updates those references to mock_aws. Please see the moto CHANGELOG here: https://github.com/getmoto/moto/blob/master/CHANGELOG.md#500. --- registrar/apps/api/v1/tests/test_views.py | 2 +- registrar/apps/core/tests/test_filestore.py | 2 +- registrar/apps/enrollments/tests/test_tasks.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/registrar/apps/api/v1/tests/test_views.py b/registrar/apps/api/v1/tests/test_views.py index 12860862..a52806f5 100644 --- a/registrar/apps/api/v1/tests/test_views.py +++ b/registrar/apps/api/v1/tests/test_views.py @@ -248,7 +248,7 @@ def setUpClass(cls): # Suppress egregious boto/moto DEBUG logging. for logger_name in ['boto3', 'botocore', 's3transfer']: logging.getLogger(logger_name).setLevel(logging.INFO) - cls._s3_mock = moto.mock_s3() + cls._s3_mock = moto.mock_aws() cls._s3_mock.start() bucket_region = 'us-west-1' conn = boto3.resource('s3', region_name=bucket_region) diff --git a/registrar/apps/core/tests/test_filestore.py b/registrar/apps/core/tests/test_filestore.py index 9b857ea8..142f24e8 100644 --- a/registrar/apps/core/tests/test_filestore.py +++ b/registrar/apps/core/tests/test_filestore.py @@ -45,7 +45,7 @@ def setUp(self): # it here, but moto seems to have a bug/"feature" where it only works # in modules that explicitly import it. super().setUp() - self._s3_mock = moto.mock_s3() + self._s3_mock = moto.mock_aws() self._s3_mock.start() conn = boto3.resource('s3') conn.create_bucket(Bucket=self.test_bucket_1) diff --git a/registrar/apps/enrollments/tests/test_tasks.py b/registrar/apps/enrollments/tests/test_tasks.py index 247eff59..380d4d42 100644 --- a/registrar/apps/enrollments/tests/test_tasks.py +++ b/registrar/apps/enrollments/tests/test_tasks.py @@ -205,7 +205,7 @@ def setUpClass(cls): # it here, but moto seems to have a bug/"feature" where it only works # in modules that explicitly import it. super().setUpClass() - cls._s3_mock = moto.mock_s3() + cls._s3_mock = moto.mock_aws() cls._s3_mock.start() conn = boto3.resource('s3') conn.create_bucket(Bucket=settings.REGISTRAR_BUCKET)