From 6acca7cb2287434c7a5a6e529d8d81ea247c349a Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Mon, 31 Jul 2023 14:13:34 -0400 Subject: [PATCH 1/2] chore: Updating Python Requirements --- requirements/base.txt | 17 +++++++++-------- requirements/dev.txt | 29 +++++++++++++++-------------- requirements/doc.txt | 25 +++++++++++++------------ requirements/production.txt | 17 +++++++++-------- requirements/quality.txt | 23 ++++++++++++----------- requirements/test.txt | 25 +++++++++++++------------ requirements/validation.txt | 27 ++++++++++++++------------- 7 files changed, 85 insertions(+), 78 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 2712c3573..e1ab15913 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -72,6 +72,7 @@ django==3.2.20 # django-extensions # django-log-request-id # django-model-utils + # django-waffle # djangorestframework # drf-jwt # drf-yasg @@ -90,7 +91,7 @@ django-celery-results==2.5.1 # via -r requirements/base.in django-clearcache==1.2.1 # via -r requirements/base.in -django-config-models==2.3.0 +django-config-models==2.4.0 # via -r requirements/base.in django-cors-headers==4.2.0 # via -r requirements/base.in @@ -113,7 +114,7 @@ django-simple-history==3.0.0 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in -django-waffle==3.0.0 +django-waffle==4.0.0 # via # edx-django-utils # edx-drf-extensions @@ -138,11 +139,11 @@ edx-api-doc-tools==1.7.0 # via -r requirements/base.in edx-auth-backends==4.1.0 # via -r requirements/base.in -edx-celeryutils==1.2.2 +edx-celeryutils==1.2.3 # via -r requirements/base.in -edx-django-release-util==1.2.0 +edx-django-release-util==1.3.0 # via -r requirements/base.in -edx-django-utils==5.5.0 +edx-django-utils==5.6.0 # via # django-config-models # edx-drf-extensions @@ -154,9 +155,9 @@ edx-drf-extensions==8.8.0 # edx-rbac edx-opaque-keys==2.3.0 # via edx-drf-extensions -edx-rbac==1.7.0 +edx-rbac==1.8.0 # via -r requirements/base.in -edx-rest-api-client==5.5.2 +edx-rest-api-client==5.6.0 # via -r requirements/base.in edx-toggles==5.0.0 # via -r requirements/base.in @@ -178,7 +179,7 @@ monotonic==1.6 # via analytics-python mysqlclient==2.2.0 # via -r requirements/base.in -newrelic==8.8.1 +newrelic==8.9.0 # via edx-django-utils oauthlib==3.2.2 # via diff --git a/requirements/dev.txt b/requirements/dev.txt index 8d01951cf..c99e7288a 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -168,6 +168,7 @@ django==3.2.20 # django-extensions # django-log-request-id # django-model-utils + # django-waffle # djangorestframework # drf-jwt # drf-yasg @@ -191,7 +192,7 @@ django-clearcache==1.2.1 # via # -r requirements/quality.txt # -r requirements/test.txt -django-config-models==2.3.0 +django-config-models==2.4.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -229,7 +230,7 @@ django-simple-history==3.0.0 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/quality.txt # -r requirements/test.txt -django-waffle==3.0.0 +django-waffle==4.0.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -279,15 +280,15 @@ edx-auth-backends==4.1.0 # via # -r requirements/quality.txt # -r requirements/test.txt -edx-celeryutils==1.2.2 +edx-celeryutils==1.2.3 # via # -r requirements/quality.txt # -r requirements/test.txt -edx-django-release-util==1.2.0 +edx-django-release-util==1.3.0 # via # -r requirements/quality.txt # -r requirements/test.txt -edx-django-utils==5.5.0 +edx-django-utils==5.6.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -312,11 +313,11 @@ edx-opaque-keys==2.3.0 # -r requirements/quality.txt # -r requirements/test.txt # edx-drf-extensions -edx-rbac==1.7.0 +edx-rbac==1.8.0 # via # -r requirements/quality.txt # -r requirements/test.txt -edx-rest-api-client==5.5.2 +edx-rest-api-client==5.6.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -416,7 +417,7 @@ mysqlclient==2.2.0 # via # -r requirements/quality.txt # -r requirements/test.txt -newrelic==8.8.1 +newrelic==8.9.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -438,7 +439,7 @@ packaging==23.1 # gunicorn # pytest # tox -paramiko==3.2.0 +paramiko==3.3.1 # via docker path==16.7.1 # via edx-i18n-tools @@ -449,7 +450,7 @@ pbr==5.11.1 # stevedore pip-tools==7.1.0 # via -r requirements/pip-tools.txt -platformdirs==3.9.1 +platformdirs==3.10.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -482,7 +483,7 @@ py==1.11.0 # via # -r requirements/test.txt # tox -pycodestyle==2.10.0 +pycodestyle==2.11.0 # via -r requirements/quality.txt pycparser==2.21 # via @@ -617,7 +618,7 @@ requests-oauthlib==1.3.1 # -r requirements/quality.txt # -r requirements/test.txt # social-auth-core -responses==0.23.1 +responses==0.23.2 # via # -r requirements/dev.in # -r requirements/test.txt @@ -703,7 +704,7 @@ tomli==2.0.1 # pyproject-hooks # pytest # tox -tomlkit==0.11.8 +tomlkit==0.12.1 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -753,7 +754,7 @@ vine==5.0.0 # amqp # celery # kombu -virtualenv==20.24.1 +virtualenv==20.24.2 # via # -r requirements/test.txt # tox diff --git a/requirements/doc.txt b/requirements/doc.txt index 972a1289c..c6c9956ef 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -136,6 +136,7 @@ django==3.2.20 # django-extensions # django-log-request-id # django-model-utils + # django-waffle # djangorestframework # drf-jwt # drf-yasg @@ -154,7 +155,7 @@ django-celery-results==2.5.1 # via -r requirements/test.txt django-clearcache==1.2.1 # via -r requirements/test.txt -django-config-models==2.3.0 +django-config-models==2.4.0 # via -r requirements/test.txt django-cors-headers==4.2.0 # via -r requirements/test.txt @@ -179,7 +180,7 @@ django-simple-history==3.0.0 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt -django-waffle==3.0.0 +django-waffle==4.0.0 # via # -r requirements/test.txt # edx-django-utils @@ -218,11 +219,11 @@ edx-api-doc-tools==1.7.0 # via -r requirements/test.txt edx-auth-backends==4.1.0 # via -r requirements/test.txt -edx-celeryutils==1.2.2 +edx-celeryutils==1.2.3 # via -r requirements/test.txt -edx-django-release-util==1.2.0 +edx-django-release-util==1.3.0 # via -r requirements/test.txt -edx-django-utils==5.5.0 +edx-django-utils==5.6.0 # via # -r requirements/test.txt # django-config-models @@ -241,9 +242,9 @@ edx-opaque-keys==2.3.0 # via # -r requirements/test.txt # edx-drf-extensions -edx-rbac==1.7.0 +edx-rbac==1.8.0 # via -r requirements/test.txt -edx-rest-api-client==5.5.2 +edx-rest-api-client==5.6.0 # via -r requirements/test.txt edx-toggles==5.0.0 # via -r requirements/test.txt @@ -315,7 +316,7 @@ monotonic==1.6 # analytics-python mysqlclient==2.2.0 # via -r requirements/test.txt -newrelic==8.8.1 +newrelic==8.9.0 # via # -r requirements/test.txt # edx-django-utils @@ -336,7 +337,7 @@ pbr==5.11.1 # via # -r requirements/test.txt # stevedore -platformdirs==3.9.1 +platformdirs==3.10.0 # via # -r requirements/test.txt # pylint @@ -473,7 +474,7 @@ requests-oauthlib==1.3.1 # via # -r requirements/test.txt # social-auth-core -responses==0.23.1 +responses==0.23.2 # via -r requirements/test.txt restructuredtext-lint==1.4.0 # via doc8 @@ -557,7 +558,7 @@ tomli==2.0.1 # pylint # pytest # tox -tomlkit==0.11.8 +tomlkit==0.12.1 # via # -r requirements/test.txt # pylint @@ -601,7 +602,7 @@ vine==5.0.0 # amqp # celery # kombu -virtualenv==20.24.1 +virtualenv==20.24.2 # via # -r requirements/test.txt # tox diff --git a/requirements/production.txt b/requirements/production.txt index de41a01c3..eb0ced545 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -94,6 +94,7 @@ django==3.2.20 # django-extensions # django-log-request-id # django-model-utils + # django-waffle # djangorestframework # drf-jwt # drf-yasg @@ -112,7 +113,7 @@ django-celery-results==2.5.1 # via -r requirements/base.txt django-clearcache==1.2.1 # via -r requirements/base.txt -django-config-models==2.3.0 +django-config-models==2.4.0 # via -r requirements/base.txt django-cors-headers==4.2.0 # via -r requirements/base.txt @@ -133,7 +134,7 @@ django-model-utils==4.3.1 # edx-rbac django-simple-history==3.0.0 # via -r requirements/base.txt -django-waffle==3.0.0 +django-waffle==4.0.0 # via # -r requirements/base.txt # edx-django-utils @@ -163,11 +164,11 @@ edx-api-doc-tools==1.7.0 # via -r requirements/base.txt edx-auth-backends==4.1.0 # via -r requirements/base.txt -edx-celeryutils==1.2.2 +edx-celeryutils==1.2.3 # via -r requirements/base.txt -edx-django-release-util==1.2.0 +edx-django-release-util==1.3.0 # via -r requirements/base.txt -edx-django-utils==5.5.0 +edx-django-utils==5.6.0 # via # -r requirements/base.txt # django-config-models @@ -182,9 +183,9 @@ edx-opaque-keys==2.3.0 # via # -r requirements/base.txt # edx-drf-extensions -edx-rbac==1.7.0 +edx-rbac==1.8.0 # via -r requirements/base.txt -edx-rest-api-client==5.5.2 +edx-rest-api-client==5.6.0 # via -r requirements/base.txt edx-toggles==5.0.0 # via -r requirements/base.txt @@ -226,7 +227,7 @@ monotonic==1.6 # analytics-python mysqlclient==2.2.0 # via -r requirements/base.txt -newrelic==8.8.1 +newrelic==8.9.0 # via # -r requirements/base.txt # edx-django-utils diff --git a/requirements/quality.txt b/requirements/quality.txt index 0a5feb8d6..31a8e25c0 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -109,6 +109,7 @@ django==3.2.20 # django-extensions # django-log-request-id # django-model-utils + # django-waffle # djangorestframework # drf-jwt # drf-yasg @@ -127,7 +128,7 @@ django-celery-results==2.5.1 # via -r requirements/base.txt django-clearcache==1.2.1 # via -r requirements/base.txt -django-config-models==2.3.0 +django-config-models==2.4.0 # via -r requirements/base.txt django-cors-headers==4.2.0 # via -r requirements/base.txt @@ -150,7 +151,7 @@ django-simple-history==3.0.0 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt -django-waffle==3.0.0 +django-waffle==4.0.0 # via # -r requirements/base.txt # edx-django-utils @@ -180,11 +181,11 @@ edx-api-doc-tools==1.7.0 # via -r requirements/base.txt edx-auth-backends==4.1.0 # via -r requirements/base.txt -edx-celeryutils==1.2.2 +edx-celeryutils==1.2.3 # via -r requirements/base.txt -edx-django-release-util==1.2.0 +edx-django-release-util==1.3.0 # via -r requirements/base.txt -edx-django-utils==5.5.0 +edx-django-utils==5.6.0 # via # -r requirements/base.txt # django-config-models @@ -203,9 +204,9 @@ edx-opaque-keys==2.3.0 # via # -r requirements/base.txt # edx-drf-extensions -edx-rbac==1.7.0 +edx-rbac==1.8.0 # via -r requirements/base.txt -edx-rest-api-client==5.5.2 +edx-rest-api-client==5.6.0 # via -r requirements/base.txt edx-toggles==5.0.0 # via -r requirements/base.txt @@ -249,7 +250,7 @@ monotonic==1.6 # analytics-python mysqlclient==2.2.0 # via -r requirements/base.txt -newrelic==8.8.1 +newrelic==8.9.0 # via # -r requirements/base.txt # edx-django-utils @@ -266,7 +267,7 @@ pbr==5.11.1 # via # -r requirements/base.txt # stevedore -platformdirs==3.9.1 +platformdirs==3.10.0 # via pylint ply==3.11 # via @@ -280,7 +281,7 @@ psutil==5.9.5 # via # -r requirements/base.txt # edx-django-utils -pycodestyle==2.10.0 +pycodestyle==2.11.0 # via -r requirements/quality.in pycparser==2.21 # via @@ -413,7 +414,7 @@ text-unidecode==1.3 # python-slugify tomli==2.0.1 # via pylint -tomlkit==0.11.8 +tomlkit==0.12.1 # via pylint typing-extensions==4.7.1 # via diff --git a/requirements/test.txt b/requirements/test.txt index 3a5bfe216..db5887786 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -117,6 +117,7 @@ distlib==0.3.7 # django-extensions # django-log-request-id # django-model-utils + # django-waffle # djangorestframework # drf-jwt # drf-yasg @@ -135,7 +136,7 @@ django-celery-results==2.5.1 # via -r requirements/base.txt django-clearcache==1.2.1 # via -r requirements/base.txt -django-config-models==2.3.0 +django-config-models==2.4.0 # via -r requirements/base.txt django-cors-headers==4.2.0 # via -r requirements/base.txt @@ -160,7 +161,7 @@ django-simple-history==3.0.0 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt -django-waffle==3.0.0 +django-waffle==4.0.0 # via # -r requirements/base.txt # edx-django-utils @@ -190,11 +191,11 @@ edx-api-doc-tools==1.7.0 # via -r requirements/base.txt edx-auth-backends==4.1.0 # via -r requirements/base.txt -edx-celeryutils==1.2.2 +edx-celeryutils==1.2.3 # via -r requirements/base.txt -edx-django-release-util==1.2.0 +edx-django-release-util==1.3.0 # via -r requirements/base.txt -edx-django-utils==5.5.0 +edx-django-utils==5.6.0 # via # -r requirements/base.txt # django-config-models @@ -213,9 +214,9 @@ edx-opaque-keys==2.3.0 # via # -r requirements/base.txt # edx-drf-extensions -edx-rbac==1.7.0 +edx-rbac==1.8.0 # via -r requirements/base.txt -edx-rest-api-client==5.5.2 +edx-rest-api-client==5.6.0 # via -r requirements/base.txt edx-toggles==5.0.0 # via -r requirements/base.txt @@ -269,7 +270,7 @@ monotonic==1.6 # analytics-python mysqlclient==2.2.0 # via -r requirements/base.txt -newrelic==8.8.1 +newrelic==8.9.0 # via # -r requirements/base.txt # edx-django-utils @@ -288,7 +289,7 @@ pbr==5.11.1 # via # -r requirements/base.txt # stevedore -platformdirs==3.9.1 +platformdirs==3.10.0 # via # pylint # virtualenv @@ -401,7 +402,7 @@ requests-oauthlib==1.3.1 # via # -r requirements/base.txt # social-auth-core -responses==0.23.1 +responses==0.23.2 # via -r requirements/test.in rules==3.3 # via -r requirements/base.txt @@ -456,7 +457,7 @@ tomli==2.0.1 # pylint # pytest # tox -tomlkit==0.11.8 +tomlkit==0.12.1 # via pylint tox==3.28.0 # via @@ -495,7 +496,7 @@ vine==5.0.0 # amqp # celery # kombu -virtualenv==20.24.1 +virtualenv==20.24.2 # via tox wcwidth==0.2.6 # via diff --git a/requirements/validation.txt b/requirements/validation.txt index 4a480693c..3dcba16c4 100644 --- a/requirements/validation.txt +++ b/requirements/validation.txt @@ -148,6 +148,7 @@ django==3.2.20 # django-extensions # django-log-request-id # django-model-utils + # django-waffle # djangorestframework # drf-jwt # drf-yasg @@ -170,7 +171,7 @@ django-clearcache==1.2.1 # via # -r requirements/quality.txt # -r requirements/test.txt -django-config-models==2.3.0 +django-config-models==2.4.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -206,7 +207,7 @@ django-simple-history==3.0.0 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/quality.txt # -r requirements/test.txt -django-waffle==3.0.0 +django-waffle==4.0.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -248,15 +249,15 @@ edx-auth-backends==4.1.0 # via # -r requirements/quality.txt # -r requirements/test.txt -edx-celeryutils==1.2.2 +edx-celeryutils==1.2.3 # via # -r requirements/quality.txt # -r requirements/test.txt -edx-django-release-util==1.2.0 +edx-django-release-util==1.3.0 # via # -r requirements/quality.txt # -r requirements/test.txt -edx-django-utils==5.5.0 +edx-django-utils==5.6.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -279,11 +280,11 @@ edx-opaque-keys==2.3.0 # -r requirements/quality.txt # -r requirements/test.txt # edx-drf-extensions -edx-rbac==1.7.0 +edx-rbac==1.8.0 # via # -r requirements/quality.txt # -r requirements/test.txt -edx-rest-api-client==5.5.2 +edx-rest-api-client==5.6.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -368,7 +369,7 @@ mysqlclient==2.2.0 # via # -r requirements/quality.txt # -r requirements/test.txt -newrelic==8.8.1 +newrelic==8.9.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -391,7 +392,7 @@ pbr==5.11.1 # -r requirements/quality.txt # -r requirements/test.txt # stevedore -platformdirs==3.9.1 +platformdirs==3.10.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -421,7 +422,7 @@ py==1.11.0 # via # -r requirements/test.txt # tox -pycodestyle==2.10.0 +pycodestyle==2.11.0 # via -r requirements/quality.txt pycparser==2.21 # via @@ -539,7 +540,7 @@ requests-oauthlib==1.3.1 # -r requirements/quality.txt # -r requirements/test.txt # social-auth-core -responses==0.23.1 +responses==0.23.2 # via -r requirements/test.txt rules==3.3 # via @@ -612,7 +613,7 @@ tomli==2.0.1 # pylint # pytest # tox -tomlkit==0.11.8 +tomlkit==0.12.1 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -661,7 +662,7 @@ vine==5.0.0 # amqp # celery # kombu -virtualenv==20.24.1 +virtualenv==20.24.2 # via # -r requirements/test.txt # tox From fb838a7f7575f9712442fcb5ef6d83928da9bfac Mon Sep 17 00:00:00 2001 From: Brian Beggs Date: Mon, 31 Jul 2023 14:28:26 -0400 Subject: [PATCH 2/2] chore: fix linting errors --- .../apps/api/v1/tests/test_views.py | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/enterprise_catalog/apps/api/v1/tests/test_views.py b/enterprise_catalog/apps/api/v1/tests/test_views.py index 955751edf..7a085f58d 100644 --- a/enterprise_catalog/apps/api/v1/tests/test_views.py +++ b/enterprise_catalog/apps/api/v1/tests/test_views.py @@ -752,14 +752,14 @@ class EnterpriseCatalogWorkbookViewTests(APITestMixin): "programs": [ "Professional Certificate" ], - "program_titles":[ + "program_titles": [ "Totally Awesome Program" ], - "short_description":"description", - "subjects":[ + "short_description": "description", + "subjects": [ "Math" ], - "skills":[ + "skills": [ { "name": "Probability And Statistics", "description": "description" @@ -816,14 +816,14 @@ class EnterpriseCatalogWorkbookViewTests(APITestMixin): "programs": [ ], - "program_titles":[ + "program_titles": [ ], - "short_description":"

Respond to unique industry challenges", - "subjects":[ + "short_description": "

Respond to unique industry challenges", + "subjects": [ "Business & Management" ], - "skills":[ + "skills": [ { "name": "Finance", "description": "", @@ -853,9 +853,9 @@ class EnterpriseCatalogWorkbookViewTests(APITestMixin): "course_runs": [ ], - "marketing_url":"https://www.edx.org/course/oxford-leadinaffiliate_partner", - "course_type":"executive-education-2u", - "entitlements":[ + "marketing_url": "https://www.edx.org/course/oxford-leadinaffiliate_partner", + "course_type": "executive-education-2u", + "entitlements": [ { "mode": "paid-executive-education", "price": "2843.00", @@ -897,7 +897,7 @@ class EnterpriseCatalogWorkbookViewTests(APITestMixin): ] } }, - "skill_names":[ + "skill_names": [ { "value": "People Management", "matchLevel": "none",