From cb8162c6e6766416b8c71e64f60c4fa10aaf1a38 Mon Sep 17 00:00:00 2001 From: Simon Chen Date: Wed, 16 Mar 2022 11:07:41 -0400 Subject: [PATCH] chore: remove constraints related to db integrity errors (#464) Co-authored-by: Simon Chen --- registrar/apps/api/v1/tests/test_views.py | 8 +- requirements/base.txt | 8 +- requirements/common_constraints.txt | 10 -- requirements/constraints.txt | 3 - requirements/devstack.txt | 117 +--------------- requirements/docs.txt | 8 +- requirements/local.txt | 117 +--------------- requirements/monitoring/requirements.txt | 154 +--------------------- requirements/production.txt | 5 +- requirements/test.txt | 80 +---------- 10 files changed, 34 insertions(+), 476 deletions(-) diff --git a/registrar/apps/api/v1/tests/test_views.py b/registrar/apps/api/v1/tests/test_views.py index 6a15cd84..c2ebd3da 100644 --- a/registrar/apps/api/v1/tests/test_views.py +++ b/registrar/apps/api/v1/tests/test_views.py @@ -250,8 +250,12 @@ def setUpClass(cls): logging.getLogger(logger_name).setLevel(logging.INFO) cls._s3_mock = moto.mock_s3() cls._s3_mock.start() - conn = boto3.resource('s3', region_name='us-west-1') - conn.create_bucket(Bucket=cls.s3_bucket) + bucket_region = 'us-west-1' + conn = boto3.resource('s3', region_name=bucket_region) + conn.create_bucket( + Bucket=cls.s3_bucket, + CreateBucketConfiguration={'LocationConstraint': bucket_region}, + ) @classmethod def tearDownClass(cls): diff --git a/requirements/base.txt b/requirements/base.txt index 1bd45050..a90a4376 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -120,10 +120,8 @@ edx-rest-api-client==5.5.0 # via -r requirements/base.in future==0.18.2 # via pyjwkest -idna==2.8 - # via - # -c requirements/constraints.txt - # requests +idna==3.3 + # via requests inflection==0.5.1 # via drf-yasg itypes==1.2.0 @@ -132,7 +130,7 @@ jinja2==3.0.3 # via coreschema kombu==4.6.11 # via celery -markupsafe==2.1.0 +markupsafe==2.1.1 # via jinja2 monotonic==1.6 # via analytics-python diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index cfa03be2..3c7cbdde 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -3,16 +3,6 @@ # See BOM-2721 for more details. # Below is the copied and edited version of common_constraints -# This is a temporary solution to override the real common_constraints.txt -# In edx-lint, until the pyjwt constraint in edx-lint has been removed. -# See BOM-2721 for more details. -# Below is the copied and edited version of common_constraints - -# This is a temporary solution to override the real common_constraints.txt -# In edx-lint, until the pyjwt constraint in edx-lint has been removed. -# See BOM-2721 for more details. -# Below is the copied and edited version of common_constraints - # A central location for most common version constraints # (across edx repos) for pip-installation. # diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 67522d3c..b11fc638 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -32,9 +32,6 @@ python-slugify<5.0.0 # From production.in boto3>=1.4.4 # https://github.com/edx/registrar/pull/66 -# Constraints required to resolve test failures due to database constraints -moto==1.3.8 -idna==2.8 # Constraint responses library to be less than 0.18.0 because version 0.18.0 would remove response._is_string() member function. # That _is_string() function is used by moto==1.3.8 diff --git a/requirements/devstack.txt b/requirements/devstack.txt index 1549a090..01bd2cc9 100644 --- a/requirements/devstack.txt +++ b/requirements/devstack.txt @@ -26,18 +26,7 @@ astroid==2.9.3 attrs==21.4.0 # via # -r requirements/local.txt - # jschema-to-python - # jsonschema # pytest - # sarif-om -aws-sam-translator==1.42.0 - # via - # -r requirements/local.txt - # cfn-lint -aws-xray-sdk==2.9.0 - # via - # -r requirements/local.txt - # moto babel==2.9.1 # via # -r requirements/local.txt @@ -50,20 +39,14 @@ billiard==3.6.4.0 # via # -r requirements/local.txt # celery -boto==2.49.0 - # via - # -r requirements/local.txt - # moto boto3==1.21.19 # via # -c requirements/constraints.txt # -r requirements/local.txt - # aws-sam-translator # moto botocore==1.24.19 # via # -r requirements/local.txt - # aws-xray-sdk # boto3 # moto # s3transfer @@ -80,10 +63,6 @@ cffi==1.15.0 # via # -r requirements/local.txt # cryptography -cfn-lint==0.58.3 - # via - # -r requirements/local.txt - # moto charset-normalizer==2.0.12 # via # -r requirements/local.txt @@ -206,10 +185,6 @@ djangorestframework==3.11.1 # drf-yasg # edx-api-doc-tools # edx-drf-extensions -docker==5.0.3 - # via - # -r requirements/local.txt - # moto docutils==0.17.1 # via # -r requirements/local.txt @@ -222,10 +197,6 @@ drf-yasg==1.20.0 # via # -r requirements/local.txt # edx-api-doc-tools -ecdsa==0.17.0 - # via - # -r requirements/local.txt - # python-jose edx-api-doc-tools==1.6.0 # via -r requirements/local.txt edx-auth-backends==4.1.0 @@ -267,7 +238,6 @@ freezegun==1.2.0 future==0.18.2 # via # -r requirements/local.txt - # aws-xray-sdk # pyjwkest gitdb==4.0.9 # via @@ -277,11 +247,9 @@ gitpython==3.1.27 # via # -r requirements/local.txt # transifex-client -idna==2.8 +idna==3.3 # via - # -c requirements/constraints.txt # -r requirements/local.txt - # moto # requests imagesize==1.3.0 # via @@ -319,35 +287,6 @@ jmespath==0.10.0 # -r requirements/local.txt # boto3 # botocore -jschema-to-python==1.2.3 - # via - # -r requirements/local.txt - # cfn-lint -jsondiff==1.1.2 - # via - # -r requirements/local.txt - # moto -jsonpatch==1.32 - # via - # -r requirements/local.txt - # cfn-lint -jsonpickle==2.1.0 - # via - # -r requirements/local.txt - # jschema-to-python -jsonpointer==2.2 - # via - # -r requirements/local.txt - # jsonpatch -jsonschema==3.2.0 - # via - # -r requirements/local.txt - # aws-sam-translator - # cfn-lint -junit-xml==1.9 - # via - # -r requirements/local.txt - # cfn-lint kombu==4.6.11 # via # -r requirements/local.txt @@ -356,32 +295,23 @@ lazy-object-proxy==1.7.1 # via # -r requirements/local.txt # astroid -markupsafe==2.1.0 +markupsafe==2.1.1 # via # -r requirements/local.txt # jinja2 + # moto mccabe==0.6.1 # via # -r requirements/local.txt # pylint -mock==4.0.3 - # via - # -r requirements/local.txt - # moto monotonic==1.6 # via # -r requirements/local.txt # analytics-python -moto==1.3.8 - # via - # -c requirements/constraints.txt - # -r requirements/local.txt +moto==3.1.0 + # via -r requirements/local.txt mysqlclient==2.1.0 # via -r requirements/nonlocal.txt -networkx==2.7.1 - # via - # -r requirements/local.txt - # cfn-lint newrelic==5.24.0.153 # via # -c requirements/constraints.txt @@ -411,8 +341,6 @@ pathspec==0.9.0 pbr==5.8.1 # via # -r requirements/local.txt - # jschema-to-python - # sarif-om # stevedore platformdirs==2.5.1 # via @@ -437,11 +365,6 @@ py==1.11.0 # -r requirements/local.txt # pytest # tox -pyasn1==0.4.8 - # via - # -r requirements/local.txt - # python-jose - # rsa pycodestyle==2.8.0 # via -r requirements/local.txt pycparser==2.21 @@ -496,10 +419,6 @@ pyparsing==3.0.7 # via # -r requirements/local.txt # packaging -pyrsistent==0.18.1 - # via - # -r requirements/local.txt - # jsonschema pytest==7.1.0 # via # -r requirements/local.txt @@ -519,10 +438,6 @@ python-dateutil==2.8.2 # freezegun # moto # ruamel-yaml-convert -python-jose==3.3.0 - # via - # -r requirements/local.txt - # moto python-memcached==1.59 # via -r requirements/nonlocal.txt python-slugify==4.0.1 @@ -547,11 +462,9 @@ pywatchman==1.4.1 pyyaml==6.0 # via # -r requirements/local.txt - # cfn-lint # code-annotations # edx-django-release-util # edx-i18n-tools - # moto # yamllint redis==4.1.4 # via -r requirements/local.txt @@ -560,7 +473,6 @@ requests==2.27.1 # -r requirements/local.txt # analytics-python # coreapi - # docker # edx-drf-extensions # edx-rest-api-client # moto @@ -580,10 +492,6 @@ responses==0.17.0 # -c requirements/constraints.txt # -r requirements/local.txt # moto -rsa==4.8 - # via - # -r requirements/local.txt - # python-jose ruamel-yaml==0.17.21 # via # -r requirements/local.txt @@ -609,10 +517,6 @@ s3transfer==0.5.2 # via # -r requirements/local.txt # boto3 -sarif-om==1.0.4 - # via - # -r requirements/local.txt - # cfn-lint semantic-version==2.9.0 # via # -r requirements/local.txt @@ -622,19 +526,13 @@ six==1.16.0 # -r requirements/local.txt # -r requirements/nonlocal.txt # analytics-python - # aws-sam-translator - # cfn-lint # configobj # django-dynamic-fixture - # ecdsa # edx-auth-backends # edx-django-release-util # edx-drf-extensions # edx-lint # edx-sphinx-theme - # jsonschema - # junit-xml - # moto # pyjwkest # python-dateutil # python-memcached @@ -746,10 +644,6 @@ virtualenv==20.13.3 # via # -r requirements/local.txt # tox -websocket-client==1.3.1 - # via - # -r requirements/local.txt - # docker werkzeug==2.0.3 # via # -r requirements/local.txt @@ -759,7 +653,6 @@ wrapt==1.13.3 # -c requirements/constraints.txt # -r requirements/local.txt # astroid - # aws-xray-sdk # deprecated xmltodict==0.12.0 # via diff --git a/requirements/docs.txt b/requirements/docs.txt index 4fc5f7ff..331ac588 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -16,17 +16,15 @@ docutils==0.17.1 # via sphinx edx-sphinx-theme==3.0.0 # via -r requirements/docs.in -idna==2.8 - # via - # -c requirements/constraints.txt - # requests +idna==3.3 + # via requests imagesize==1.3.0 # via sphinx importlib-metadata==4.11.3 # via sphinx jinja2==3.0.3 # via sphinx -markupsafe==2.1.0 +markupsafe==2.1.1 # via jinja2 packaging==21.3 # via sphinx diff --git a/requirements/local.txt b/requirements/local.txt index a9220947..5ff797b1 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -26,18 +26,7 @@ astroid==2.9.3 attrs==21.4.0 # via # -r requirements/test.txt - # jschema-to-python - # jsonschema # pytest - # sarif-om -aws-sam-translator==1.42.0 - # via - # -r requirements/test.txt - # cfn-lint -aws-xray-sdk==2.9.0 - # via - # -r requirements/test.txt - # moto babel==2.9.1 # via # -r requirements/docs.txt @@ -50,20 +39,14 @@ billiard==3.6.4.0 # via # -r requirements/test.txt # celery -boto==2.49.0 - # via - # -r requirements/test.txt - # moto boto3==1.21.19 # via # -c requirements/constraints.txt # -r requirements/test.txt - # aws-sam-translator # moto botocore==1.24.19 # via # -r requirements/test.txt - # aws-xray-sdk # boto3 # moto # s3transfer @@ -81,10 +64,6 @@ cffi==1.15.0 # via # -r requirements/test.txt # cryptography -cfn-lint==0.58.3 - # via - # -r requirements/test.txt - # moto charset-normalizer==2.0.12 # via # -r requirements/docs.txt @@ -206,10 +185,6 @@ djangorestframework==3.11.1 # drf-yasg # edx-api-doc-tools # edx-drf-extensions -docker==5.0.3 - # via - # -r requirements/test.txt - # moto docutils==0.17.1 # via # -r requirements/docs.txt @@ -222,10 +197,6 @@ drf-yasg==1.20.0 # via # -r requirements/test.txt # edx-api-doc-tools -ecdsa==0.17.0 - # via - # -r requirements/test.txt - # python-jose edx-api-doc-tools==1.6.0 # via -r requirements/test.txt edx-auth-backends==4.1.0 @@ -267,18 +238,15 @@ freezegun==1.2.0 future==0.18.2 # via # -r requirements/test.txt - # aws-xray-sdk # pyjwkest gitdb==4.0.9 # via gitpython gitpython==3.1.27 # via transifex-client -idna==2.8 +idna==3.3 # via - # -c requirements/constraints.txt # -r requirements/docs.txt # -r requirements/test.txt - # moto # requests imagesize==1.3.0 # via @@ -317,35 +285,6 @@ jmespath==0.10.0 # -r requirements/test.txt # boto3 # botocore -jschema-to-python==1.2.3 - # via - # -r requirements/test.txt - # cfn-lint -jsondiff==1.1.2 - # via - # -r requirements/test.txt - # moto -jsonpatch==1.32 - # via - # -r requirements/test.txt - # cfn-lint -jsonpickle==2.1.0 - # via - # -r requirements/test.txt - # jschema-to-python -jsonpointer==2.2 - # via - # -r requirements/test.txt - # jsonpatch -jsonschema==3.2.0 - # via - # -r requirements/test.txt - # aws-sam-translator - # cfn-lint -junit-xml==1.9 - # via - # -r requirements/test.txt - # cfn-lint kombu==4.6.11 # via # -r requirements/test.txt @@ -354,31 +293,22 @@ lazy-object-proxy==1.7.1 # via # -r requirements/test.txt # astroid -markupsafe==2.1.0 +markupsafe==2.1.1 # via # -r requirements/docs.txt # -r requirements/test.txt # jinja2 + # moto mccabe==0.6.1 # via # -r requirements/test.txt # pylint -mock==4.0.3 - # via - # -r requirements/test.txt - # moto monotonic==1.6 # via # -r requirements/test.txt # analytics-python -moto==1.3.8 - # via - # -c requirements/constraints.txt - # -r requirements/test.txt -networkx==2.7.1 - # via - # -r requirements/test.txt - # cfn-lint +moto==3.1.0 + # via -r requirements/test.txt newrelic==5.24.0.153 # via # -c requirements/constraints.txt @@ -407,8 +337,6 @@ pathspec==0.9.0 pbr==5.8.1 # via # -r requirements/test.txt - # jschema-to-python - # sarif-om # stevedore platformdirs==2.5.1 # via @@ -431,11 +359,6 @@ py==1.11.0 # -r requirements/test.txt # pytest # tox -pyasn1==0.4.8 - # via - # -r requirements/test.txt - # python-jose - # rsa pycodestyle==2.8.0 # via -r requirements/test.txt pycparser==2.21 @@ -491,10 +414,6 @@ pyparsing==3.0.7 # -r requirements/docs.txt # -r requirements/test.txt # packaging -pyrsistent==0.18.1 - # via - # -r requirements/test.txt - # jsonschema pytest==7.1.0 # via # -r requirements/test.txt @@ -514,10 +433,6 @@ python-dateutil==2.8.2 # freezegun # moto # ruamel-yaml-convert -python-jose==3.3.0 - # via - # -r requirements/test.txt - # moto python-slugify==4.0.1 # via # -c requirements/constraints.txt @@ -541,11 +456,9 @@ pywatchman==1.4.1 pyyaml==6.0 # via # -r requirements/test.txt - # cfn-lint # code-annotations # edx-django-release-util # edx-i18n-tools - # moto # yamllint redis==4.1.4 # via -r requirements/test.txt @@ -555,7 +468,6 @@ requests==2.27.1 # -r requirements/test.txt # analytics-python # coreapi - # docker # edx-drf-extensions # edx-rest-api-client # moto @@ -575,10 +487,6 @@ responses==0.17.0 # -c requirements/constraints.txt # -r requirements/test.txt # moto -rsa==4.8 - # via - # -r requirements/test.txt - # python-jose ruamel-yaml==0.17.21 # via # -r requirements/test.txt @@ -600,10 +508,6 @@ s3transfer==0.5.2 # via # -r requirements/test.txt # boto3 -sarif-om==1.0.4 - # via - # -r requirements/test.txt - # cfn-lint semantic-version==2.9.0 # via # -r requirements/test.txt @@ -613,19 +517,13 @@ six==1.16.0 # -r requirements/docs.txt # -r requirements/test.txt # analytics-python - # aws-sam-translator - # cfn-lint # configobj # django-dynamic-fixture - # ecdsa # edx-auth-backends # edx-django-release-util # edx-drf-extensions # edx-lint # edx-sphinx-theme - # jsonschema - # junit-xml - # moto # pyjwkest # python-dateutil # responses @@ -735,10 +633,6 @@ virtualenv==20.13.3 # via # -r requirements/test.txt # tox -websocket-client==1.3.1 - # via - # -r requirements/test.txt - # docker werkzeug==2.0.3 # via # -r requirements/test.txt @@ -748,7 +642,6 @@ wrapt==1.13.3 # -c requirements/constraints.txt # -r requirements/test.txt # astroid - # aws-xray-sdk # deprecated xmltodict==0.12.0 # via diff --git a/requirements/monitoring/requirements.txt b/requirements/monitoring/requirements.txt index ad45e57f..0d395313 100644 --- a/requirements/monitoring/requirements.txt +++ b/requirements/monitoring/requirements.txt @@ -41,22 +41,7 @@ attrs==21.4.0 # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt - # jschema-to-python - # jsonschema # pytest - # sarif-om -aws-sam-translator==1.42.0 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../test.txt - # cfn-lint -aws-xray-sdk==2.9.0 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../test.txt - # moto babel==2.9.1 # via # -r requirements/monitoring/../devstack.txt @@ -76,19 +61,12 @@ billiard==3.6.4.0 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # celery -boto==2.49.0 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../test.txt - # moto boto3==1.21.19 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt - # aws-sam-translator # moto botocore==1.24.19 # via @@ -96,7 +74,6 @@ botocore==1.24.19 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt - # aws-xray-sdk # boto3 # moto # s3transfer @@ -121,12 +98,6 @@ cffi==1.15.0 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # cryptography -cfn-lint==0.58.3 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../test.txt - # moto charset-normalizer==2.0.12 # via # -r requirements/monitoring/../devstack.txt @@ -323,12 +294,6 @@ djangorestframework==3.11.1 # drf-yasg # edx-api-doc-tools # edx-drf-extensions -docker==5.0.3 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../test.txt - # moto docutils==0.17.1 # via # -r requirements/monitoring/../devstack.txt @@ -348,12 +313,6 @@ drf-yasg==1.20.0 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # edx-api-doc-tools -ecdsa==0.17.0 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../test.txt - # python-jose edx-api-doc-tools==1.6.0 # via # -r requirements/monitoring/../devstack.txt @@ -441,7 +400,6 @@ future==0.18.2 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt - # aws-xray-sdk # pyjwkest gevent==21.12.0 # via -r requirements/monitoring/../production.txt @@ -461,13 +419,12 @@ greenlet==1.1.2 # gevent gunicorn==20.1.0 # via -r requirements/monitoring/../production.txt -idna==2.8 +idna==3.3 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt - # moto # requests imagesize==1.3.0 # via @@ -523,49 +480,6 @@ jmespath==0.10.0 # -r requirements/monitoring/../test.txt # boto3 # botocore -jschema-to-python==1.2.3 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../test.txt - # cfn-lint -jsondiff==1.1.2 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../test.txt - # moto -jsonpatch==1.32 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../test.txt - # cfn-lint -jsonpickle==2.1.0 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../test.txt - # jschema-to-python -jsonpointer==2.2 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../test.txt - # jsonpatch -jsonschema==3.2.0 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../test.txt - # aws-sam-translator - # cfn-lint -junit-xml==1.9 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../test.txt - # cfn-lint kombu==4.6.11 # via # -r requirements/monitoring/../devstack.txt @@ -579,25 +493,20 @@ lazy-object-proxy==1.7.1 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt # astroid -markupsafe==2.1.0 +markupsafe==2.1.1 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # jinja2 + # moto mccabe==0.6.1 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt # pylint -mock==4.0.3 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../test.txt - # moto monotonic==1.6 # via # -r requirements/monitoring/../devstack.txt @@ -605,7 +514,7 @@ monotonic==1.6 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # analytics-python -moto==1.3.8 +moto==3.1.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt @@ -614,12 +523,6 @@ mysqlclient==2.1.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../production.txt -networkx==2.7.1 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../test.txt - # cfn-lint newrelic==5.24.0.153 # via # -r requirements/monitoring/../devstack.txt @@ -664,8 +567,6 @@ pbr==5.8.1 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt - # jschema-to-python - # sarif-om # stevedore platformdirs==2.5.1 # via @@ -700,13 +601,6 @@ py==1.11.0 # -r requirements/monitoring/../test.txt # pytest # tox -pyasn1==0.4.8 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../test.txt - # python-jose - # rsa pycodestyle==2.8.0 # via # -r requirements/monitoring/../devstack.txt @@ -791,12 +685,6 @@ pyparsing==3.0.7 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # packaging -pyrsistent==0.18.1 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../test.txt - # jsonschema pytest==7.1.0 # via # -r requirements/monitoring/../devstack.txt @@ -827,12 +715,6 @@ python-dateutil==2.8.2 # freezegun # moto # ruamel-yaml-convert -python-jose==3.3.0 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../test.txt - # moto python-memcached==1.59 # via # -r requirements/monitoring/../devstack.txt @@ -871,11 +753,9 @@ pyyaml==6.0 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt - # cfn-lint # code-annotations # edx-django-release-util # edx-i18n-tools - # moto # yamllint redis==4.1.4 # via @@ -891,7 +771,6 @@ requests==2.27.1 # -r requirements/monitoring/../test.txt # analytics-python # coreapi - # docker # edx-drf-extensions # edx-rest-api-client # moto @@ -915,12 +794,6 @@ responses==0.17.0 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt # moto -rsa==4.8 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../test.txt - # python-jose ruamel-yaml==0.17.21 # via # -r requirements/monitoring/../devstack.txt @@ -959,12 +832,6 @@ s3transfer==0.5.2 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # boto3 -sarif-om==1.0.4 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../test.txt - # cfn-lint semantic-version==2.9.0 # via # -r requirements/monitoring/../devstack.txt @@ -979,19 +846,13 @@ six==1.16.0 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # analytics-python - # aws-sam-translator - # cfn-lint # configobj # django-dynamic-fixture - # ecdsa # edx-auth-backends # edx-django-release-util # edx-drf-extensions # edx-lint # edx-sphinx-theme - # jsonschema - # junit-xml - # moto # pyjwkest # python-dateutil # python-memcached @@ -1151,12 +1012,6 @@ virtualenv==20.13.3 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../test.txt # tox -websocket-client==1.3.1 - # via - # -r requirements/monitoring/../devstack.txt - # -r requirements/monitoring/../local.txt - # -r requirements/monitoring/../test.txt - # docker werkzeug==2.0.3 # via # -r requirements/monitoring/../devstack.txt @@ -1170,7 +1025,6 @@ wrapt==1.13.3 # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt # astroid - # aws-xray-sdk # deprecated xmltodict==0.12.0 # via diff --git a/requirements/production.txt b/requirements/production.txt index 77e57ea9..690607f3 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -166,9 +166,8 @@ greenlet==1.1.2 # via gevent gunicorn==20.1.0 # via -r requirements/production.in -idna==2.8 +idna==3.3 # via - # -c requirements/constraints.txt # -r requirements/base.txt # requests inflection==0.5.1 @@ -191,7 +190,7 @@ kombu==4.6.11 # via # -r requirements/base.txt # celery -markupsafe==2.1.0 +markupsafe==2.1.1 # via # -r requirements/base.txt # jinja2 diff --git a/requirements/test.txt b/requirements/test.txt index f1e21105..77d1f384 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -19,15 +19,7 @@ astroid==2.9.3 # pylint # pylint-celery attrs==21.4.0 - # via - # jschema-to-python - # jsonschema - # pytest - # sarif-om -aws-sam-translator==1.42.0 - # via cfn-lint -aws-xray-sdk==2.9.0 - # via moto + # via pytest backoff==1.10.0 # via # -r requirements/base.txt @@ -36,16 +28,12 @@ billiard==3.6.4.0 # via # -r requirements/base.txt # celery -boto==2.49.0 - # via moto boto3==1.21.19 # via # -c requirements/constraints.txt - # aws-sam-translator # moto botocore==1.24.19 # via - # aws-xray-sdk # boto3 # moto # s3transfer @@ -62,8 +50,6 @@ cffi==1.15.0 # via # -r requirements/base.txt # cryptography -cfn-lint==0.58.3 - # via moto charset-normalizer==2.0.12 # via # -r requirements/base.txt @@ -172,8 +158,6 @@ djangorestframework==3.11.1 # drf-yasg # edx-api-doc-tools # edx-drf-extensions -docker==5.0.3 - # via moto drf-jwt==1.19.2 # via # -r requirements/base.txt @@ -182,8 +166,6 @@ drf-yasg==1.20.0 # via # -r requirements/base.txt # edx-api-doc-tools -ecdsa==0.17.0 - # via python-jose edx-api-doc-tools==1.6.0 # via -r requirements/base.txt edx-auth-backends==4.1.0 @@ -220,13 +202,10 @@ freezegun==1.2.0 future==0.18.2 # via # -r requirements/base.txt - # aws-xray-sdk # pyjwkest -idna==2.8 +idna==3.3 # via - # -c requirements/constraints.txt # -r requirements/base.txt - # moto # requests inflection==0.5.1 # via @@ -252,46 +231,25 @@ jmespath==0.10.0 # via # boto3 # botocore -jschema-to-python==1.2.3 - # via cfn-lint -jsondiff==1.1.2 - # via moto -jsonpatch==1.32 - # via cfn-lint -jsonpickle==2.1.0 - # via jschema-to-python -jsonpointer==2.2 - # via jsonpatch -jsonschema==3.2.0 - # via - # aws-sam-translator - # cfn-lint -junit-xml==1.9 - # via cfn-lint kombu==4.6.11 # via # -r requirements/base.txt # celery lazy-object-proxy==1.7.1 # via astroid -markupsafe==2.1.0 +markupsafe==2.1.1 # via # -r requirements/base.txt # jinja2 + # moto mccabe==0.6.1 # via pylint -mock==4.0.3 - # via moto monotonic==1.6 # via # -r requirements/base.txt # analytics-python -moto==1.3.8 - # via - # -c requirements/constraints.txt - # -r requirements/test.in -networkx==2.7.1 - # via cfn-lint +moto==3.1.0 + # via -r requirements/test.in newrelic==5.24.0.153 # via # -c requirements/constraints.txt @@ -314,8 +272,6 @@ pathspec==0.9.0 pbr==5.8.1 # via # -r requirements/base.txt - # jschema-to-python - # sarif-om # stevedore platformdirs==2.5.1 # via @@ -333,10 +289,6 @@ py==1.11.0 # via # pytest # tox -pyasn1==0.4.8 - # via - # python-jose - # rsa pycodestyle==2.8.0 # via -r requirements/test.in pycparser==2.21 @@ -381,8 +333,6 @@ pyparsing==3.0.7 # via # -r requirements/base.txt # packaging -pyrsistent==0.18.1 - # via jsonschema pytest==7.1.0 # via # -r requirements/test.in @@ -401,8 +351,6 @@ python-dateutil==2.8.2 # faker # freezegun # moto -python-jose==3.3.0 - # via moto python-slugify==4.0.1 # via # -c requirements/constraints.txt @@ -420,10 +368,8 @@ pytz==2021.3 pyyaml==6.0 # via # -r requirements/base.txt - # cfn-lint # code-annotations # edx-django-release-util - # moto # yamllint redis==4.1.4 # via -r requirements/base.txt @@ -432,7 +378,6 @@ requests==2.27.1 # -r requirements/base.txt # analytics-python # coreapi - # docker # edx-drf-extensions # edx-rest-api-client # moto @@ -450,8 +395,6 @@ responses==0.17.0 # -c requirements/constraints.txt # -r requirements/test.in # moto -rsa==4.8 - # via python-jose ruamel-yaml==0.17.21 # via # -r requirements/base.txt @@ -462,8 +405,6 @@ ruamel-yaml-clib==0.2.6 # ruamel-yaml s3transfer==0.5.2 # via boto3 -sarif-om==1.0.4 - # via cfn-lint semantic-version==2.9.0 # via # -r requirements/base.txt @@ -472,17 +413,11 @@ six==1.16.0 # via # -r requirements/base.txt # analytics-python - # aws-sam-translator - # cfn-lint # django-dynamic-fixture - # ecdsa # edx-auth-backends # edx-django-release-util # edx-drf-extensions # edx-lint - # jsonschema - # junit-xml - # moto # pyjwkest # python-dateutil # responses @@ -545,8 +480,6 @@ vine==1.3.0 # celery virtualenv==20.13.3 # via tox -websocket-client==1.3.1 - # via docker werkzeug==2.0.3 # via moto wrapt==1.13.3 @@ -554,7 +487,6 @@ wrapt==1.13.3 # -c requirements/constraints.txt # -r requirements/base.txt # astroid - # aws-xray-sdk # deprecated xmltodict==0.12.0 # via moto