From a1b1c65b24045a6cc4709ae27598232b4cd95468 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sun, 12 Mar 2023 20:21:30 -0400 Subject: [PATCH 01/29] chore: Updating Python Requirements --- requirements/base.txt | 4 ++-- requirements/docs.txt | 4 ++-- requirements/local.txt | 12 ++++++------ requirements/pip.txt | 2 +- requirements/production.txt | 8 ++++---- requirements/test.txt | 12 ++++++------ 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 3112be3..8f85071 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -14,7 +14,7 @@ cffi==1.15.1 # via # cryptography # pynacl -charset-normalizer==3.0.1 +charset-normalizer==3.1.0 # via requests click==8.1.3 # via edx-django-utils @@ -147,5 +147,5 @@ uritemplate==4.1.1 # via # coreapi # drf-yasg -urllib3==1.26.14 +urllib3==1.26.15 # via requests diff --git a/requirements/docs.txt b/requirements/docs.txt index e6ea881..759d848 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -10,7 +10,7 @@ babel==2.12.1 # via sphinx certifi==2022.12.7 # via requests -charset-normalizer==3.0.1 +charset-normalizer==3.1.0 # via requests docutils==0.19 # via sphinx @@ -55,7 +55,7 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx -urllib3==1.26.14 +urllib3==1.26.15 # via requests zipp==3.15.0 # via importlib-metadata diff --git a/requirements/local.txt b/requirements/local.txt index a162e80..0dce89e 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -39,7 +39,7 @@ chardet==5.1.0 # via # -r requirements/test.txt # diff-cover -charset-normalizer==3.0.1 +charset-normalizer==3.1.0 # via # -r requirements/docs.txt # -r requirements/test.txt @@ -149,7 +149,7 @@ edx-lint==5.3.2 # via -r requirements/test.txt edx-sphinx-theme==3.1.0 # via -r requirements/docs.txt -exceptiongroup==1.1.0 +exceptiongroup==1.1.1 # via # -r requirements/test.txt # pytest @@ -209,7 +209,7 @@ mccabe==0.7.0 # via # -r requirements/test.txt # pylint -mypy==1.0.1 +mypy==1.1.1 # via -r requirements/test.txt mypy-extensions==1.0.0 # via @@ -237,7 +237,7 @@ pbr==5.11.1 # via # -r requirements/test.txt # stevedore -platformdirs==3.1.0 +platformdirs==3.1.1 # via # -r requirements/test.txt # pylint @@ -267,7 +267,7 @@ pyjwt[crypto]==2.6.0 # -r requirements/test.txt # edx-auth-backends # social-auth-core -pylint==2.16.3 +pylint==2.17.0 # via # -r requirements/test.txt # edx-lint @@ -433,7 +433,7 @@ uritemplate==4.1.1 # -r requirements/test.txt # coreapi # drf-yasg -urllib3==1.26.14 +urllib3==1.26.15 # via # -r requirements/docs.txt # -r requirements/test.txt diff --git a/requirements/pip.txt b/requirements/pip.txt index f939afd..2cbb0e6 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -10,5 +10,5 @@ wheel==0.38.4 # The following packages are considered to be unsafe in a requirements file: pip==23.0.1 # via -r requirements/pip.in -setuptools==67.5.0 +setuptools==67.6.0 # via -r requirements/pip.in diff --git a/requirements/production.txt b/requirements/production.txt index 9d6828d..7aa78e1 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -10,11 +10,11 @@ asgiref==3.6.0 # django attrs==22.2.0 # via -r requirements/base.txt -boto3==1.26.84 +boto3==1.26.89 # via # -c requirements/constraints.txt # -r requirements/production.in -botocore==1.29.84 +botocore==1.29.89 # via # boto3 # s3transfer @@ -27,7 +27,7 @@ cffi==1.15.1 # -r requirements/base.txt # cryptography # pynacl -charset-normalizer==3.0.1 +charset-normalizer==3.1.0 # via # -r requirements/base.txt # requests @@ -238,7 +238,7 @@ uritemplate==4.1.1 # -r requirements/base.txt # coreapi # drf-yasg -urllib3==1.26.14 +urllib3==1.26.15 # via # -r requirements/base.txt # botocore diff --git a/requirements/test.txt b/requirements/test.txt index 1e51329..fd7fa4b 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -28,7 +28,7 @@ cffi==1.15.1 # pynacl chardet==5.1.0 # via diff-cover -charset-normalizer==3.0.1 +charset-normalizer==3.1.0 # via # -r requirements/base.txt # requests @@ -122,7 +122,7 @@ edx-django-utils==5.2.0 # via -r requirements/base.txt edx-lint==5.3.2 # via -r requirements/test.in -exceptiongroup==1.1.0 +exceptiongroup==1.1.1 # via pytest factory-boy==3.2.1 # via -r requirements/test.in @@ -158,7 +158,7 @@ markupsafe==2.1.2 # jinja2 mccabe==0.7.0 # via pylint -mypy==1.0.1 +mypy==1.1.1 # via -r requirements/test.in mypy-extensions==1.0.0 # via mypy @@ -182,7 +182,7 @@ pbr==5.11.1 # via # -r requirements/base.txt # stevedore -platformdirs==3.1.0 +platformdirs==3.1.1 # via pylint pluggy==1.0.0 # via @@ -205,7 +205,7 @@ pyjwt[crypto]==2.6.0 # -r requirements/base.txt # edx-auth-backends # social-auth-core -pylint==2.16.3 +pylint==2.17.0 # via # edx-lint # pylint-celery @@ -315,7 +315,7 @@ uritemplate==4.1.1 # -r requirements/base.txt # coreapi # drf-yasg -urllib3==1.26.14 +urllib3==1.26.15 # via # -r requirements/base.txt # requests From 5cb3ea942a8d6d17b2dff1fc888677415ed193f5 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sun, 19 Mar 2023 20:22:18 -0400 Subject: [PATCH 02/29] chore: Updating Python Requirements --- requirements/base.txt | 6 +++--- requirements/docs.txt | 2 +- requirements/local.txt | 12 ++++++------ requirements/pip-tools.txt | 2 +- requirements/pip.txt | 2 +- requirements/production.txt | 12 ++++++------ requirements/test.txt | 10 +++++----- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 8f85071..2980545 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -72,7 +72,7 @@ edx-auth-backends==4.1.0 # via -r requirements/base.in edx-django-release-util==1.2.0 # via -r requirements/base.in -edx-django-utils==5.2.0 +edx-django-utils==5.3.0 # via -r requirements/base.in idna==3.4 # via requests @@ -131,9 +131,9 @@ six==1.16.0 # via # edx-auth-backends # edx-django-release-util -social-auth-app-django==5.0.0 +social-auth-app-django==5.1.0 # via edx-auth-backends -social-auth-core==4.3.0 +social-auth-core==4.4.0 # via # edx-auth-backends # social-auth-app-django diff --git a/requirements/docs.txt b/requirements/docs.txt index 759d848..20b3b73 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -20,7 +20,7 @@ idna==3.4 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==6.0.0 +importlib-metadata==6.1.0 # via sphinx jinja2==3.1.2 # via sphinx diff --git a/requirements/local.txt b/requirements/local.txt index 0dce89e..791c11a 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -68,7 +68,7 @@ coreschema==0.0.4 # -r requirements/test.txt # coreapi # drf-yasg -coverage[toml]==7.2.1 +coverage[toml]==7.2.2 # via # -r requirements/test.txt # pytest-cov @@ -143,9 +143,9 @@ edx-auth-backends==4.1.0 # via -r requirements/test.txt edx-django-release-util==1.2.0 # via -r requirements/test.txt -edx-django-utils==5.2.0 +edx-django-utils==5.3.0 # via -r requirements/test.txt -edx-lint==5.3.2 +edx-lint==5.3.4 # via -r requirements/test.txt edx-sphinx-theme==3.1.0 # via -r requirements/docs.txt @@ -168,7 +168,7 @@ imagesize==1.4.1 # via # -r requirements/docs.txt # sphinx -importlib-metadata==6.0.0 +importlib-metadata==6.1.0 # via # -r requirements/docs.txt # sphinx @@ -359,11 +359,11 @@ snowballstemmer==2.2.0 # via # -r requirements/docs.txt # sphinx -social-auth-app-django==5.0.0 +social-auth-app-django==5.1.0 # via # -r requirements/test.txt # edx-auth-backends -social-auth-core==4.3.0 +social-auth-core==4.4.0 # via # -r requirements/test.txt # edx-auth-backends diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index e66f21f..baf1aa5 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -16,7 +16,7 @@ pyproject-hooks==1.0.0 # via build tomli==2.0.1 # via build -wheel==0.38.4 +wheel==0.40.0 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index 2cbb0e6..45fb600 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,7 +4,7 @@ # # make upgrade # -wheel==0.38.4 +wheel==0.40.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/production.txt b/requirements/production.txt index 7aa78e1..0ccb376 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -10,11 +10,11 @@ asgiref==3.6.0 # django attrs==22.2.0 # via -r requirements/base.txt -boto3==1.26.89 +boto3==1.26.94 # via # -c requirements/constraints.txt # -r requirements/production.in -botocore==1.29.89 +botocore==1.29.94 # via # boto3 # s3transfer @@ -101,7 +101,7 @@ edx-auth-backends==4.1.0 # via -r requirements/base.txt edx-django-release-util==1.2.0 # via -r requirements/base.txt -edx-django-utils==5.2.0 +edx-django-utils==5.3.0 # via -r requirements/base.txt gevent==22.10.2 # via -r requirements/production.in @@ -216,11 +216,11 @@ six==1.16.0 # edx-django-release-util # python-dateutil # python-memcached -social-auth-app-django==5.0.0 +social-auth-app-django==5.1.0 # via # -r requirements/base.txt # edx-auth-backends -social-auth-core==4.3.0 +social-auth-core==4.4.0 # via # -r requirements/base.txt # edx-auth-backends @@ -245,7 +245,7 @@ urllib3==1.26.15 # requests zope-event==4.6 # via gevent -zope-interface==5.5.2 +zope-interface==6.0 # via gevent # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index fd7fa4b..f7d5542 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -52,7 +52,7 @@ coreschema==0.0.4 # -r requirements/base.txt # coreapi # drf-yasg -coverage[toml]==7.2.1 +coverage[toml]==7.2.2 # via # -r requirements/test.in # pytest-cov @@ -118,9 +118,9 @@ edx-auth-backends==4.1.0 # via -r requirements/base.txt edx-django-release-util==1.2.0 # via -r requirements/base.txt -edx-django-utils==5.2.0 +edx-django-utils==5.3.0 # via -r requirements/base.txt -edx-lint==5.3.2 +edx-lint==5.3.4 # via -r requirements/test.in exceptiongroup==1.1.1 # via pytest @@ -277,11 +277,11 @@ six==1.16.0 # edx-django-release-util # edx-lint # python-dateutil -social-auth-app-django==5.0.0 +social-auth-app-django==5.1.0 # via # -r requirements/base.txt # edx-auth-backends -social-auth-core==4.3.0 +social-auth-core==4.4.0 # via # -r requirements/base.txt # edx-auth-backends From 1d379943285fc06ed86d3f2fdeaf142b5cbe0464 Mon Sep 17 00:00:00 2001 From: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com> Date: Mon, 3 Apr 2023 13:11:59 -0400 Subject: [PATCH 03/29] chore: Updating Python Requirements (#246) --- requirements/base.txt | 13 +++++++------ requirements/docs.txt | 2 +- requirements/local.txt | 23 ++++++++++++----------- requirements/pip.txt | 2 +- requirements/production.txt | 17 +++++++++-------- requirements/test.txt | 23 ++++++++++++----------- 6 files changed, 42 insertions(+), 38 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 2980545..6c3c6ce 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -24,7 +24,7 @@ coreschema==0.0.4 # via # coreapi # drf-yasg -cryptography==39.0.2 +cryptography==40.0.1 # via # pyjwt # social-auth-core @@ -46,11 +46,12 @@ django==3.2.18 # edx-auth-backends # edx-django-release-util # edx-django-utils + # social-auth-app-django django-crum==0.7.9 # via edx-django-utils django-environ==0.10.0 # via -r requirements/base.in -django-filter==22.1 +django-filter==23.1 # via -r requirements/base.in django-waffle==3.0.0 # via @@ -86,7 +87,7 @@ markupsafe==2.1.2 # via jinja2 mysqlclient==2.1.1 # via -r requirements/base.in -newrelic==8.7.0 +newrelic==8.8.0 # via edx-django-utils oauthlib==3.2.2 # via @@ -108,7 +109,7 @@ pynacl==1.5.0 # via edx-django-utils python3-openid==3.2.0 # via social-auth-core -pytz==2022.7.1 +pytz==2023.3 # via # -r requirements/base.in # django @@ -131,9 +132,9 @@ six==1.16.0 # via # edx-auth-backends # edx-django-release-util -social-auth-app-django==5.1.0 +social-auth-app-django==5.2.0 # via edx-auth-backends -social-auth-core==4.4.0 +social-auth-core==4.4.1 # via # edx-auth-backends # social-auth-app-django diff --git a/requirements/docs.txt b/requirements/docs.txt index 20b3b73..85ce92e 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -30,7 +30,7 @@ packaging==23.0 # via sphinx pygments==2.14.0 # via sphinx -pytz==2022.7.1 +pytz==2023.3 # via babel requests==2.28.2 # via sphinx diff --git a/requirements/local.txt b/requirements/local.txt index 791c11a..fa010a0 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -12,7 +12,7 @@ asgiref==3.6.0 # via # -r requirements/test.txt # django -astroid==2.15.0 +astroid==2.15.1 # via # -r requirements/test.txt # pylint @@ -72,7 +72,7 @@ coverage[toml]==7.2.2 # via # -r requirements/test.txt # pytest-cov -cryptography==39.0.2 +cryptography==40.0.1 # via # -r requirements/test.txt # pyjwt @@ -105,6 +105,7 @@ django==3.2.18 # edx-auth-backends # edx-django-release-util # edx-django-utils + # social-auth-app-django django-crum==0.7.9 # via # -r requirements/test.txt @@ -115,7 +116,7 @@ django-dynamic-fixture==3.1.2 # via -r requirements/test.txt django-environ==0.10.0 # via -r requirements/test.txt -django-filter==22.1 +django-filter==23.1 # via -r requirements/test.txt django-waffle==3.0.0 # via @@ -155,7 +156,7 @@ exceptiongroup==1.1.1 # pytest factory-boy==3.2.1 # via -r requirements/test.txt -faker==17.6.0 +faker==18.3.2 # via # -r requirements/test.txt # factory-boy @@ -217,7 +218,7 @@ mypy-extensions==1.0.0 # mypy mysqlclient==2.1.1 # via -r requirements/test.txt -newrelic==8.7.0 +newrelic==8.8.0 # via # -r requirements/test.txt # edx-django-utils @@ -237,7 +238,7 @@ pbr==5.11.1 # via # -r requirements/test.txt # stevedore -platformdirs==3.1.1 +platformdirs==3.2.0 # via # -r requirements/test.txt # pylint @@ -267,7 +268,7 @@ pyjwt[crypto]==2.6.0 # -r requirements/test.txt # edx-auth-backends # social-auth-core -pylint==2.17.0 +pylint==2.17.1 # via # -r requirements/test.txt # edx-lint @@ -312,7 +313,7 @@ python3-openid==3.2.0 # via # -r requirements/test.txt # social-auth-core -pytz==2022.7.1 +pytz==2023.3 # via # -r requirements/docs.txt # -r requirements/test.txt @@ -359,11 +360,11 @@ snowballstemmer==2.2.0 # via # -r requirements/docs.txt # sphinx -social-auth-app-django==5.1.0 +social-auth-app-django==5.2.0 # via # -r requirements/test.txt # edx-auth-backends -social-auth-core==4.4.0 +social-auth-core==4.4.1 # via # -r requirements/test.txt # edx-auth-backends @@ -418,7 +419,7 @@ tomli==2.0.1 # mypy # pylint # pytest -tomlkit==0.11.6 +tomlkit==0.11.7 # via # -r requirements/test.txt # pylint diff --git a/requirements/pip.txt b/requirements/pip.txt index 45fb600..896a85c 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -10,5 +10,5 @@ wheel==0.40.0 # The following packages are considered to be unsafe in a requirements file: pip==23.0.1 # via -r requirements/pip.in -setuptools==67.6.0 +setuptools==67.6.1 # via -r requirements/pip.in diff --git a/requirements/production.txt b/requirements/production.txt index 0ccb376..6f7ef70 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -10,11 +10,11 @@ asgiref==3.6.0 # django attrs==22.2.0 # via -r requirements/base.txt -boto3==1.26.94 +boto3==1.26.104 # via # -c requirements/constraints.txt # -r requirements/production.in -botocore==1.29.94 +botocore==1.29.104 # via # boto3 # s3transfer @@ -44,7 +44,7 @@ coreschema==0.0.4 # -r requirements/base.txt # coreapi # drf-yasg -cryptography==39.0.2 +cryptography==40.0.1 # via # -r requirements/base.txt # pyjwt @@ -69,13 +69,14 @@ django==3.2.18 # edx-auth-backends # edx-django-release-util # edx-django-utils + # social-auth-app-django django-crum==0.7.9 # via # -r requirements/base.txt # edx-django-utils django-environ==0.10.0 # via -r requirements/base.txt -django-filter==22.1 +django-filter==23.1 # via -r requirements/base.txt django-storages==1.13.2 # via -r requirements/production.in @@ -135,7 +136,7 @@ markupsafe==2.1.2 # jinja2 mysqlclient==2.1.1 # via -r requirements/base.txt -newrelic==8.7.0 +newrelic==8.8.0 # via # -r requirements/base.txt # -r requirements/production.in @@ -178,7 +179,7 @@ python3-openid==3.2.0 # via # -r requirements/base.txt # social-auth-core -pytz==2022.7.1 +pytz==2023.3 # via # -r requirements/base.txt # django @@ -216,11 +217,11 @@ six==1.16.0 # edx-django-release-util # python-dateutil # python-memcached -social-auth-app-django==5.1.0 +social-auth-app-django==5.2.0 # via # -r requirements/base.txt # edx-auth-backends -social-auth-core==4.4.0 +social-auth-core==4.4.1 # via # -r requirements/base.txt # edx-auth-backends diff --git a/requirements/test.txt b/requirements/test.txt index f7d5542..216a05f 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -8,7 +8,7 @@ asgiref==3.6.0 # via # -r requirements/base.txt # django -astroid==2.15.0 +astroid==2.15.1 # via # -r requirements/test.in # pylint @@ -56,7 +56,7 @@ coverage[toml]==7.2.2 # via # -r requirements/test.in # pytest-cov -cryptography==39.0.2 +cryptography==40.0.1 # via # -r requirements/base.txt # pyjwt @@ -86,6 +86,7 @@ django==3.2.18 # edx-auth-backends # edx-django-release-util # edx-django-utils + # social-auth-app-django django-crum==0.7.9 # via # -r requirements/base.txt @@ -94,7 +95,7 @@ django-dynamic-fixture==3.1.2 # via -r requirements/test.in django-environ==0.10.0 # via -r requirements/base.txt -django-filter==22.1 +django-filter==23.1 # via -r requirements/base.txt django-waffle==3.0.0 # via @@ -126,7 +127,7 @@ exceptiongroup==1.1.1 # via pytest factory-boy==3.2.1 # via -r requirements/test.in -faker==17.6.0 +faker==18.3.2 # via factory-boy idna==3.4 # via @@ -164,7 +165,7 @@ mypy-extensions==1.0.0 # via mypy mysqlclient==2.1.1 # via -r requirements/base.txt -newrelic==8.7.0 +newrelic==8.8.0 # via # -r requirements/base.txt # edx-django-utils @@ -182,7 +183,7 @@ pbr==5.11.1 # via # -r requirements/base.txt # stevedore -platformdirs==3.1.1 +platformdirs==3.2.0 # via pylint pluggy==1.0.0 # via @@ -205,7 +206,7 @@ pyjwt[crypto]==2.6.0 # -r requirements/base.txt # edx-auth-backends # social-auth-core -pylint==2.17.0 +pylint==2.17.1 # via # edx-lint # pylint-celery @@ -240,7 +241,7 @@ python3-openid==3.2.0 # via # -r requirements/base.txt # social-auth-core -pytz==2022.7.1 +pytz==2023.3 # via # -r requirements/base.txt # django @@ -277,11 +278,11 @@ six==1.16.0 # edx-django-release-util # edx-lint # python-dateutil -social-auth-app-django==5.1.0 +social-auth-app-django==5.2.0 # via # -r requirements/base.txt # edx-auth-backends -social-auth-core==4.4.0 +social-auth-core==4.4.1 # via # -r requirements/base.txt # edx-auth-backends @@ -303,7 +304,7 @@ tomli==2.0.1 # mypy # pylint # pytest -tomlkit==0.11.6 +tomlkit==0.11.7 # via pylint typing-extensions==4.5.0 # via From 3c1202f714fe291547c493f638fca54846100900 Mon Sep 17 00:00:00 2001 From: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com> Date: Mon, 10 Apr 2023 20:32:56 -0400 Subject: [PATCH 04/29] chore: Updating Python Requirements (#247) --- requirements/docs.txt | 2 +- requirements/local.txt | 20 +++++++++----------- requirements/pip-tools.txt | 2 +- requirements/production.txt | 4 ++-- requirements/test.txt | 16 +++++++--------- 5 files changed, 20 insertions(+), 24 deletions(-) diff --git a/requirements/docs.txt b/requirements/docs.txt index 85ce92e..76e4333 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -20,7 +20,7 @@ idna==3.4 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==6.1.0 +importlib-metadata==6.2.1 # via sphinx jinja2==3.1.2 # via sphinx diff --git a/requirements/local.txt b/requirements/local.txt index fa010a0..8eae007 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -12,15 +12,13 @@ asgiref==3.6.0 # via # -r requirements/test.txt # django -astroid==2.15.1 +astroid==2.15.2 # via # -r requirements/test.txt # pylint # pylint-celery attrs==22.2.0 - # via - # -r requirements/test.txt - # pytest + # via -r requirements/test.txt babel==2.12.1 # via # -r requirements/docs.txt @@ -68,7 +66,7 @@ coreschema==0.0.4 # -r requirements/test.txt # coreapi # drf-yasg -coverage[toml]==7.2.2 +coverage[toml]==7.2.3 # via # -r requirements/test.txt # pytest-cov @@ -110,7 +108,7 @@ django-crum==0.7.9 # via # -r requirements/test.txt # edx-django-utils -django-debug-toolbar==3.8.1 +django-debug-toolbar==4.0.0 # via -r requirements/local.in django-dynamic-fixture==3.1.2 # via -r requirements/test.txt @@ -156,7 +154,7 @@ exceptiongroup==1.1.1 # pytest factory-boy==3.2.1 # via -r requirements/test.txt -faker==18.3.2 +faker==18.4.0 # via # -r requirements/test.txt # factory-boy @@ -169,7 +167,7 @@ imagesize==1.4.1 # via # -r requirements/docs.txt # sphinx -importlib-metadata==6.1.0 +importlib-metadata==6.2.1 # via # -r requirements/docs.txt # sphinx @@ -210,7 +208,7 @@ mccabe==0.7.0 # via # -r requirements/test.txt # pylint -mypy==1.1.1 +mypy==1.2.0 # via -r requirements/test.txt mypy-extensions==1.0.0 # via @@ -268,7 +266,7 @@ pyjwt[crypto]==2.6.0 # -r requirements/test.txt # edx-auth-backends # social-auth-core -pylint==2.17.1 +pylint==2.17.2 # via # -r requirements/test.txt # edx-lint @@ -292,7 +290,7 @@ pynacl==1.5.0 # via # -r requirements/test.txt # edx-django-utils -pytest==7.2.2 +pytest==7.3.0 # via # -r requirements/test.txt # pytest-cov diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index baf1aa5..73e7934 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -10,7 +10,7 @@ click==8.1.3 # via pip-tools packaging==23.0 # via build -pip-tools==6.12.3 +pip-tools==6.13.0 # via -r requirements/pip-tools.in pyproject-hooks==1.0.0 # via build diff --git a/requirements/production.txt b/requirements/production.txt index 6f7ef70..39cec86 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -10,11 +10,11 @@ asgiref==3.6.0 # django attrs==22.2.0 # via -r requirements/base.txt -boto3==1.26.104 +boto3==1.26.109 # via # -c requirements/constraints.txt # -r requirements/production.in -botocore==1.29.104 +botocore==1.29.109 # via # boto3 # s3transfer diff --git a/requirements/test.txt b/requirements/test.txt index 216a05f..68a27af 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -8,15 +8,13 @@ asgiref==3.6.0 # via # -r requirements/base.txt # django -astroid==2.15.1 +astroid==2.15.2 # via # -r requirements/test.in # pylint # pylint-celery attrs==22.2.0 - # via - # -r requirements/base.txt - # pytest + # via -r requirements/base.txt certifi==2022.12.7 # via # -r requirements/base.txt @@ -52,7 +50,7 @@ coreschema==0.0.4 # -r requirements/base.txt # coreapi # drf-yasg -coverage[toml]==7.2.2 +coverage[toml]==7.2.3 # via # -r requirements/test.in # pytest-cov @@ -127,7 +125,7 @@ exceptiongroup==1.1.1 # via pytest factory-boy==3.2.1 # via -r requirements/test.in -faker==18.3.2 +faker==18.4.0 # via factory-boy idna==3.4 # via @@ -159,7 +157,7 @@ markupsafe==2.1.2 # jinja2 mccabe==0.7.0 # via pylint -mypy==1.1.1 +mypy==1.2.0 # via -r requirements/test.in mypy-extensions==1.0.0 # via mypy @@ -206,7 +204,7 @@ pyjwt[crypto]==2.6.0 # -r requirements/base.txt # edx-auth-backends # social-auth-core -pylint==2.17.1 +pylint==2.17.2 # via # edx-lint # pylint-celery @@ -224,7 +222,7 @@ pynacl==1.5.0 # via # -r requirements/base.txt # edx-django-utils -pytest==7.2.2 +pytest==7.3.0 # via # -r requirements/test.in # pytest-cov From 32b32d270e1fa2207fe67889d688bcf94212fa07 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sun, 16 Apr 2023 20:20:04 -0400 Subject: [PATCH 05/29] chore: Updating Python Requirements --- requirements/base.txt | 8 ++++---- requirements/docs.txt | 6 +++--- requirements/local.txt | 16 ++++++++-------- requirements/pip-tools.txt | 2 +- requirements/pip.txt | 2 +- requirements/production.txt | 12 ++++++------ requirements/test.txt | 14 +++++++------- 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 6c3c6ce..d236931 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -6,7 +6,7 @@ # asgiref==3.6.0 # via django -attrs==22.2.0 +attrs==23.1.0 # via -r requirements/base.in certifi==2022.12.7 # via requests @@ -24,7 +24,7 @@ coreschema==0.0.4 # via # coreapi # drf-yasg -cryptography==40.0.1 +cryptography==40.0.2 # via # pyjwt # social-auth-core @@ -73,7 +73,7 @@ edx-auth-backends==4.1.0 # via -r requirements/base.in edx-django-release-util==1.2.0 # via -r requirements/base.in -edx-django-utils==5.3.0 +edx-django-utils==5.4.0 # via -r requirements/base.in idna==3.4 # via requests @@ -93,7 +93,7 @@ oauthlib==3.2.2 # via # requests-oauthlib # social-auth-core -packaging==23.0 +packaging==23.1 # via drf-yasg pbr==5.11.1 # via stevedore diff --git a/requirements/docs.txt b/requirements/docs.txt index 76e4333..c6e5fa2 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -20,15 +20,15 @@ idna==3.4 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==6.2.1 +importlib-metadata==6.4.1 # via sphinx jinja2==3.1.2 # via sphinx markupsafe==2.1.2 # via jinja2 -packaging==23.0 +packaging==23.1 # via sphinx -pygments==2.14.0 +pygments==2.15.0 # via sphinx pytz==2023.3 # via babel diff --git a/requirements/local.txt b/requirements/local.txt index 8eae007..d52f610 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -12,12 +12,12 @@ asgiref==3.6.0 # via # -r requirements/test.txt # django -astroid==2.15.2 +astroid==2.15.3 # via # -r requirements/test.txt # pylint # pylint-celery -attrs==22.2.0 +attrs==23.1.0 # via -r requirements/test.txt babel==2.12.1 # via @@ -70,7 +70,7 @@ coverage[toml]==7.2.3 # via # -r requirements/test.txt # pytest-cov -cryptography==40.0.1 +cryptography==40.0.2 # via # -r requirements/test.txt # pyjwt @@ -142,7 +142,7 @@ edx-auth-backends==4.1.0 # via -r requirements/test.txt edx-django-release-util==1.2.0 # via -r requirements/test.txt -edx-django-utils==5.3.0 +edx-django-utils==5.4.0 # via -r requirements/test.txt edx-lint==5.3.4 # via -r requirements/test.txt @@ -167,7 +167,7 @@ imagesize==1.4.1 # via # -r requirements/docs.txt # sphinx -importlib-metadata==6.2.1 +importlib-metadata==6.4.1 # via # -r requirements/docs.txt # sphinx @@ -225,7 +225,7 @@ oauthlib==3.2.2 # -r requirements/test.txt # requests-oauthlib # social-auth-core -packaging==23.0 +packaging==23.1 # via # -r requirements/docs.txt # -r requirements/test.txt @@ -255,7 +255,7 @@ pycparser==2.21 # via # -r requirements/test.txt # cffi -pygments==2.14.0 +pygments==2.15.0 # via # -r requirements/docs.txt # -r requirements/test.txt @@ -290,7 +290,7 @@ pynacl==1.5.0 # via # -r requirements/test.txt # edx-django-utils -pytest==7.3.0 +pytest==7.3.1 # via # -r requirements/test.txt # pytest-cov diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 73e7934..fd0cc1c 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -8,7 +8,7 @@ build==0.10.0 # via pip-tools click==8.1.3 # via pip-tools -packaging==23.0 +packaging==23.1 # via build pip-tools==6.13.0 # via -r requirements/pip-tools.in diff --git a/requirements/pip.txt b/requirements/pip.txt index 896a85c..4b902cb 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -8,7 +8,7 @@ wheel==0.40.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==23.0.1 +pip==23.1 # via -r requirements/pip.in setuptools==67.6.1 # via -r requirements/pip.in diff --git a/requirements/production.txt b/requirements/production.txt index 39cec86..7e3ee4d 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -8,13 +8,13 @@ asgiref==3.6.0 # via # -r requirements/base.txt # django -attrs==22.2.0 +attrs==23.1.0 # via -r requirements/base.txt -boto3==1.26.109 +boto3==1.26.114 # via # -c requirements/constraints.txt # -r requirements/production.in -botocore==1.29.109 +botocore==1.29.114 # via # boto3 # s3transfer @@ -44,7 +44,7 @@ coreschema==0.0.4 # -r requirements/base.txt # coreapi # drf-yasg -cryptography==40.0.1 +cryptography==40.0.2 # via # -r requirements/base.txt # pyjwt @@ -102,7 +102,7 @@ edx-auth-backends==4.1.0 # via -r requirements/base.txt edx-django-release-util==1.2.0 # via -r requirements/base.txt -edx-django-utils==5.3.0 +edx-django-utils==5.4.0 # via -r requirements/base.txt gevent==22.10.2 # via -r requirements/production.in @@ -146,7 +146,7 @@ oauthlib==3.2.2 # -r requirements/base.txt # requests-oauthlib # social-auth-core -packaging==23.0 +packaging==23.1 # via # -r requirements/base.txt # drf-yasg diff --git a/requirements/test.txt b/requirements/test.txt index 68a27af..8779ce9 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -8,12 +8,12 @@ asgiref==3.6.0 # via # -r requirements/base.txt # django -astroid==2.15.2 +astroid==2.15.3 # via # -r requirements/test.in # pylint # pylint-celery -attrs==22.2.0 +attrs==23.1.0 # via -r requirements/base.txt certifi==2022.12.7 # via @@ -54,7 +54,7 @@ coverage[toml]==7.2.3 # via # -r requirements/test.in # pytest-cov -cryptography==40.0.1 +cryptography==40.0.2 # via # -r requirements/base.txt # pyjwt @@ -117,7 +117,7 @@ edx-auth-backends==4.1.0 # via -r requirements/base.txt edx-django-release-util==1.2.0 # via -r requirements/base.txt -edx-django-utils==5.3.0 +edx-django-utils==5.4.0 # via -r requirements/base.txt edx-lint==5.3.4 # via -r requirements/test.in @@ -172,7 +172,7 @@ oauthlib==3.2.2 # -r requirements/base.txt # requests-oauthlib # social-auth-core -packaging==23.0 +packaging==23.1 # via # -r requirements/base.txt # drf-yasg @@ -197,7 +197,7 @@ pycparser==2.21 # via # -r requirements/base.txt # cffi -pygments==2.14.0 +pygments==2.15.0 # via diff-cover pyjwt[crypto]==2.6.0 # via @@ -222,7 +222,7 @@ pynacl==1.5.0 # via # -r requirements/base.txt # edx-django-utils -pytest==7.3.0 +pytest==7.3.1 # via # -r requirements/test.in # pytest-cov From df8cbdcf3d08f2fc3db1a4e37dd7c45f285746a2 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Thu, 20 Apr 2023 14:28:41 -0400 Subject: [PATCH 06/29] docs: Update the contributing guidelines link. We're moving towards a single set of guidelines org-wide. --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 941f20d..69b4d70 100644 --- a/README.rst +++ b/README.rst @@ -176,7 +176,7 @@ Ask questions and discuss this project on `Slack `_ for details. Even though it was written with ``edx-platform`` in mind, these guidelines should be followed for Open edX code in general. +Contributions are welcome. Please read `How To Contribute `_ for details. ---------------------------- The Open edX Code of Conduct From d34ba92edffcbc31233c2e323326a4c6e079ee9c Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sun, 23 Apr 2023 20:20:19 -0400 Subject: [PATCH 07/29] chore: Updating Python Requirements --- requirements/base.txt | 6 +++--- requirements/docs.txt | 4 ++-- requirements/local.txt | 10 +++++----- requirements/pip.txt | 4 ++-- requirements/production.txt | 10 +++++----- requirements/test.txt | 8 ++++---- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index d236931..9b26039 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -97,7 +97,7 @@ packaging==23.1 # via drf-yasg pbr==5.11.1 # via stevedore -psutil==5.9.4 +psutil==5.9.5 # via edx-django-utils pycparser==2.21 # via cffi @@ -134,11 +134,11 @@ six==1.16.0 # edx-django-release-util social-auth-app-django==5.2.0 # via edx-auth-backends -social-auth-core==4.4.1 +social-auth-core==4.4.2 # via # edx-auth-backends # social-auth-app-django -sqlparse==0.4.3 +sqlparse==0.4.4 # via # -r requirements/base.in # django diff --git a/requirements/docs.txt b/requirements/docs.txt index c6e5fa2..ac37642 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -20,7 +20,7 @@ idna==3.4 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==6.4.1 +importlib-metadata==6.6.0 # via sphinx jinja2==3.1.2 # via sphinx @@ -28,7 +28,7 @@ markupsafe==2.1.2 # via jinja2 packaging==23.1 # via sphinx -pygments==2.15.0 +pygments==2.15.1 # via sphinx pytz==2023.3 # via babel diff --git a/requirements/local.txt b/requirements/local.txt index d52f610..4d4b1af 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -167,7 +167,7 @@ imagesize==1.4.1 # via # -r requirements/docs.txt # sphinx -importlib-metadata==6.4.1 +importlib-metadata==6.6.0 # via # -r requirements/docs.txt # sphinx @@ -245,7 +245,7 @@ pluggy==1.0.0 # -r requirements/test.txt # diff-cover # pytest -psutil==5.9.4 +psutil==5.9.5 # via # -r requirements/test.txt # edx-django-utils @@ -255,7 +255,7 @@ pycparser==2.21 # via # -r requirements/test.txt # cffi -pygments==2.15.0 +pygments==2.15.1 # via # -r requirements/docs.txt # -r requirements/test.txt @@ -362,7 +362,7 @@ social-auth-app-django==5.2.0 # via # -r requirements/test.txt # edx-auth-backends -social-auth-core==4.4.1 +social-auth-core==4.4.2 # via # -r requirements/test.txt # edx-auth-backends @@ -396,7 +396,7 @@ sphinxcontrib-serializinghtml==1.1.5 # via # -r requirements/docs.txt # sphinx -sqlparse==0.4.3 +sqlparse==0.4.4 # via # -r requirements/test.txt # django diff --git a/requirements/pip.txt b/requirements/pip.txt index 4b902cb..d8adf1b 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -8,7 +8,7 @@ wheel==0.40.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==23.1 +pip==23.1.1 # via -r requirements/pip.in -setuptools==67.6.1 +setuptools==67.7.1 # via -r requirements/pip.in diff --git a/requirements/production.txt b/requirements/production.txt index 7e3ee4d..4be3dc9 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -10,11 +10,11 @@ asgiref==3.6.0 # django attrs==23.1.0 # via -r requirements/base.txt -boto3==1.26.114 +boto3==1.26.118 # via # -c requirements/constraints.txt # -r requirements/production.in -botocore==1.29.114 +botocore==1.29.118 # via # boto3 # s3transfer @@ -154,7 +154,7 @@ pbr==5.11.1 # via # -r requirements/base.txt # stevedore -psutil==5.9.4 +psutil==5.9.5 # via # -r requirements/base.txt # edx-django-utils @@ -221,12 +221,12 @@ social-auth-app-django==5.2.0 # via # -r requirements/base.txt # edx-auth-backends -social-auth-core==4.4.1 +social-auth-core==4.4.2 # via # -r requirements/base.txt # edx-auth-backends # social-auth-app-django -sqlparse==0.4.3 +sqlparse==0.4.4 # via # -r requirements/base.txt # django diff --git a/requirements/test.txt b/requirements/test.txt index 8779ce9..bd8b96c 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -187,7 +187,7 @@ pluggy==1.0.0 # via # diff-cover # pytest -psutil==5.9.4 +psutil==5.9.5 # via # -r requirements/base.txt # edx-django-utils @@ -197,7 +197,7 @@ pycparser==2.21 # via # -r requirements/base.txt # cffi -pygments==2.15.0 +pygments==2.15.1 # via diff-cover pyjwt[crypto]==2.6.0 # via @@ -280,12 +280,12 @@ social-auth-app-django==5.2.0 # via # -r requirements/base.txt # edx-auth-backends -social-auth-core==4.4.1 +social-auth-core==4.4.2 # via # -r requirements/base.txt # edx-auth-backends # social-auth-app-django -sqlparse==0.4.3 +sqlparse==0.4.4 # via # -r requirements/base.txt # django From a2c2259dcb603d00dfb1c7928395bf27624a02c4 Mon Sep 17 00:00:00 2001 From: Eugene Dyudyunov Date: Tue, 25 Apr 2023 17:23:55 +0300 Subject: [PATCH 08/29] fix: bundles list view Request-URI Too Long error (#197) There could be a lot of bundles, so we can't use query params because it will raise the "Request-URI Too Long" error. Use the request data in such case. --- blockstore/apps/rest_api/v1/views/bundles.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/blockstore/apps/rest_api/v1/views/bundles.py b/blockstore/apps/rest_api/v1/views/bundles.py index 46f6743..b02b84f 100644 --- a/blockstore/apps/rest_api/v1/views/bundles.py +++ b/blockstore/apps/rest_api/v1/views/bundles.py @@ -20,6 +20,13 @@ class BundleFilter(FilterSet): """ Filter for BundleViewSet. """ + def __init__(self, data=None, queryset=None, *, request=None, prefix=None): + # There could be a lot of bundles, so we can't use query params because it will + # raise the "Request-URI Too Long" error. Use the request data in such case. + # NOTE: query_params (data arg) have a higher priority than the request.data + data = data or request.data or {} + super().__init__(data, queryset, request=request, prefix=prefix) + uuid = AllValuesMultipleFilter(widget=CSVWidget) # Accepts multiple comma-separated UUIDs text_search = CharFilter(method='search') From f8ea4e7466197ec31edfca58cdaa87acfb0df97a Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sun, 30 Apr 2023 20:21:32 -0400 Subject: [PATCH 09/29] chore: Updating Python Requirements --- requirements/base.txt | 4 ++-- requirements/docs.txt | 2 +- requirements/local.txt | 16 ++++++++-------- requirements/pip.txt | 4 ++-- requirements/production.txt | 8 ++++---- requirements/test.txt | 16 ++++++++-------- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 9b26039..c7c5f14 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -51,7 +51,7 @@ django-crum==0.7.9 # via edx-django-utils django-environ==0.10.0 # via -r requirements/base.in -django-filter==23.1 +django-filter==23.2 # via -r requirements/base.in django-waffle==3.0.0 # via @@ -117,7 +117,7 @@ pytz==2023.3 # drf-yasg pyyaml==6.0 # via edx-django-release-util -requests==2.28.2 +requests==2.29.0 # via # coreapi # requests-oauthlib diff --git a/requirements/docs.txt b/requirements/docs.txt index ac37642..b7019f3 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -32,7 +32,7 @@ pygments==2.15.1 # via sphinx pytz==2023.3 # via babel -requests==2.28.2 +requests==2.29.0 # via sphinx six==1.16.0 # via edx-sphinx-theme diff --git a/requirements/local.txt b/requirements/local.txt index 4d4b1af..cbff141 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -12,7 +12,7 @@ asgiref==3.6.0 # via # -r requirements/test.txt # django -astroid==2.15.3 +astroid==2.15.4 # via # -r requirements/test.txt # pylint @@ -66,7 +66,7 @@ coreschema==0.0.4 # -r requirements/test.txt # coreapi # drf-yasg -coverage[toml]==7.2.3 +coverage[toml]==7.2.5 # via # -r requirements/test.txt # pytest-cov @@ -114,7 +114,7 @@ django-dynamic-fixture==3.1.2 # via -r requirements/test.txt django-environ==0.10.0 # via -r requirements/test.txt -django-filter==23.1 +django-filter==23.2 # via -r requirements/test.txt django-waffle==3.0.0 # via @@ -154,7 +154,7 @@ exceptiongroup==1.1.1 # pytest factory-boy==3.2.1 # via -r requirements/test.txt -faker==18.4.0 +faker==18.6.0 # via # -r requirements/test.txt # factory-boy @@ -236,7 +236,7 @@ pbr==5.11.1 # via # -r requirements/test.txt # stevedore -platformdirs==3.2.0 +platformdirs==3.5.0 # via # -r requirements/test.txt # pylint @@ -266,7 +266,7 @@ pyjwt[crypto]==2.6.0 # -r requirements/test.txt # edx-auth-backends # social-auth-core -pylint==2.17.2 +pylint==2.17.3 # via # -r requirements/test.txt # edx-lint @@ -324,7 +324,7 @@ pyyaml==6.0 # -r requirements/test.txt # code-annotations # edx-django-release-util -requests==2.28.2 +requests==2.29.0 # via # -r requirements/docs.txt # -r requirements/test.txt @@ -417,7 +417,7 @@ tomli==2.0.1 # mypy # pylint # pytest -tomlkit==0.11.7 +tomlkit==0.11.8 # via # -r requirements/test.txt # pylint diff --git a/requirements/pip.txt b/requirements/pip.txt index d8adf1b..e6827ba 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -8,7 +8,7 @@ wheel==0.40.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==23.1.1 +pip==23.1.2 # via -r requirements/pip.in -setuptools==67.7.1 +setuptools==67.7.2 # via -r requirements/pip.in diff --git a/requirements/production.txt b/requirements/production.txt index 4be3dc9..7245eca 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -10,11 +10,11 @@ asgiref==3.6.0 # django attrs==23.1.0 # via -r requirements/base.txt -boto3==1.26.118 +boto3==1.26.123 # via # -c requirements/constraints.txt # -r requirements/production.in -botocore==1.29.118 +botocore==1.29.123 # via # boto3 # s3transfer @@ -76,7 +76,7 @@ django-crum==0.7.9 # edx-django-utils django-environ==0.10.0 # via -r requirements/base.txt -django-filter==23.1 +django-filter==23.2 # via -r requirements/base.txt django-storages==1.13.2 # via -r requirements/production.in @@ -190,7 +190,7 @@ pyyaml==6.0 # -r requirements/base.txt # -r requirements/production.in # edx-django-release-util -requests==2.28.2 +requests==2.29.0 # via # -r requirements/base.txt # coreapi diff --git a/requirements/test.txt b/requirements/test.txt index bd8b96c..54ea5ee 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -8,7 +8,7 @@ asgiref==3.6.0 # via # -r requirements/base.txt # django -astroid==2.15.3 +astroid==2.15.4 # via # -r requirements/test.in # pylint @@ -50,7 +50,7 @@ coreschema==0.0.4 # -r requirements/base.txt # coreapi # drf-yasg -coverage[toml]==7.2.3 +coverage[toml]==7.2.5 # via # -r requirements/test.in # pytest-cov @@ -93,7 +93,7 @@ django-dynamic-fixture==3.1.2 # via -r requirements/test.in django-environ==0.10.0 # via -r requirements/base.txt -django-filter==23.1 +django-filter==23.2 # via -r requirements/base.txt django-waffle==3.0.0 # via @@ -125,7 +125,7 @@ exceptiongroup==1.1.1 # via pytest factory-boy==3.2.1 # via -r requirements/test.in -faker==18.4.0 +faker==18.6.0 # via factory-boy idna==3.4 # via @@ -181,7 +181,7 @@ pbr==5.11.1 # via # -r requirements/base.txt # stevedore -platformdirs==3.2.0 +platformdirs==3.5.0 # via pylint pluggy==1.0.0 # via @@ -204,7 +204,7 @@ pyjwt[crypto]==2.6.0 # -r requirements/base.txt # edx-auth-backends # social-auth-core -pylint==2.17.2 +pylint==2.17.3 # via # edx-lint # pylint-celery @@ -250,7 +250,7 @@ pyyaml==6.0 # -r requirements/base.txt # code-annotations # edx-django-release-util -requests==2.28.2 +requests==2.29.0 # via # -r requirements/base.txt # coreapi @@ -302,7 +302,7 @@ tomli==2.0.1 # mypy # pylint # pytest -tomlkit==0.11.7 +tomlkit==0.11.8 # via pylint typing-extensions==4.5.0 # via From b95577074ecd6841d4ccc1275b87e84214466fb9 Mon Sep 17 00:00:00 2001 From: Agrendalath Date: Mon, 15 May 2023 10:16:19 +0200 Subject: [PATCH 10/29] chore: Pin `urllib3<2.0.0` version --- requirements/constraints.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 98a3a4c..63e239d 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -16,3 +16,7 @@ boto3<2.0 django>3.2,<3.3 + +# `botocore` still requires `urllib3>=1.25.4,<1.27`: https://github.com/boto/botocore/issues/2926 +# `edx-platform` also pins `urllib3<2.0.0`: https://github.com/openedx/edx-platform/issues/32222 +urllib3<2.0.0 From 34a75642e03877c4ed7ce2f00fbc471de89faa7c Mon Sep 17 00:00:00 2001 From: Agrendalath Date: Mon, 15 May 2023 10:17:51 +0200 Subject: [PATCH 11/29] chore: Updating Python Requirements --- requirements/base.txt | 14 ++++++++------ requirements/docs.txt | 8 +++++--- requirements/local.txt | 23 ++++++++++++----------- requirements/production.txt | 17 +++++++++-------- requirements/test.txt | 23 ++++++++++++----------- 5 files changed, 46 insertions(+), 39 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index c7c5f14..87aa5fd 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,7 +8,7 @@ asgiref==3.6.0 # via django attrs==23.1.0 # via -r requirements/base.in -certifi==2022.12.7 +certifi==2023.5.7 # via requests cffi==1.15.1 # via @@ -32,7 +32,7 @@ defusedxml==0.7.1 # via # python3-openid # social-auth-core -django==3.2.18 +django==3.2.19 # via # -c requirements/common_constraints.txt # -c requirements/constraints.txt @@ -101,7 +101,7 @@ psutil==5.9.5 # via edx-django-utils pycparser==2.21 # via cffi -pyjwt[crypto]==2.6.0 +pyjwt[crypto]==2.7.0 # via # edx-auth-backends # social-auth-core @@ -117,14 +117,14 @@ pytz==2023.3 # drf-yasg pyyaml==6.0 # via edx-django-release-util -requests==2.29.0 +requests==2.30.0 # via # coreapi # requests-oauthlib # social-auth-core requests-oauthlib==1.3.1 # via social-auth-core -ruamel-yaml==0.17.21 +ruamel-yaml==0.17.26 # via drf-yasg ruamel-yaml-clib==0.2.7 # via ruamel-yaml @@ -149,4 +149,6 @@ uritemplate==4.1.1 # coreapi # drf-yasg urllib3==1.26.15 - # via requests + # via + # -c requirements/constraints.txt + # requests diff --git a/requirements/docs.txt b/requirements/docs.txt index b7019f3..b39ca0f 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -8,7 +8,7 @@ alabaster==0.7.13 # via sphinx babel==2.12.1 # via sphinx -certifi==2022.12.7 +certifi==2023.5.7 # via requests charset-normalizer==3.1.0 # via requests @@ -32,7 +32,7 @@ pygments==2.15.1 # via sphinx pytz==2023.3 # via babel -requests==2.29.0 +requests==2.30.0 # via sphinx six==1.16.0 # via edx-sphinx-theme @@ -56,6 +56,8 @@ sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 # via sphinx urllib3==1.26.15 - # via requests + # via + # -c requirements/constraints.txt + # requests zipp==3.15.0 # via importlib-metadata diff --git a/requirements/local.txt b/requirements/local.txt index cbff141..48b12e6 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -12,7 +12,7 @@ asgiref==3.6.0 # via # -r requirements/test.txt # django -astroid==2.15.4 +astroid==2.15.5 # via # -r requirements/test.txt # pylint @@ -23,7 +23,7 @@ babel==2.12.1 # via # -r requirements/docs.txt # sphinx -certifi==2022.12.7 +certifi==2023.5.7 # via # -r requirements/docs.txt # -r requirements/test.txt @@ -88,7 +88,7 @@ dill==0.3.6 # via # -r requirements/test.txt # pylint -django==3.2.18 +django==3.2.19 # via # -c requirements/common_constraints.txt # -c requirements/constraints.txt @@ -154,7 +154,7 @@ exceptiongroup==1.1.1 # pytest factory-boy==3.2.1 # via -r requirements/test.txt -faker==18.6.0 +faker==18.7.0 # via # -r requirements/test.txt # factory-boy @@ -208,7 +208,7 @@ mccabe==0.7.0 # via # -r requirements/test.txt # pylint -mypy==1.2.0 +mypy==1.3.0 # via -r requirements/test.txt mypy-extensions==1.0.0 # via @@ -236,7 +236,7 @@ pbr==5.11.1 # via # -r requirements/test.txt # stevedore -platformdirs==3.5.0 +platformdirs==3.5.1 # via # -r requirements/test.txt # pylint @@ -261,12 +261,12 @@ pygments==2.15.1 # -r requirements/test.txt # diff-cover # sphinx -pyjwt[crypto]==2.6.0 +pyjwt[crypto]==2.7.0 # via # -r requirements/test.txt # edx-auth-backends # social-auth-core -pylint==2.17.3 +pylint==2.17.4 # via # -r requirements/test.txt # edx-lint @@ -281,7 +281,7 @@ pylint-django==2.5.3 # via # -r requirements/test.txt # edx-lint -pylint-plugin-utils==0.7 +pylint-plugin-utils==0.8.1 # via # -r requirements/test.txt # pylint-celery @@ -324,7 +324,7 @@ pyyaml==6.0 # -r requirements/test.txt # code-annotations # edx-django-release-util -requests==2.29.0 +requests==2.30.0 # via # -r requirements/docs.txt # -r requirements/test.txt @@ -336,7 +336,7 @@ requests-oauthlib==1.3.1 # via # -r requirements/test.txt # social-auth-core -ruamel-yaml==0.17.21 +ruamel-yaml==0.17.26 # via # -r requirements/test.txt # drf-yasg @@ -434,6 +434,7 @@ uritemplate==4.1.1 # drf-yasg urllib3==1.26.15 # via + # -c requirements/constraints.txt # -r requirements/docs.txt # -r requirements/test.txt # requests diff --git a/requirements/production.txt b/requirements/production.txt index 7245eca..7b3d002 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -10,15 +10,15 @@ asgiref==3.6.0 # django attrs==23.1.0 # via -r requirements/base.txt -boto3==1.26.123 +boto3==1.26.133 # via # -c requirements/constraints.txt # -r requirements/production.in -botocore==1.29.123 +botocore==1.29.133 # via # boto3 # s3transfer -certifi==2022.12.7 +certifi==2023.5.7 # via # -r requirements/base.txt # requests @@ -54,7 +54,7 @@ defusedxml==0.7.1 # -r requirements/base.txt # python3-openid # social-auth-core -django==3.2.18 +django==3.2.19 # via # -c requirements/common_constraints.txt # -c requirements/constraints.txt @@ -162,7 +162,7 @@ pycparser==2.21 # via # -r requirements/base.txt # cffi -pyjwt[crypto]==2.6.0 +pyjwt[crypto]==2.7.0 # via # -r requirements/base.txt # edx-auth-backends @@ -190,7 +190,7 @@ pyyaml==6.0 # -r requirements/base.txt # -r requirements/production.in # edx-django-release-util -requests==2.29.0 +requests==2.30.0 # via # -r requirements/base.txt # coreapi @@ -200,7 +200,7 @@ requests-oauthlib==1.3.1 # via # -r requirements/base.txt # social-auth-core -ruamel-yaml==0.17.21 +ruamel-yaml==0.17.26 # via # -r requirements/base.txt # drf-yasg @@ -208,7 +208,7 @@ ruamel-yaml-clib==0.2.7 # via # -r requirements/base.txt # ruamel-yaml -s3transfer==0.6.0 +s3transfer==0.6.1 # via boto3 six==1.16.0 # via @@ -241,6 +241,7 @@ uritemplate==4.1.1 # drf-yasg urllib3==1.26.15 # via + # -c requirements/constraints.txt # -r requirements/base.txt # botocore # requests diff --git a/requirements/test.txt b/requirements/test.txt index 54ea5ee..656313d 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -8,14 +8,14 @@ asgiref==3.6.0 # via # -r requirements/base.txt # django -astroid==2.15.4 +astroid==2.15.5 # via # -r requirements/test.in # pylint # pylint-celery attrs==23.1.0 # via -r requirements/base.txt -certifi==2022.12.7 +certifi==2023.5.7 # via # -r requirements/base.txt # requests @@ -70,7 +70,7 @@ diff-cover==7.5.0 # via -r requirements/test.in dill==0.3.6 # via pylint -django==3.2.18 +django==3.2.19 # via # -c requirements/common_constraints.txt # -c requirements/constraints.txt @@ -125,7 +125,7 @@ exceptiongroup==1.1.1 # via pytest factory-boy==3.2.1 # via -r requirements/test.in -faker==18.6.0 +faker==18.7.0 # via factory-boy idna==3.4 # via @@ -157,7 +157,7 @@ markupsafe==2.1.2 # jinja2 mccabe==0.7.0 # via pylint -mypy==1.2.0 +mypy==1.3.0 # via -r requirements/test.in mypy-extensions==1.0.0 # via mypy @@ -181,7 +181,7 @@ pbr==5.11.1 # via # -r requirements/base.txt # stevedore -platformdirs==3.5.0 +platformdirs==3.5.1 # via pylint pluggy==1.0.0 # via @@ -199,12 +199,12 @@ pycparser==2.21 # cffi pygments==2.15.1 # via diff-cover -pyjwt[crypto]==2.6.0 +pyjwt[crypto]==2.7.0 # via # -r requirements/base.txt # edx-auth-backends # social-auth-core -pylint==2.17.3 +pylint==2.17.4 # via # edx-lint # pylint-celery @@ -214,7 +214,7 @@ pylint-celery==0.3 # via edx-lint pylint-django==2.5.3 # via edx-lint -pylint-plugin-utils==0.7 +pylint-plugin-utils==0.8.1 # via # pylint-celery # pylint-django @@ -250,7 +250,7 @@ pyyaml==6.0 # -r requirements/base.txt # code-annotations # edx-django-release-util -requests==2.29.0 +requests==2.30.0 # via # -r requirements/base.txt # coreapi @@ -260,7 +260,7 @@ requests-oauthlib==1.3.1 # via # -r requirements/base.txt # social-auth-core -ruamel-yaml==0.17.21 +ruamel-yaml==0.17.26 # via # -r requirements/base.txt # drf-yasg @@ -316,6 +316,7 @@ uritemplate==4.1.1 # drf-yasg urllib3==1.26.15 # via + # -c requirements/constraints.txt # -r requirements/base.txt # requests wrapt==1.15.0 From b51eeb190ebbe593402bbab35ab3d6f7aefb8028 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sun, 21 May 2023 20:20:38 -0400 Subject: [PATCH 12/29] chore: Updating Python Requirements --- requirements/base.txt | 2 +- requirements/common_constraints.txt | 5 +++++ requirements/local.txt | 8 ++++---- requirements/pip.txt | 2 +- requirements/production.txt | 6 +++--- requirements/test.txt | 6 +++--- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 87aa5fd..bcbef6e 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -142,7 +142,7 @@ sqlparse==0.4.4 # via # -r requirements/base.in # django -stevedore==5.0.0 +stevedore==5.1.0 # via edx-django-utils uritemplate==4.1.1 # via diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 7e39123..f8d4bb8 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -30,3 +30,8 @@ tox<4.0.0 # Pinning Sphinx version unless the compatibility issue gets resolved # For details, see issue https://github.com/openedx/edx-sphinx-theme/issues/197 sphinx<6.0.0 + +# 2023-05-18: edx-drf-extensions 8.8.0 inadvertently introduced stricter Base64 decoding, +# and some of our IDAs have malformed configs. This should be a very temporary constraint. +# See https://github.com/openedx/edx-drf-extensions/issues/346 for details. +edx-drf-extensions<8.8.0 diff --git a/requirements/local.txt b/requirements/local.txt index 48b12e6..19d126a 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -108,7 +108,7 @@ django-crum==0.7.9 # via # -r requirements/test.txt # edx-django-utils -django-debug-toolbar==4.0.0 +django-debug-toolbar==4.1.0 # via -r requirements/local.in django-dynamic-fixture==3.1.2 # via -r requirements/test.txt @@ -154,7 +154,7 @@ exceptiongroup==1.1.1 # pytest factory-boy==3.2.1 # via -r requirements/test.txt -faker==18.7.0 +faker==18.9.0 # via # -r requirements/test.txt # factory-boy @@ -281,7 +281,7 @@ pylint-django==2.5.3 # via # -r requirements/test.txt # edx-lint -pylint-plugin-utils==0.8.1 +pylint-plugin-utils==0.8.2 # via # -r requirements/test.txt # pylint-celery @@ -401,7 +401,7 @@ sqlparse==0.4.4 # -r requirements/test.txt # django # django-debug-toolbar -stevedore==5.0.0 +stevedore==5.1.0 # via # -r requirements/test.txt # code-annotations diff --git a/requirements/pip.txt b/requirements/pip.txt index e6827ba..5a5ce22 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -10,5 +10,5 @@ wheel==0.40.0 # The following packages are considered to be unsafe in a requirements file: pip==23.1.2 # via -r requirements/pip.in -setuptools==67.7.2 +setuptools==67.8.0 # via -r requirements/pip.in diff --git a/requirements/production.txt b/requirements/production.txt index 7b3d002..8cfd4ba 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -10,11 +10,11 @@ asgiref==3.6.0 # django attrs==23.1.0 # via -r requirements/base.txt -boto3==1.26.133 +boto3==1.26.137 # via # -c requirements/constraints.txt # -r requirements/production.in -botocore==1.29.133 +botocore==1.29.137 # via # boto3 # s3transfer @@ -230,7 +230,7 @@ sqlparse==0.4.4 # via # -r requirements/base.txt # django -stevedore==5.0.0 +stevedore==5.1.0 # via # -r requirements/base.txt # edx-django-utils diff --git a/requirements/test.txt b/requirements/test.txt index 656313d..7a31ccd 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -125,7 +125,7 @@ exceptiongroup==1.1.1 # via pytest factory-boy==3.2.1 # via -r requirements/test.in -faker==18.7.0 +faker==18.9.0 # via factory-boy idna==3.4 # via @@ -214,7 +214,7 @@ pylint-celery==0.3 # via edx-lint pylint-django==2.5.3 # via edx-lint -pylint-plugin-utils==0.8.1 +pylint-plugin-utils==0.8.2 # via # pylint-celery # pylint-django @@ -289,7 +289,7 @@ sqlparse==0.4.4 # via # -r requirements/base.txt # django -stevedore==5.0.0 +stevedore==5.1.0 # via # -r requirements/base.txt # code-annotations From b2667df9ef78416ad5962747418656c9a7ec9218 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sun, 28 May 2023 20:20:08 -0400 Subject: [PATCH 13/29] chore: Updating Python Requirements --- requirements/base.txt | 10 ++++++---- requirements/common_constraints.txt | 5 ----- requirements/docs.txt | 4 ++-- requirements/local.txt | 15 ++++++++------- requirements/production.txt | 16 ++++++++++------ requirements/test.txt | 16 +++++++++------- 6 files changed, 35 insertions(+), 31 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index bcbef6e..553cd10 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,7 +4,7 @@ # # make upgrade # -asgiref==3.6.0 +asgiref==3.7.2 # via django attrs==23.1.0 # via -r requirements/base.in @@ -117,14 +117,14 @@ pytz==2023.3 # drf-yasg pyyaml==6.0 # via edx-django-release-util -requests==2.30.0 +requests==2.31.0 # via # coreapi # requests-oauthlib # social-auth-core requests-oauthlib==1.3.1 # via social-auth-core -ruamel-yaml==0.17.26 +ruamel-yaml==0.17.28 # via drf-yasg ruamel-yaml-clib==0.2.7 # via ruamel-yaml @@ -144,11 +144,13 @@ sqlparse==0.4.4 # django stevedore==5.1.0 # via edx-django-utils +typing-extensions==4.6.2 + # via asgiref uritemplate==4.1.1 # via # coreapi # drf-yasg -urllib3==1.26.15 +urllib3==1.26.16 # via # -c requirements/constraints.txt # requests diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index f8d4bb8..7e39123 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -30,8 +30,3 @@ tox<4.0.0 # Pinning Sphinx version unless the compatibility issue gets resolved # For details, see issue https://github.com/openedx/edx-sphinx-theme/issues/197 sphinx<6.0.0 - -# 2023-05-18: edx-drf-extensions 8.8.0 inadvertently introduced stricter Base64 decoding, -# and some of our IDAs have malformed configs. This should be a very temporary constraint. -# See https://github.com/openedx/edx-drf-extensions/issues/346 for details. -edx-drf-extensions<8.8.0 diff --git a/requirements/docs.txt b/requirements/docs.txt index b39ca0f..ed3464d 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -32,7 +32,7 @@ pygments==2.15.1 # via sphinx pytz==2023.3 # via babel -requests==2.30.0 +requests==2.31.0 # via sphinx six==1.16.0 # via edx-sphinx-theme @@ -55,7 +55,7 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx -urllib3==1.26.15 +urllib3==1.26.16 # via # -c requirements/constraints.txt # requests diff --git a/requirements/local.txt b/requirements/local.txt index 19d126a..32b505e 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -8,7 +8,7 @@ alabaster==0.7.13 # via # -r requirements/docs.txt # sphinx -asgiref==3.6.0 +asgiref==3.7.2 # via # -r requirements/test.txt # django @@ -66,7 +66,7 @@ coreschema==0.0.4 # -r requirements/test.txt # coreapi # drf-yasg -coverage[toml]==7.2.5 +coverage[toml]==7.2.6 # via # -r requirements/test.txt # pytest-cov @@ -295,7 +295,7 @@ pytest==7.3.1 # -r requirements/test.txt # pytest-cov # pytest-django -pytest-cov==4.0.0 +pytest-cov==4.1.0 # via -r requirements/test.txt pytest-django==4.5.2 # via -r requirements/test.txt @@ -324,7 +324,7 @@ pyyaml==6.0 # -r requirements/test.txt # code-annotations # edx-django-release-util -requests==2.30.0 +requests==2.31.0 # via # -r requirements/docs.txt # -r requirements/test.txt @@ -336,7 +336,7 @@ requests-oauthlib==1.3.1 # via # -r requirements/test.txt # social-auth-core -ruamel-yaml==0.17.26 +ruamel-yaml==0.17.28 # via # -r requirements/test.txt # drf-yasg @@ -421,9 +421,10 @@ tomlkit==0.11.8 # via # -r requirements/test.txt # pylint -typing-extensions==4.5.0 +typing-extensions==4.6.2 # via # -r requirements/test.txt + # asgiref # astroid # mypy # pylint @@ -432,7 +433,7 @@ uritemplate==4.1.1 # -r requirements/test.txt # coreapi # drf-yasg -urllib3==1.26.15 +urllib3==1.26.16 # via # -c requirements/constraints.txt # -r requirements/docs.txt diff --git a/requirements/production.txt b/requirements/production.txt index 8cfd4ba..963e676 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -4,17 +4,17 @@ # # make upgrade # -asgiref==3.6.0 +asgiref==3.7.2 # via # -r requirements/base.txt # django attrs==23.1.0 # via -r requirements/base.txt -boto3==1.26.137 +boto3==1.26.142 # via # -c requirements/constraints.txt # -r requirements/production.in -botocore==1.29.137 +botocore==1.29.142 # via # boto3 # s3transfer @@ -190,7 +190,7 @@ pyyaml==6.0 # -r requirements/base.txt # -r requirements/production.in # edx-django-release-util -requests==2.30.0 +requests==2.31.0 # via # -r requirements/base.txt # coreapi @@ -200,7 +200,7 @@ requests-oauthlib==1.3.1 # via # -r requirements/base.txt # social-auth-core -ruamel-yaml==0.17.26 +ruamel-yaml==0.17.28 # via # -r requirements/base.txt # drf-yasg @@ -234,12 +234,16 @@ stevedore==5.1.0 # via # -r requirements/base.txt # edx-django-utils +typing-extensions==4.6.2 + # via + # -r requirements/base.txt + # asgiref uritemplate==4.1.1 # via # -r requirements/base.txt # coreapi # drf-yasg -urllib3==1.26.15 +urllib3==1.26.16 # via # -c requirements/constraints.txt # -r requirements/base.txt diff --git a/requirements/test.txt b/requirements/test.txt index 7a31ccd..c198889 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,7 +4,7 @@ # # make upgrade # -asgiref==3.6.0 +asgiref==3.7.2 # via # -r requirements/base.txt # django @@ -50,7 +50,7 @@ coreschema==0.0.4 # -r requirements/base.txt # coreapi # drf-yasg -coverage[toml]==7.2.5 +coverage[toml]==7.2.6 # via # -r requirements/test.in # pytest-cov @@ -227,7 +227,7 @@ pytest==7.3.1 # -r requirements/test.in # pytest-cov # pytest-django -pytest-cov==4.0.0 +pytest-cov==4.1.0 # via -r requirements/test.in pytest-django==4.5.2 # via -r requirements/test.in @@ -250,7 +250,7 @@ pyyaml==6.0 # -r requirements/base.txt # code-annotations # edx-django-release-util -requests==2.30.0 +requests==2.31.0 # via # -r requirements/base.txt # coreapi @@ -260,7 +260,7 @@ requests-oauthlib==1.3.1 # via # -r requirements/base.txt # social-auth-core -ruamel-yaml==0.17.26 +ruamel-yaml==0.17.28 # via # -r requirements/base.txt # drf-yasg @@ -304,8 +304,10 @@ tomli==2.0.1 # pytest tomlkit==0.11.8 # via pylint -typing-extensions==4.5.0 +typing-extensions==4.6.2 # via + # -r requirements/base.txt + # asgiref # astroid # mypy # pylint @@ -314,7 +316,7 @@ uritemplate==4.1.1 # -r requirements/base.txt # coreapi # drf-yasg -urllib3==1.26.15 +urllib3==1.26.16 # via # -c requirements/constraints.txt # -r requirements/base.txt From 226789e19dc70a573e738c559f1c710a1f5e56f3 Mon Sep 17 00:00:00 2001 From: connorhaugh <49422820+connorhaugh@users.noreply.github.com> Date: Tue, 30 May 2023 14:39:15 -0400 Subject: [PATCH 14/29] docs: add local plugin dev to README (#256) This adds documentation for how users can develop with blockstore locally in devstack as a python code plugin. --- README.rst | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 69b4d70..d8307d3 100644 --- a/README.rst +++ b/README.rst @@ -90,7 +90,66 @@ By default, blockstore is run as an app inside of Open edX. Enable it using the If you need to run blockstore as a separate service (e.g. for scalability or performance reasons), you can deploy blockstore in production using `the blockstore ansible role `_. ------------------------------------------------------- -Running and testing as a separate service (development) +Development in Devstack +------------------------------------------------------- + +If you want to develop blockstore as a local python package installed in edx-platform, use the following steps: + +#. Prerequisite: Have an Open edX `Devstack `_ properly installed and working. Your devstack must use the Nutmeg release of Open edX (or newer) or be tracking the ``master`` branch of ``edx-platform``. + +#. To run blockstore as an app inside of Open edX, enable it by activating the waffle switch `blockstore.use_blockstore_app_api `_ in LMS or Studio admin. + +#. Clone this repo in the ``src/`` directory, a sibling directory of your devstack folder. + +#. In your devstack directory, run the following commands in order: + + .. code:: + + # bring up the lms +studio containers + make dev.up.large-and-slow + # Bring up the studio shell + make dev.shell.studio + # Unistall the pypi blockstore + pip uninstall openedx-blockstore #You will need to confirm the unistall with "Y". + #Install your local blockstore. + pip install -e /edx/src/blockstore/ + exit + + # do the same in the LMS + make dev.shell.lms + # Unistall the pypi blockstore + pip uninstall openedx-blockstore #You will need to confirm the unistall with "Y". + #Install your local blockstore. + pip install -e /edx/src/blockstore/ + exit + + #restart the servers to bring in changes. + make dev.restart-devserver.lms dev.restart-devserver.studio + + # you can see that your env is now installed openedx-blockstore from a local directory ``/edx/src/blockstore`` by running: + make dev.shell.lms + pip list + + +Seeing your changes will sometimes require running make requirements and then restarting the container. + +You're probably also going to want to create a collection and organization for using content libraries from the devstack command line, using: + + .. code:: + + # Create a "Collection" that new content libraries / xblocks can be created within: + docker exec -t edx.devstack.lms bash -c "source ~/.bashrc && echo \"from blockstore.apps.bundles.models import Collection; coll, _ = Collection.objects.get_or_create(title='Devstack Content Collection', uuid='11111111-2111-4111-8111-111111111111')\" | ./manage.py shell" + # Create an "Organization": + docker exec -t edx.devstack.lms bash -c "source /edx/app/edxapp/edxapp_env && echo \"from organizations.models import Organization; Organization.objects.get_or_create(short_name='DeveloperInc', defaults={'name': 'DeveloperInc', 'active': True})\" | python /edx/app/edxapp/edx-platform/manage.py lms shell" + +The Library Authoring MFE will want to know about that collection id `using a ENV variable. `_ + +Then restart Studio and the LMS (``make dev.restart-devserver.lms dev.restart-devserver.studio``). + +You then can begin setting up the `library authoring MFE `_ to use the feature of blockstore for content libraries V2. + +------------------------------------------------------- +Running and testing as a separate service ------------------------------------------------------- Blockstore was initially developed as an independently deployed application, which runs in a separate container/proccess from the LMS. It is still possible to run blockstore that way, both in production and development. From 0ca494e41ff187ef5a0ba8758ee1d201aef6466c Mon Sep 17 00:00:00 2001 From: Kshitij Sobti Date: Fri, 26 May 2023 01:52:13 +0530 Subject: [PATCH 15/29] chore: Switch from edx-sphinx-theme to sphinx-book-theme The edx-sphinx theme is being deprecated, and replaced with sphinx-book-theme. This removes references to the deprecated theme and replaces them with the new standard theme for the platform. See openedx/edx-sphinx-theme#184 --- requirements/docs.in | 2 +- requirements/docs.txt | 36 +++++++++++++++++++++++++++--------- requirements/local.txt | 32 +++++++++++++++++++++++++++----- 3 files changed, 55 insertions(+), 15 deletions(-) diff --git a/requirements/docs.in b/requirements/docs.in index 2b736be..5c9c90d 100644 --- a/requirements/docs.in +++ b/requirements/docs.in @@ -1,4 +1,4 @@ -c constraints.txt Sphinx -edx-sphinx-theme +sphinx-book-theme diff --git a/requirements/docs.txt b/requirements/docs.txt index ed3464d..daf3eb9 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -4,18 +4,24 @@ # # make upgrade # +accessible-pygments==0.0.4 + # via pydata-sphinx-theme alabaster==0.7.13 # via sphinx babel==2.12.1 - # via sphinx + # via + # pydata-sphinx-theme + # sphinx +beautifulsoup4==4.12.2 + # via pydata-sphinx-theme certifi==2023.5.7 # via requests charset-normalizer==3.1.0 # via requests docutils==0.19 - # via sphinx -edx-sphinx-theme==3.1.0 - # via -r requirements/docs.in + # via + # pydata-sphinx-theme + # sphinx idna==3.4 # via requests imagesize==1.4.1 @@ -27,22 +33,32 @@ jinja2==3.1.2 markupsafe==2.1.2 # via jinja2 packaging==23.1 - # via sphinx + # via + # pydata-sphinx-theme + # sphinx +pydata-sphinx-theme==0.13.3 + # via sphinx-book-theme pygments==2.15.1 - # via sphinx + # via + # accessible-pygments + # pydata-sphinx-theme + # sphinx pytz==2023.3 # via babel requests==2.31.0 # via sphinx -six==1.16.0 - # via edx-sphinx-theme snowballstemmer==2.2.0 # via sphinx +soupsieve==2.4.1 + # via beautifulsoup4 sphinx==5.3.0 # via # -c requirements/common_constraints.txt # -r requirements/docs.in - # edx-sphinx-theme + # pydata-sphinx-theme + # sphinx-book-theme +sphinx-book-theme==1.0.1 + # via -r requirements/docs.in sphinxcontrib-applehelp==1.0.4 # via sphinx sphinxcontrib-devhelp==1.0.2 @@ -55,6 +71,8 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx +typing-extensions==4.6.2 + # via pydata-sphinx-theme urllib3==1.26.16 # via # -c requirements/constraints.txt diff --git a/requirements/local.txt b/requirements/local.txt index 32b505e..2e0a579 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -4,6 +4,10 @@ # # make upgrade # +accessible-pygments==0.0.4 + # via + # -r requirements/docs.txt + # pydata-sphinx-theme alabaster==0.7.13 # via # -r requirements/docs.txt @@ -22,7 +26,12 @@ attrs==23.1.0 babel==2.12.1 # via # -r requirements/docs.txt + # pydata-sphinx-theme # sphinx +beautifulsoup4==4.12.2 + # via + # -r requirements/docs.txt + # pydata-sphinx-theme certifi==2023.5.7 # via # -r requirements/docs.txt @@ -129,6 +138,7 @@ djangorestframework==3.14.0 docutils==0.19 # via # -r requirements/docs.txt + # pydata-sphinx-theme # sphinx drf-nested-routers==0.93.4 # via -r requirements/test.txt @@ -146,8 +156,6 @@ edx-django-utils==5.4.0 # via -r requirements/test.txt edx-lint==5.3.4 # via -r requirements/test.txt -edx-sphinx-theme==3.1.0 - # via -r requirements/docs.txt exceptiongroup==1.1.1 # via # -r requirements/test.txt @@ -230,6 +238,7 @@ packaging==23.1 # -r requirements/docs.txt # -r requirements/test.txt # drf-yasg + # pydata-sphinx-theme # pytest # sphinx pbr==5.11.1 @@ -255,11 +264,17 @@ pycparser==2.21 # via # -r requirements/test.txt # cffi +pydata-sphinx-theme==0.13.3 + # via + # -r requirements/docs.txt + # sphinx-book-theme pygments==2.15.1 # via # -r requirements/docs.txt # -r requirements/test.txt + # accessible-pygments # diff-cover + # pydata-sphinx-theme # sphinx pyjwt[crypto]==2.7.0 # via @@ -346,13 +361,11 @@ ruamel-yaml-clib==0.2.7 # ruamel-yaml six==1.16.0 # via - # -r requirements/docs.txt # -r requirements/test.txt # django-dynamic-fixture # edx-auth-backends # edx-django-release-util # edx-lint - # edx-sphinx-theme # python-dateutil snowballstemmer==2.2.0 # via @@ -367,11 +380,18 @@ social-auth-core==4.4.2 # -r requirements/test.txt # edx-auth-backends # social-auth-app-django +soupsieve==2.4.1 + # via + # -r requirements/docs.txt + # beautifulsoup4 sphinx==5.3.0 # via # -c requirements/common_constraints.txt # -r requirements/docs.txt - # edx-sphinx-theme + # pydata-sphinx-theme + # sphinx-book-theme +sphinx-book-theme==1.0.1 + # via -r requirements/docs.txt sphinxcontrib-applehelp==1.0.4 # via # -r requirements/docs.txt @@ -423,10 +443,12 @@ tomlkit==0.11.8 # pylint typing-extensions==4.6.2 # via + # -r requirements/docs.txt # -r requirements/test.txt # asgiref # astroid # mypy + # pydata-sphinx-theme # pylint uritemplate==4.1.1 # via From 44ec6a8e965537063df7a2463c1d9f3d0ce5ebab Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sun, 4 Jun 2023 20:22:38 -0400 Subject: [PATCH 16/29] chore: Updating Python Requirements --- requirements/base.txt | 10 +++++----- requirements/docs.txt | 4 ++-- requirements/local.txt | 14 +++++++------- requirements/production.txt | 14 +++++++------- requirements/test.txt | 14 +++++++------- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 553cd10..6c39c3e 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -24,7 +24,7 @@ coreschema==0.0.4 # via # coreapi # drf-yasg -cryptography==40.0.2 +cryptography==41.0.1 # via # pyjwt # social-auth-core @@ -73,7 +73,7 @@ edx-auth-backends==4.1.0 # via -r requirements/base.in edx-django-release-util==1.2.0 # via -r requirements/base.in -edx-django-utils==5.4.0 +edx-django-utils==5.5.0 # via -r requirements/base.in idna==3.4 # via requests @@ -83,7 +83,7 @@ itypes==1.2.0 # via coreapi jinja2==3.1.2 # via coreschema -markupsafe==2.1.2 +markupsafe==2.1.3 # via jinja2 mysqlclient==2.1.1 # via -r requirements/base.in @@ -124,7 +124,7 @@ requests==2.31.0 # social-auth-core requests-oauthlib==1.3.1 # via social-auth-core -ruamel-yaml==0.17.28 +ruamel-yaml==0.17.31 # via drf-yasg ruamel-yaml-clib==0.2.7 # via ruamel-yaml @@ -144,7 +144,7 @@ sqlparse==0.4.4 # django stevedore==5.1.0 # via edx-django-utils -typing-extensions==4.6.2 +typing-extensions==4.6.3 # via asgiref uritemplate==4.1.1 # via diff --git a/requirements/docs.txt b/requirements/docs.txt index daf3eb9..164e98c 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -30,7 +30,7 @@ importlib-metadata==6.6.0 # via sphinx jinja2==3.1.2 # via sphinx -markupsafe==2.1.2 +markupsafe==2.1.3 # via jinja2 packaging==23.1 # via @@ -71,7 +71,7 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx -typing-extensions==4.6.2 +typing-extensions==4.6.3 # via pydata-sphinx-theme urllib3==1.26.16 # via diff --git a/requirements/local.txt b/requirements/local.txt index 2e0a579..2a1cd87 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -75,11 +75,11 @@ coreschema==0.0.4 # -r requirements/test.txt # coreapi # drf-yasg -coverage[toml]==7.2.6 +coverage[toml]==7.2.7 # via # -r requirements/test.txt # pytest-cov -cryptography==40.0.2 +cryptography==41.0.1 # via # -r requirements/test.txt # pyjwt @@ -152,7 +152,7 @@ edx-auth-backends==4.1.0 # via -r requirements/test.txt edx-django-release-util==1.2.0 # via -r requirements/test.txt -edx-django-utils==5.4.0 +edx-django-utils==5.5.0 # via -r requirements/test.txt edx-lint==5.3.4 # via -r requirements/test.txt @@ -162,7 +162,7 @@ exceptiongroup==1.1.1 # pytest factory-boy==3.2.1 # via -r requirements/test.txt -faker==18.9.0 +faker==18.10.1 # via # -r requirements/test.txt # factory-boy @@ -207,7 +207,7 @@ lazy-object-proxy==1.9.0 # via # -r requirements/test.txt # astroid -markupsafe==2.1.2 +markupsafe==2.1.3 # via # -r requirements/docs.txt # -r requirements/test.txt @@ -351,7 +351,7 @@ requests-oauthlib==1.3.1 # via # -r requirements/test.txt # social-auth-core -ruamel-yaml==0.17.28 +ruamel-yaml==0.17.31 # via # -r requirements/test.txt # drf-yasg @@ -441,7 +441,7 @@ tomlkit==0.11.8 # via # -r requirements/test.txt # pylint -typing-extensions==4.6.2 +typing-extensions==4.6.3 # via # -r requirements/docs.txt # -r requirements/test.txt diff --git a/requirements/production.txt b/requirements/production.txt index 963e676..f9e9b82 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -10,11 +10,11 @@ asgiref==3.7.2 # django attrs==23.1.0 # via -r requirements/base.txt -boto3==1.26.142 +boto3==1.26.146 # via # -c requirements/constraints.txt # -r requirements/production.in -botocore==1.29.142 +botocore==1.29.146 # via # boto3 # s3transfer @@ -44,7 +44,7 @@ coreschema==0.0.4 # -r requirements/base.txt # coreapi # drf-yasg -cryptography==40.0.2 +cryptography==41.0.1 # via # -r requirements/base.txt # pyjwt @@ -102,7 +102,7 @@ edx-auth-backends==4.1.0 # via -r requirements/base.txt edx-django-release-util==1.2.0 # via -r requirements/base.txt -edx-django-utils==5.4.0 +edx-django-utils==5.5.0 # via -r requirements/base.txt gevent==22.10.2 # via -r requirements/production.in @@ -130,7 +130,7 @@ jmespath==1.0.1 # via # boto3 # botocore -markupsafe==2.1.2 +markupsafe==2.1.3 # via # -r requirements/base.txt # jinja2 @@ -200,7 +200,7 @@ requests-oauthlib==1.3.1 # via # -r requirements/base.txt # social-auth-core -ruamel-yaml==0.17.28 +ruamel-yaml==0.17.31 # via # -r requirements/base.txt # drf-yasg @@ -234,7 +234,7 @@ stevedore==5.1.0 # via # -r requirements/base.txt # edx-django-utils -typing-extensions==4.6.2 +typing-extensions==4.6.3 # via # -r requirements/base.txt # asgiref diff --git a/requirements/test.txt b/requirements/test.txt index c198889..a008b04 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -50,11 +50,11 @@ coreschema==0.0.4 # -r requirements/base.txt # coreapi # drf-yasg -coverage[toml]==7.2.6 +coverage[toml]==7.2.7 # via # -r requirements/test.in # pytest-cov -cryptography==40.0.2 +cryptography==41.0.1 # via # -r requirements/base.txt # pyjwt @@ -117,7 +117,7 @@ edx-auth-backends==4.1.0 # via -r requirements/base.txt edx-django-release-util==1.2.0 # via -r requirements/base.txt -edx-django-utils==5.4.0 +edx-django-utils==5.5.0 # via -r requirements/base.txt edx-lint==5.3.4 # via -r requirements/test.in @@ -125,7 +125,7 @@ exceptiongroup==1.1.1 # via pytest factory-boy==3.2.1 # via -r requirements/test.in -faker==18.9.0 +faker==18.10.1 # via factory-boy idna==3.4 # via @@ -151,7 +151,7 @@ jinja2==3.1.2 # diff-cover lazy-object-proxy==1.9.0 # via astroid -markupsafe==2.1.2 +markupsafe==2.1.3 # via # -r requirements/base.txt # jinja2 @@ -260,7 +260,7 @@ requests-oauthlib==1.3.1 # via # -r requirements/base.txt # social-auth-core -ruamel-yaml==0.17.28 +ruamel-yaml==0.17.31 # via # -r requirements/base.txt # drf-yasg @@ -304,7 +304,7 @@ tomli==2.0.1 # pytest tomlkit==0.11.8 # via pylint -typing-extensions==4.6.2 +typing-extensions==4.6.3 # via # -r requirements/base.txt # asgiref From ee899d24e32df50ef4e0f01299209937ace00ed7 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sun, 11 Jun 2023 20:24:27 -0400 Subject: [PATCH 17/29] chore: Updating Python Requirements --- requirements/local.txt | 6 +++--- requirements/production.txt | 4 ++-- requirements/test.txt | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/requirements/local.txt b/requirements/local.txt index 2a1cd87..71ef9a6 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -91,7 +91,7 @@ defusedxml==0.7.1 # -r requirements/test.txt # python3-openid # social-auth-core -diff-cover==7.5.0 +diff-cover==7.6.0 # via -r requirements/test.txt dill==0.3.6 # via @@ -245,7 +245,7 @@ pbr==5.11.1 # via # -r requirements/test.txt # stevedore -platformdirs==3.5.1 +platformdirs==3.5.3 # via # -r requirements/test.txt # pylint @@ -305,7 +305,7 @@ pynacl==1.5.0 # via # -r requirements/test.txt # edx-django-utils -pytest==7.3.1 +pytest==7.3.2 # via # -r requirements/test.txt # pytest-cov diff --git a/requirements/production.txt b/requirements/production.txt index f9e9b82..0927da6 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -10,11 +10,11 @@ asgiref==3.7.2 # django attrs==23.1.0 # via -r requirements/base.txt -boto3==1.26.146 +boto3==1.26.151 # via # -c requirements/constraints.txt # -r requirements/production.in -botocore==1.29.146 +botocore==1.29.151 # via # boto3 # s3transfer diff --git a/requirements/test.txt b/requirements/test.txt index a008b04..62c16fe 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -66,7 +66,7 @@ defusedxml==0.7.1 # -r requirements/base.txt # python3-openid # social-auth-core -diff-cover==7.5.0 +diff-cover==7.6.0 # via -r requirements/test.in dill==0.3.6 # via pylint @@ -181,7 +181,7 @@ pbr==5.11.1 # via # -r requirements/base.txt # stevedore -platformdirs==3.5.1 +platformdirs==3.5.3 # via pylint pluggy==1.0.0 # via @@ -222,7 +222,7 @@ pynacl==1.5.0 # via # -r requirements/base.txt # edx-django-utils -pytest==7.3.1 +pytest==7.3.2 # via # -r requirements/test.in # pytest-cov From d65ecd865ce88b0abd01f54885be446209abd6b0 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sun, 18 Jun 2023 20:23:30 -0400 Subject: [PATCH 18/29] chore: Updating Python Requirements --- requirements/base.txt | 27 +++++--------------------- requirements/docs.txt | 2 +- requirements/local.txt | 31 ++++-------------------------- requirements/production.txt | 38 ++++--------------------------------- requirements/test.txt | 34 ++++----------------------------- 5 files changed, 18 insertions(+), 114 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 6c39c3e..1f3995e 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -18,12 +18,6 @@ charset-normalizer==3.1.0 # via requests click==8.1.3 # via edx-django-utils -coreapi==2.3.3 - # via drf-yasg -coreschema==0.0.4 - # via - # coreapi - # drf-yasg cryptography==41.0.1 # via # pyjwt @@ -65,7 +59,7 @@ djangorestframework==3.14.0 # edx-api-doc-tools drf-nested-routers==0.93.4 # via -r requirements/base.in -drf-yasg==1.21.5 +drf-yasg==1.21.6 # via edx-api-doc-tools edx-api-doc-tools==1.6.0 # via -r requirements/base.in @@ -79,12 +73,6 @@ idna==3.4 # via requests inflection==0.5.1 # via drf-yasg -itypes==1.2.0 - # via coreapi -jinja2==3.1.2 - # via coreschema -markupsafe==2.1.3 - # via jinja2 mysqlclient==2.1.1 # via -r requirements/base.in newrelic==8.8.0 @@ -116,18 +104,15 @@ pytz==2023.3 # djangorestframework # drf-yasg pyyaml==6.0 - # via edx-django-release-util + # via + # drf-yasg + # edx-django-release-util requests==2.31.0 # via - # coreapi # requests-oauthlib # social-auth-core requests-oauthlib==1.3.1 # via social-auth-core -ruamel-yaml==0.17.31 - # via drf-yasg -ruamel-yaml-clib==0.2.7 - # via ruamel-yaml six==1.16.0 # via # edx-auth-backends @@ -147,9 +132,7 @@ stevedore==5.1.0 typing-extensions==4.6.3 # via asgiref uritemplate==4.1.1 - # via - # coreapi - # drf-yasg + # via drf-yasg urllib3==1.26.16 # via # -c requirements/constraints.txt diff --git a/requirements/docs.txt b/requirements/docs.txt index 164e98c..16676a9 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -26,7 +26,7 @@ idna==3.4 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==6.6.0 +importlib-metadata==6.7.0 # via sphinx jinja2==3.1.2 # via sphinx diff --git a/requirements/local.txt b/requirements/local.txt index 71ef9a6..8043df5 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -66,15 +66,6 @@ code-annotations==1.3.0 # via # -r requirements/test.txt # edx-lint -coreapi==2.3.3 - # via - # -r requirements/test.txt - # drf-yasg -coreschema==0.0.4 - # via - # -r requirements/test.txt - # coreapi - # drf-yasg coverage[toml]==7.2.7 # via # -r requirements/test.txt @@ -142,7 +133,7 @@ docutils==0.19 # sphinx drf-nested-routers==0.93.4 # via -r requirements/test.txt -drf-yasg==1.21.5 +drf-yasg==1.21.6 # via # -r requirements/test.txt # edx-api-doc-tools @@ -175,7 +166,7 @@ imagesize==1.4.1 # via # -r requirements/docs.txt # sphinx -importlib-metadata==6.6.0 +importlib-metadata==6.7.0 # via # -r requirements/docs.txt # sphinx @@ -191,16 +182,11 @@ isort==5.12.0 # via # -r requirements/test.txt # pylint -itypes==1.2.0 - # via - # -r requirements/test.txt - # coreapi jinja2==3.1.2 # via # -r requirements/docs.txt # -r requirements/test.txt # code-annotations - # coreschema # diff-cover # sphinx lazy-object-proxy==1.9.0 @@ -245,7 +231,7 @@ pbr==5.11.1 # via # -r requirements/test.txt # stevedore -platformdirs==3.5.3 +platformdirs==3.6.0 # via # -r requirements/test.txt # pylint @@ -338,12 +324,12 @@ pyyaml==6.0 # via # -r requirements/test.txt # code-annotations + # drf-yasg # edx-django-release-util requests==2.31.0 # via # -r requirements/docs.txt # -r requirements/test.txt - # coreapi # requests-oauthlib # social-auth-core # sphinx @@ -351,14 +337,6 @@ requests-oauthlib==1.3.1 # via # -r requirements/test.txt # social-auth-core -ruamel-yaml==0.17.31 - # via - # -r requirements/test.txt - # drf-yasg -ruamel-yaml-clib==0.2.7 - # via - # -r requirements/test.txt - # ruamel-yaml six==1.16.0 # via # -r requirements/test.txt @@ -453,7 +431,6 @@ typing-extensions==4.6.3 uritemplate==4.1.1 # via # -r requirements/test.txt - # coreapi # drf-yasg urllib3==1.26.16 # via diff --git a/requirements/production.txt b/requirements/production.txt index 0927da6..8f4e8d8 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -10,11 +10,11 @@ asgiref==3.7.2 # django attrs==23.1.0 # via -r requirements/base.txt -boto3==1.26.151 +boto3==1.26.155 # via # -c requirements/constraints.txt # -r requirements/production.in -botocore==1.29.151 +botocore==1.29.155 # via # boto3 # s3transfer @@ -35,15 +35,6 @@ click==8.1.3 # via # -r requirements/base.txt # edx-django-utils -coreapi==2.3.3 - # via - # -r requirements/base.txt - # drf-yasg -coreschema==0.0.4 - # via - # -r requirements/base.txt - # coreapi - # drf-yasg cryptography==41.0.1 # via # -r requirements/base.txt @@ -92,7 +83,7 @@ djangorestframework==3.14.0 # edx-api-doc-tools drf-nested-routers==0.93.4 # via -r requirements/base.txt -drf-yasg==1.21.5 +drf-yasg==1.21.6 # via # -r requirements/base.txt # edx-api-doc-tools @@ -118,22 +109,10 @@ inflection==0.5.1 # via # -r requirements/base.txt # drf-yasg -itypes==1.2.0 - # via - # -r requirements/base.txt - # coreapi -jinja2==3.1.2 - # via - # -r requirements/base.txt - # coreschema jmespath==1.0.1 # via # boto3 # botocore -markupsafe==2.1.3 - # via - # -r requirements/base.txt - # jinja2 mysqlclient==2.1.1 # via -r requirements/base.txt newrelic==8.8.0 @@ -189,25 +168,17 @@ pyyaml==6.0 # via # -r requirements/base.txt # -r requirements/production.in + # drf-yasg # edx-django-release-util requests==2.31.0 # via # -r requirements/base.txt - # coreapi # requests-oauthlib # social-auth-core requests-oauthlib==1.3.1 # via # -r requirements/base.txt # social-auth-core -ruamel-yaml==0.17.31 - # via - # -r requirements/base.txt - # drf-yasg -ruamel-yaml-clib==0.2.7 - # via - # -r requirements/base.txt - # ruamel-yaml s3transfer==0.6.1 # via boto3 six==1.16.0 @@ -241,7 +212,6 @@ typing-extensions==4.6.3 uritemplate==4.1.1 # via # -r requirements/base.txt - # coreapi # drf-yasg urllib3==1.26.16 # via diff --git a/requirements/test.txt b/requirements/test.txt index 62c16fe..dae7357 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -41,15 +41,6 @@ click-log==0.4.0 # via edx-lint code-annotations==1.3.0 # via edx-lint -coreapi==2.3.3 - # via - # -r requirements/base.txt - # drf-yasg -coreschema==0.0.4 - # via - # -r requirements/base.txt - # coreapi - # drf-yasg coverage[toml]==7.2.7 # via # -r requirements/test.in @@ -107,7 +98,7 @@ djangorestframework==3.14.0 # edx-api-doc-tools drf-nested-routers==0.93.4 # via -r requirements/base.txt -drf-yasg==1.21.5 +drf-yasg==1.21.6 # via # -r requirements/base.txt # edx-api-doc-tools @@ -139,22 +130,14 @@ iniconfig==2.0.0 # via pytest isort==5.12.0 # via pylint -itypes==1.2.0 - # via - # -r requirements/base.txt - # coreapi jinja2==3.1.2 # via - # -r requirements/base.txt # code-annotations - # coreschema # diff-cover lazy-object-proxy==1.9.0 # via astroid markupsafe==2.1.3 - # via - # -r requirements/base.txt - # jinja2 + # via jinja2 mccabe==0.7.0 # via pylint mypy==1.3.0 @@ -181,7 +164,7 @@ pbr==5.11.1 # via # -r requirements/base.txt # stevedore -platformdirs==3.5.3 +platformdirs==3.6.0 # via pylint pluggy==1.0.0 # via @@ -249,25 +232,17 @@ pyyaml==6.0 # via # -r requirements/base.txt # code-annotations + # drf-yasg # edx-django-release-util requests==2.31.0 # via # -r requirements/base.txt - # coreapi # requests-oauthlib # social-auth-core requests-oauthlib==1.3.1 # via # -r requirements/base.txt # social-auth-core -ruamel-yaml==0.17.31 - # via - # -r requirements/base.txt - # drf-yasg -ruamel-yaml-clib==0.2.7 - # via - # -r requirements/base.txt - # ruamel-yaml six==1.16.0 # via # -r requirements/base.txt @@ -314,7 +289,6 @@ typing-extensions==4.6.3 uritemplate==4.1.1 # via # -r requirements/base.txt - # coreapi # drf-yasg urllib3==1.26.16 # via From 1d19682cc845a0dab00f0ec01581879e400c99a0 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sun, 25 Jun 2023 20:25:03 -0400 Subject: [PATCH 19/29] chore: Updating Python Requirements --- requirements/base.txt | 2 +- requirements/common_constraints.txt | 5 ----- requirements/docs.txt | 3 +-- requirements/local.txt | 15 +++++++-------- requirements/pip.txt | 2 +- requirements/production.txt | 8 ++++---- requirements/test.txt | 12 ++++++------ 7 files changed, 20 insertions(+), 27 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 1f3995e..f6994b5 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -73,7 +73,7 @@ idna==3.4 # via requests inflection==0.5.1 # via drf-yasg -mysqlclient==2.1.1 +mysqlclient==2.2.0 # via -r requirements/base.in newrelic==8.8.0 # via edx-django-utils diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 7e39123..afe6aa8 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -25,8 +25,3 @@ django-simple-history==3.0.0 # tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos. # Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810 tox<4.0.0 - -# edx-sphinx-theme is not compatible with latest Sphinx==6.0.0 version -# Pinning Sphinx version unless the compatibility issue gets resolved -# For details, see issue https://github.com/openedx/edx-sphinx-theme/issues/197 -sphinx<6.0.0 diff --git a/requirements/docs.txt b/requirements/docs.txt index 16676a9..0a12e38 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -51,9 +51,8 @@ snowballstemmer==2.2.0 # via sphinx soupsieve==2.4.1 # via beautifulsoup4 -sphinx==5.3.0 +sphinx==6.2.1 # via - # -c requirements/common_constraints.txt # -r requirements/docs.in # pydata-sphinx-theme # sphinx-book-theme diff --git a/requirements/local.txt b/requirements/local.txt index 8043df5..bf58270 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -153,7 +153,7 @@ exceptiongroup==1.1.1 # pytest factory-boy==3.2.1 # via -r requirements/test.txt -faker==18.10.1 +faker==18.11.1 # via # -r requirements/test.txt # factory-boy @@ -202,13 +202,13 @@ mccabe==0.7.0 # via # -r requirements/test.txt # pylint -mypy==1.3.0 +mypy==1.4.1 # via -r requirements/test.txt mypy-extensions==1.0.0 # via # -r requirements/test.txt # mypy -mysqlclient==2.1.1 +mysqlclient==2.2.0 # via -r requirements/test.txt newrelic==8.8.0 # via @@ -231,11 +231,11 @@ pbr==5.11.1 # via # -r requirements/test.txt # stevedore -platformdirs==3.6.0 +platformdirs==3.8.0 # via # -r requirements/test.txt # pylint -pluggy==1.0.0 +pluggy==1.2.0 # via # -r requirements/test.txt # diff-cover @@ -291,7 +291,7 @@ pynacl==1.5.0 # via # -r requirements/test.txt # edx-django-utils -pytest==7.3.2 +pytest==7.4.0 # via # -r requirements/test.txt # pytest-cov @@ -362,9 +362,8 @@ soupsieve==2.4.1 # via # -r requirements/docs.txt # beautifulsoup4 -sphinx==5.3.0 +sphinx==6.2.1 # via - # -c requirements/common_constraints.txt # -r requirements/docs.txt # pydata-sphinx-theme # sphinx-book-theme diff --git a/requirements/pip.txt b/requirements/pip.txt index 5a5ce22..fa19e6f 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -10,5 +10,5 @@ wheel==0.40.0 # The following packages are considered to be unsafe in a requirements file: pip==23.1.2 # via -r requirements/pip.in -setuptools==67.8.0 +setuptools==68.0.0 # via -r requirements/pip.in diff --git a/requirements/production.txt b/requirements/production.txt index 8f4e8d8..a56fe98 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -10,11 +10,11 @@ asgiref==3.7.2 # django attrs==23.1.0 # via -r requirements/base.txt -boto3==1.26.155 +boto3==1.26.160 # via # -c requirements/constraints.txt # -r requirements/production.in -botocore==1.29.155 +botocore==1.29.160 # via # boto3 # s3transfer @@ -113,7 +113,7 @@ jmespath==1.0.1 # via # boto3 # botocore -mysqlclient==2.1.1 +mysqlclient==2.2.0 # via -r requirements/base.txt newrelic==8.8.0 # via @@ -219,7 +219,7 @@ urllib3==1.26.16 # -r requirements/base.txt # botocore # requests -zope-event==4.6 +zope-event==5.0 # via gevent zope-interface==6.0 # via gevent diff --git a/requirements/test.txt b/requirements/test.txt index dae7357..ad15b99 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -116,7 +116,7 @@ exceptiongroup==1.1.1 # via pytest factory-boy==3.2.1 # via -r requirements/test.in -faker==18.10.1 +faker==18.11.1 # via factory-boy idna==3.4 # via @@ -140,11 +140,11 @@ markupsafe==2.1.3 # via jinja2 mccabe==0.7.0 # via pylint -mypy==1.3.0 +mypy==1.4.1 # via -r requirements/test.in mypy-extensions==1.0.0 # via mypy -mysqlclient==2.1.1 +mysqlclient==2.2.0 # via -r requirements/base.txt newrelic==8.8.0 # via @@ -164,9 +164,9 @@ pbr==5.11.1 # via # -r requirements/base.txt # stevedore -platformdirs==3.6.0 +platformdirs==3.8.0 # via pylint -pluggy==1.0.0 +pluggy==1.2.0 # via # diff-cover # pytest @@ -205,7 +205,7 @@ pynacl==1.5.0 # via # -r requirements/base.txt # edx-django-utils -pytest==7.3.2 +pytest==7.4.0 # via # -r requirements/test.in # pytest-cov From fe49557b03e2a67f1be38a5c81d96af87b1e9e7d Mon Sep 17 00:00:00 2001 From: connorhaugh <49422820+connorhaugh@users.noreply.github.com> Date: Thu, 29 Jun 2023 10:17:24 -0400 Subject: [PATCH 20/29] feat: add no-request uri fallback (#265) * feat: add no-request uri fallback * fix: lint * fix: lint fix --- blockstore/apps/api/methods.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/blockstore/apps/api/methods.py b/blockstore/apps/api/methods.py index 616aa1d..34c83dd 100644 --- a/blockstore/apps/api/methods.py +++ b/blockstore/apps/api/methods.py @@ -6,6 +6,7 @@ import re from crum import get_current_request +from django.conf import settings from django.db.models import Q from rest_framework import serializers @@ -485,6 +486,11 @@ def _build_absolute_uri(url): Build an absolute URI from the given url, using the CRUM middleware's stored request. """ request = get_current_request() + if not request: # this method can be called from internal python apis. In that case, return a simple uri. + if url.startswith('https://'): + return url + return settings.LMS_ROOT_URL + url + return request.build_absolute_uri(url) From 73c073c2e150ef684d62dbd52bb600eb598fc65c Mon Sep 17 00:00:00 2001 From: connorhaugh <49422820+connorhaugh@users.noreply.github.com> Date: Thu, 29 Jun 2023 10:17:33 -0400 Subject: [PATCH 21/29] Update README.rst (#260) --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index d8307d3..6d623a8 100644 --- a/README.rst +++ b/README.rst @@ -138,7 +138,7 @@ You're probably also going to want to create a collection and organization for u .. code:: # Create a "Collection" that new content libraries / xblocks can be created within: - docker exec -t edx.devstack.lms bash -c "source ~/.bashrc && echo \"from blockstore.apps.bundles.models import Collection; coll, _ = Collection.objects.get_or_create(title='Devstack Content Collection', uuid='11111111-2111-4111-8111-111111111111')\" | ./manage.py shell" + docker exec -t edx.devstack.lms bash -c "source ~/.bashrc && echo \"from blockstore.apps.bundles.models import Collection; coll, _ = Collection.objects.get_or_create(title='Devstack Content Collection', uuid='11111111-2111-4111-8111-111111111111')\" | ./manage.py lms shell" # Create an "Organization": docker exec -t edx.devstack.lms bash -c "source /edx/app/edxapp/edxapp_env && echo \"from organizations.models import Organization; Organization.objects.get_or_create(short_name='DeveloperInc', defaults={'name': 'DeveloperInc', 'active': True})\" | python /edx/app/edxapp/edx-platform/manage.py lms shell" From adf82d23338c4c6eec0eb13e3d3cd30af526a324 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Tue, 4 Jul 2023 12:13:22 -0400 Subject: [PATCH 22/29] chore: Django Security Patch 3.2.20 Upgrade --- requirements/base.txt | 6 +++--- requirements/docs.txt | 2 +- requirements/local.txt | 10 +++++----- requirements/pip-tools.txt | 6 ++++-- requirements/production.txt | 10 +++++----- requirements/test.txt | 10 +++++----- 6 files changed, 23 insertions(+), 21 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index f6994b5..a11541c 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -26,7 +26,7 @@ defusedxml==0.7.1 # via # python3-openid # social-auth-core -django==3.2.19 +django==3.2.20 # via # -c requirements/common_constraints.txt # -c requirements/constraints.txt @@ -75,7 +75,7 @@ inflection==0.5.1 # via drf-yasg mysqlclient==2.2.0 # via -r requirements/base.in -newrelic==8.8.0 +newrelic==8.8.1 # via edx-django-utils oauthlib==3.2.2 # via @@ -129,7 +129,7 @@ sqlparse==0.4.4 # django stevedore==5.1.0 # via edx-django-utils -typing-extensions==4.6.3 +typing-extensions==4.7.1 # via asgiref uritemplate==4.1.1 # via drf-yasg diff --git a/requirements/docs.txt b/requirements/docs.txt index 0a12e38..df5f110 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -70,7 +70,7 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx -typing-extensions==4.6.3 +typing-extensions==4.7.1 # via pydata-sphinx-theme urllib3==1.26.16 # via diff --git a/requirements/local.txt b/requirements/local.txt index bf58270..0a60b69 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -88,7 +88,7 @@ dill==0.3.6 # via # -r requirements/test.txt # pylint -django==3.2.19 +django==3.2.20 # via # -c requirements/common_constraints.txt # -c requirements/constraints.txt @@ -147,13 +147,13 @@ edx-django-utils==5.5.0 # via -r requirements/test.txt edx-lint==5.3.4 # via -r requirements/test.txt -exceptiongroup==1.1.1 +exceptiongroup==1.1.2 # via # -r requirements/test.txt # pytest factory-boy==3.2.1 # via -r requirements/test.txt -faker==18.11.1 +faker==18.11.2 # via # -r requirements/test.txt # factory-boy @@ -210,7 +210,7 @@ mypy-extensions==1.0.0 # mypy mysqlclient==2.2.0 # via -r requirements/test.txt -newrelic==8.8.0 +newrelic==8.8.1 # via # -r requirements/test.txt # edx-django-utils @@ -418,7 +418,7 @@ tomlkit==0.11.8 # via # -r requirements/test.txt # pylint -typing-extensions==4.6.3 +typing-extensions==4.7.1 # via # -r requirements/docs.txt # -r requirements/test.txt diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index fd0cc1c..ce90930 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -10,12 +10,14 @@ click==8.1.3 # via pip-tools packaging==23.1 # via build -pip-tools==6.13.0 +pip-tools==6.14.0 # via -r requirements/pip-tools.in pyproject-hooks==1.0.0 # via build tomli==2.0.1 - # via build + # via + # build + # pip-tools wheel==0.40.0 # via pip-tools diff --git a/requirements/production.txt b/requirements/production.txt index a56fe98..f3ca5bd 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -10,11 +10,11 @@ asgiref==3.7.2 # django attrs==23.1.0 # via -r requirements/base.txt -boto3==1.26.160 +boto3==1.27.0 # via # -c requirements/constraints.txt # -r requirements/production.in -botocore==1.29.160 +botocore==1.30.0 # via # boto3 # s3transfer @@ -45,7 +45,7 @@ defusedxml==0.7.1 # -r requirements/base.txt # python3-openid # social-auth-core -django==3.2.19 +django==3.2.20 # via # -c requirements/common_constraints.txt # -c requirements/constraints.txt @@ -115,7 +115,7 @@ jmespath==1.0.1 # botocore mysqlclient==2.2.0 # via -r requirements/base.txt -newrelic==8.8.0 +newrelic==8.8.1 # via # -r requirements/base.txt # -r requirements/production.in @@ -205,7 +205,7 @@ stevedore==5.1.0 # via # -r requirements/base.txt # edx-django-utils -typing-extensions==4.6.3 +typing-extensions==4.7.1 # via # -r requirements/base.txt # asgiref diff --git a/requirements/test.txt b/requirements/test.txt index ad15b99..d3b2e01 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -61,7 +61,7 @@ diff-cover==7.6.0 # via -r requirements/test.in dill==0.3.6 # via pylint -django==3.2.19 +django==3.2.20 # via # -c requirements/common_constraints.txt # -c requirements/constraints.txt @@ -112,11 +112,11 @@ edx-django-utils==5.5.0 # via -r requirements/base.txt edx-lint==5.3.4 # via -r requirements/test.in -exceptiongroup==1.1.1 +exceptiongroup==1.1.2 # via pytest factory-boy==3.2.1 # via -r requirements/test.in -faker==18.11.1 +faker==18.11.2 # via factory-boy idna==3.4 # via @@ -146,7 +146,7 @@ mypy-extensions==1.0.0 # via mypy mysqlclient==2.2.0 # via -r requirements/base.txt -newrelic==8.8.0 +newrelic==8.8.1 # via # -r requirements/base.txt # edx-django-utils @@ -279,7 +279,7 @@ tomli==2.0.1 # pytest tomlkit==0.11.8 # via pylint -typing-extensions==4.6.3 +typing-extensions==4.7.1 # via # -r requirements/base.txt # asgiref From 552a198f6aa9f9fdac6b642fafce67b85c6781a2 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sun, 9 Jul 2023 20:26:06 -0400 Subject: [PATCH 23/29] chore: Updating Python Requirements --- requirements/base.txt | 4 ++-- requirements/docs.txt | 6 +++--- requirements/local.txt | 14 +++++++------- requirements/pip-tools.txt | 2 +- requirements/production.txt | 8 ++++---- requirements/test.txt | 10 +++++----- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index a11541c..8bfc3dd 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -14,9 +14,9 @@ cffi==1.15.1 # via # cryptography # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via requests -click==8.1.3 +click==8.1.4 # via edx-django-utils cryptography==41.0.1 # via diff --git a/requirements/docs.txt b/requirements/docs.txt index df5f110..b838969 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -16,7 +16,7 @@ beautifulsoup4==4.12.2 # via pydata-sphinx-theme certifi==2023.5.7 # via requests -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via requests docutils==0.19 # via @@ -26,7 +26,7 @@ idna==3.4 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==6.7.0 +importlib-metadata==6.8.0 # via sphinx jinja2==3.1.2 # via sphinx @@ -76,5 +76,5 @@ urllib3==1.26.16 # via # -c requirements/constraints.txt # requests -zipp==3.15.0 +zipp==3.16.0 # via importlib-metadata diff --git a/requirements/local.txt b/requirements/local.txt index 0a60b69..4d13f1a 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -16,7 +16,7 @@ asgiref==3.7.2 # via # -r requirements/test.txt # django -astroid==2.15.5 +astroid==2.15.6 # via # -r requirements/test.txt # pylint @@ -46,12 +46,12 @@ chardet==5.1.0 # via # -r requirements/test.txt # diff-cover -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via # -r requirements/docs.txt # -r requirements/test.txt # requests -click==8.1.3 +click==8.1.4 # via # -r requirements/test.txt # click-log @@ -153,7 +153,7 @@ exceptiongroup==1.1.2 # pytest factory-boy==3.2.1 # via -r requirements/test.txt -faker==18.11.2 +faker==18.13.0 # via # -r requirements/test.txt # factory-boy @@ -166,7 +166,7 @@ imagesize==1.4.1 # via # -r requirements/docs.txt # sphinx -importlib-metadata==6.7.0 +importlib-metadata==6.8.0 # via # -r requirements/docs.txt # sphinx @@ -231,7 +231,7 @@ pbr==5.11.1 # via # -r requirements/test.txt # stevedore -platformdirs==3.8.0 +platformdirs==3.8.1 # via # -r requirements/test.txt # pylint @@ -441,7 +441,7 @@ wrapt==1.15.0 # via # -r requirements/test.txt # astroid -zipp==3.15.0 +zipp==3.16.0 # via # -r requirements/docs.txt # importlib-metadata diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index ce90930..69a70b0 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -6,7 +6,7 @@ # build==0.10.0 # via pip-tools -click==8.1.3 +click==8.1.4 # via pip-tools packaging==23.1 # via build diff --git a/requirements/production.txt b/requirements/production.txt index f3ca5bd..6b3a36c 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -10,11 +10,11 @@ asgiref==3.7.2 # django attrs==23.1.0 # via -r requirements/base.txt -boto3==1.27.0 +boto3==1.28.1 # via # -c requirements/constraints.txt # -r requirements/production.in -botocore==1.30.0 +botocore==1.31.1 # via # boto3 # s3transfer @@ -27,11 +27,11 @@ cffi==1.15.1 # -r requirements/base.txt # cryptography # pynacl -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via # -r requirements/base.txt # requests -click==8.1.3 +click==8.1.4 # via # -r requirements/base.txt # edx-django-utils diff --git a/requirements/test.txt b/requirements/test.txt index d3b2e01..3a9467c 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -8,7 +8,7 @@ asgiref==3.7.2 # via # -r requirements/base.txt # django -astroid==2.15.5 +astroid==2.15.6 # via # -r requirements/test.in # pylint @@ -26,11 +26,11 @@ cffi==1.15.1 # pynacl chardet==5.1.0 # via diff-cover -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via # -r requirements/base.txt # requests -click==8.1.3 +click==8.1.4 # via # -r requirements/base.txt # click-log @@ -116,7 +116,7 @@ exceptiongroup==1.1.2 # via pytest factory-boy==3.2.1 # via -r requirements/test.in -faker==18.11.2 +faker==18.13.0 # via factory-boy idna==3.4 # via @@ -164,7 +164,7 @@ pbr==5.11.1 # via # -r requirements/base.txt # stevedore -platformdirs==3.8.0 +platformdirs==3.8.1 # via pylint pluggy==1.2.0 # via From 08a4ed5a037b3f31cadc89a6a6939ffa67eb82d1 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sun, 16 Jul 2023 20:26:31 -0400 Subject: [PATCH 24/29] chore: Updating Python Requirements --- requirements/base.txt | 4 ++-- requirements/docs.txt | 2 +- requirements/local.txt | 13 +++++++------ requirements/pip-tools.txt | 4 ++-- requirements/pip.txt | 2 +- requirements/production.txt | 10 +++++----- requirements/test.txt | 11 ++++++----- 7 files changed, 24 insertions(+), 22 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 8bfc3dd..3532cf6 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -16,9 +16,9 @@ cffi==1.15.1 # pynacl charset-normalizer==3.2.0 # via requests -click==8.1.4 +click==8.1.5 # via edx-django-utils -cryptography==41.0.1 +cryptography==41.0.2 # via # pyjwt # social-auth-core diff --git a/requirements/docs.txt b/requirements/docs.txt index b838969..ae727ea 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -76,5 +76,5 @@ urllib3==1.26.16 # via # -c requirements/constraints.txt # requests -zipp==3.16.0 +zipp==3.16.2 # via importlib-metadata diff --git a/requirements/local.txt b/requirements/local.txt index 4d13f1a..4c9e593 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -51,7 +51,7 @@ charset-normalizer==3.2.0 # -r requirements/docs.txt # -r requirements/test.txt # requests -click==8.1.4 +click==8.1.5 # via # -r requirements/test.txt # click-log @@ -70,7 +70,7 @@ coverage[toml]==7.2.7 # via # -r requirements/test.txt # pytest-cov -cryptography==41.0.1 +cryptography==41.0.2 # via # -r requirements/test.txt # pyjwt @@ -82,7 +82,7 @@ defusedxml==0.7.1 # -r requirements/test.txt # python3-openid # social-auth-core -diff-cover==7.6.0 +diff-cover==7.7.0 # via -r requirements/test.txt dill==0.3.6 # via @@ -153,7 +153,7 @@ exceptiongroup==1.1.2 # pytest factory-boy==3.2.1 # via -r requirements/test.txt -faker==18.13.0 +faker==19.1.0 # via # -r requirements/test.txt # factory-boy @@ -231,7 +231,7 @@ pbr==5.11.1 # via # -r requirements/test.txt # stevedore -platformdirs==3.8.1 +platformdirs==3.9.1 # via # -r requirements/test.txt # pylint @@ -424,6 +424,7 @@ typing-extensions==4.7.1 # -r requirements/test.txt # asgiref # astroid + # faker # mypy # pydata-sphinx-theme # pylint @@ -441,7 +442,7 @@ wrapt==1.15.0 # via # -r requirements/test.txt # astroid -zipp==3.16.0 +zipp==3.16.2 # via # -r requirements/docs.txt # importlib-metadata diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 69a70b0..5a27e2a 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -6,11 +6,11 @@ # build==0.10.0 # via pip-tools -click==8.1.4 +click==8.1.5 # via pip-tools packaging==23.1 # via build -pip-tools==6.14.0 +pip-tools==7.0.0 # via -r requirements/pip-tools.in pyproject-hooks==1.0.0 # via build diff --git a/requirements/pip.txt b/requirements/pip.txt index fa19e6f..bd9fb55 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -8,7 +8,7 @@ wheel==0.40.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==23.1.2 +pip==23.2 # via -r requirements/pip.in setuptools==68.0.0 # via -r requirements/pip.in diff --git a/requirements/production.txt b/requirements/production.txt index 6b3a36c..bb72434 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -10,11 +10,11 @@ asgiref==3.7.2 # django attrs==23.1.0 # via -r requirements/base.txt -boto3==1.28.1 +boto3==1.28.3 # via # -c requirements/constraints.txt # -r requirements/production.in -botocore==1.31.1 +botocore==1.31.3 # via # boto3 # s3transfer @@ -31,11 +31,11 @@ charset-normalizer==3.2.0 # via # -r requirements/base.txt # requests -click==8.1.4 +click==8.1.5 # via # -r requirements/base.txt # edx-django-utils -cryptography==41.0.1 +cryptography==41.0.2 # via # -r requirements/base.txt # pyjwt @@ -95,7 +95,7 @@ edx-django-release-util==1.2.0 # via -r requirements/base.txt edx-django-utils==5.5.0 # via -r requirements/base.txt -gevent==22.10.2 +gevent==23.7.0 # via -r requirements/production.in greenlet==2.0.2 # via gevent diff --git a/requirements/test.txt b/requirements/test.txt index 3a9467c..8433a77 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -30,7 +30,7 @@ charset-normalizer==3.2.0 # via # -r requirements/base.txt # requests -click==8.1.4 +click==8.1.5 # via # -r requirements/base.txt # click-log @@ -45,7 +45,7 @@ coverage[toml]==7.2.7 # via # -r requirements/test.in # pytest-cov -cryptography==41.0.1 +cryptography==41.0.2 # via # -r requirements/base.txt # pyjwt @@ -57,7 +57,7 @@ defusedxml==0.7.1 # -r requirements/base.txt # python3-openid # social-auth-core -diff-cover==7.6.0 +diff-cover==7.7.0 # via -r requirements/test.in dill==0.3.6 # via pylint @@ -116,7 +116,7 @@ exceptiongroup==1.1.2 # via pytest factory-boy==3.2.1 # via -r requirements/test.in -faker==18.13.0 +faker==19.1.0 # via factory-boy idna==3.4 # via @@ -164,7 +164,7 @@ pbr==5.11.1 # via # -r requirements/base.txt # stevedore -platformdirs==3.8.1 +platformdirs==3.9.1 # via pylint pluggy==1.2.0 # via @@ -284,6 +284,7 @@ typing-extensions==4.7.1 # -r requirements/base.txt # asgiref # astroid + # faker # mypy # pylint uritemplate==4.1.1 From dd447914014bcd1e9c4e6ddbc557996f58637f75 Mon Sep 17 00:00:00 2001 From: Agrendalath Date: Mon, 17 Jul 2023 10:49:18 +0200 Subject: [PATCH 25/29] chore: Updating Python Requirements 08a4ed5 changed the default resolver in pip-tools, so there is a minor change in the dependency tree. --- requirements/pip-tools.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 5a27e2a..81f46a7 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -18,6 +18,7 @@ tomli==2.0.1 # via # build # pip-tools + # pyproject-hooks wheel==0.40.0 # via pip-tools From 5328b5c38936f92831692fb9e8374ec875f06606 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Thu, 3 Aug 2023 07:49:33 -0400 Subject: [PATCH 26/29] chore: Updating Python Requirements --- requirements/base.txt | 23 +++++++++++---------- requirements/docs.txt | 2 +- requirements/local.txt | 41 +++++++++++++++++++------------------ requirements/pip-tools.txt | 6 +++--- requirements/pip.txt | 4 ++-- requirements/production.txt | 30 ++++++++++++++------------- requirements/test.txt | 41 +++++++++++++++++++------------------ 7 files changed, 76 insertions(+), 71 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 3532cf6..b1709ef 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,7 +8,7 @@ asgiref==3.7.2 # via django attrs==23.1.0 # via -r requirements/base.in -certifi==2023.5.7 +certifi==2023.7.22 # via requests cffi==1.15.1 # via @@ -16,9 +16,9 @@ cffi==1.15.1 # pynacl charset-normalizer==3.2.0 # via requests -click==8.1.5 +click==8.1.6 # via edx-django-utils -cryptography==41.0.2 +cryptography==41.0.3 # via # pyjwt # social-auth-core @@ -33,6 +33,7 @@ django==3.2.20 # -r requirements/base.in # django-crum # django-filter + # django-waffle # djangorestframework # drf-nested-routers # drf-yasg @@ -47,7 +48,7 @@ django-environ==0.10.0 # via -r requirements/base.in django-filter==23.2 # via -r requirements/base.in -django-waffle==3.0.0 +django-waffle==4.0.0 # via # -r requirements/base.in # edx-django-utils @@ -59,15 +60,15 @@ djangorestframework==3.14.0 # edx-api-doc-tools drf-nested-routers==0.93.4 # via -r requirements/base.in -drf-yasg==1.21.6 +drf-yasg==1.21.7 # via edx-api-doc-tools -edx-api-doc-tools==1.6.0 +edx-api-doc-tools==1.7.0 # via -r requirements/base.in edx-auth-backends==4.1.0 # 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 -r requirements/base.in idna==3.4 # via requests @@ -75,7 +76,7 @@ inflection==0.5.1 # via drf-yasg 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 @@ -89,7 +90,7 @@ psutil==5.9.5 # via edx-django-utils pycparser==2.21 # via cffi -pyjwt[crypto]==2.7.0 +pyjwt[crypto]==2.8.0 # via # edx-auth-backends # social-auth-core @@ -103,7 +104,7 @@ pytz==2023.3 # django # djangorestframework # drf-yasg -pyyaml==6.0 +pyyaml==6.0.1 # via # drf-yasg # edx-django-release-util diff --git a/requirements/docs.txt b/requirements/docs.txt index ae727ea..89e8e6b 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -14,7 +14,7 @@ babel==2.12.1 # sphinx beautifulsoup4==4.12.2 # via pydata-sphinx-theme -certifi==2023.5.7 +certifi==2023.7.22 # via requests charset-normalizer==3.2.0 # via requests diff --git a/requirements/local.txt b/requirements/local.txt index 4c9e593..74c207b 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -32,7 +32,7 @@ beautifulsoup4==4.12.2 # via # -r requirements/docs.txt # pydata-sphinx-theme -certifi==2023.5.7 +certifi==2023.7.22 # via # -r requirements/docs.txt # -r requirements/test.txt @@ -42,7 +42,7 @@ cffi==1.15.1 # -r requirements/test.txt # cryptography # pynacl -chardet==5.1.0 +chardet==5.2.0 # via # -r requirements/test.txt # diff-cover @@ -51,7 +51,7 @@ charset-normalizer==3.2.0 # -r requirements/docs.txt # -r requirements/test.txt # requests -click==8.1.5 +click==8.1.6 # via # -r requirements/test.txt # click-log @@ -62,7 +62,7 @@ click-log==0.4.0 # via # -r requirements/test.txt # edx-lint -code-annotations==1.3.0 +code-annotations==1.5.0 # via # -r requirements/test.txt # edx-lint @@ -70,7 +70,7 @@ coverage[toml]==7.2.7 # via # -r requirements/test.txt # pytest-cov -cryptography==41.0.2 +cryptography==41.0.3 # via # -r requirements/test.txt # pyjwt @@ -84,7 +84,7 @@ defusedxml==0.7.1 # social-auth-core diff-cover==7.7.0 # via -r requirements/test.txt -dill==0.3.6 +dill==0.3.7 # via # -r requirements/test.txt # pylint @@ -96,6 +96,7 @@ django==3.2.20 # django-crum # django-debug-toolbar # django-filter + # django-waffle # djangorestframework # drf-nested-routers # drf-yasg @@ -116,7 +117,7 @@ django-environ==0.10.0 # via -r requirements/test.txt django-filter==23.2 # via -r requirements/test.txt -django-waffle==3.0.0 +django-waffle==4.0.0 # via # -r requirements/test.txt # edx-django-utils @@ -133,17 +134,17 @@ docutils==0.19 # sphinx drf-nested-routers==0.93.4 # via -r requirements/test.txt -drf-yasg==1.21.6 +drf-yasg==1.21.7 # via # -r requirements/test.txt # edx-api-doc-tools -edx-api-doc-tools==1.6.0 +edx-api-doc-tools==1.7.0 # via -r requirements/test.txt edx-auth-backends==4.1.0 # 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 edx-lint==5.3.4 # via -r requirements/test.txt @@ -151,9 +152,9 @@ exceptiongroup==1.1.2 # via # -r requirements/test.txt # pytest -factory-boy==3.2.1 +factory-boy==3.3.0 # via -r requirements/test.txt -faker==19.1.0 +faker==19.2.0 # via # -r requirements/test.txt # factory-boy @@ -210,7 +211,7 @@ mypy-extensions==1.0.0 # mypy 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 @@ -231,7 +232,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 @@ -244,7 +245,7 @@ psutil==5.9.5 # via # -r requirements/test.txt # edx-django-utils -pycodestyle==2.10.0 +pycodestyle==2.11.0 # via -r requirements/test.txt pycparser==2.21 # via @@ -262,12 +263,12 @@ pygments==2.15.1 # diff-cover # pydata-sphinx-theme # sphinx -pyjwt[crypto]==2.7.0 +pyjwt[crypto]==2.8.0 # via # -r requirements/test.txt # edx-auth-backends # social-auth-core -pylint==2.17.4 +pylint==2.17.5 # via # -r requirements/test.txt # edx-lint @@ -320,7 +321,7 @@ pytz==2023.3 # django # djangorestframework # drf-yasg -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements/test.txt # code-annotations @@ -414,7 +415,7 @@ tomli==2.0.1 # mypy # pylint # pytest -tomlkit==0.11.8 +tomlkit==0.12.1 # via # -r requirements/test.txt # pylint diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 81f46a7..8167e08 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -6,11 +6,11 @@ # build==0.10.0 # via pip-tools -click==8.1.5 +click==8.1.6 # via pip-tools packaging==23.1 # via build -pip-tools==7.0.0 +pip-tools==7.2.0 # via -r requirements/pip-tools.in pyproject-hooks==1.0.0 # via build @@ -19,7 +19,7 @@ tomli==2.0.1 # build # pip-tools # pyproject-hooks -wheel==0.40.0 +wheel==0.41.0 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index bd9fb55..fb1908e 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.40.0 +wheel==0.41.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==23.2 +pip==23.2.1 # via -r requirements/pip.in setuptools==68.0.0 # via -r requirements/pip.in diff --git a/requirements/production.txt b/requirements/production.txt index bb72434..5c350b2 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -10,15 +10,15 @@ asgiref==3.7.2 # django attrs==23.1.0 # via -r requirements/base.txt -boto3==1.28.3 +boto3==1.28.18 # via # -c requirements/constraints.txt # -r requirements/production.in -botocore==1.31.3 +botocore==1.31.18 # via # boto3 # s3transfer -certifi==2023.5.7 +certifi==2023.7.22 # via # -r requirements/base.txt # requests @@ -31,11 +31,11 @@ charset-normalizer==3.2.0 # via # -r requirements/base.txt # requests -click==8.1.5 +click==8.1.6 # via # -r requirements/base.txt # edx-django-utils -cryptography==41.0.2 +cryptography==41.0.3 # via # -r requirements/base.txt # pyjwt @@ -53,6 +53,7 @@ django==3.2.20 # django-crum # django-filter # django-storages + # django-waffle # djangorestframework # drf-nested-routers # drf-yasg @@ -71,7 +72,7 @@ django-filter==23.2 # via -r requirements/base.txt django-storages==1.13.2 # via -r requirements/production.in -django-waffle==3.0.0 +django-waffle==4.0.0 # via # -r requirements/base.txt # edx-django-utils @@ -83,23 +84,23 @@ djangorestframework==3.14.0 # edx-api-doc-tools drf-nested-routers==0.93.4 # via -r requirements/base.txt -drf-yasg==1.21.6 +drf-yasg==1.21.7 # via # -r requirements/base.txt # edx-api-doc-tools -edx-api-doc-tools==1.6.0 +edx-api-doc-tools==1.7.0 # via -r requirements/base.txt edx-auth-backends==4.1.0 # 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 gevent==23.7.0 # via -r requirements/production.in greenlet==2.0.2 # via gevent -gunicorn==20.1.0 +gunicorn==21.2.0 # via -r requirements/production.in idna==3.4 # via @@ -115,7 +116,7 @@ jmespath==1.0.1 # botocore mysqlclient==2.2.0 # via -r requirements/base.txt -newrelic==8.8.1 +newrelic==8.9.0 # via # -r requirements/base.txt # -r requirements/production.in @@ -129,6 +130,7 @@ packaging==23.1 # via # -r requirements/base.txt # drf-yasg + # gunicorn pbr==5.11.1 # via # -r requirements/base.txt @@ -141,7 +143,7 @@ pycparser==2.21 # via # -r requirements/base.txt # cffi -pyjwt[crypto]==2.7.0 +pyjwt[crypto]==2.8.0 # via # -r requirements/base.txt # edx-auth-backends @@ -164,7 +166,7 @@ pytz==2023.3 # django # djangorestframework # drf-yasg -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements/base.txt # -r requirements/production.in diff --git a/requirements/test.txt b/requirements/test.txt index 8433a77..6f87885 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -15,7 +15,7 @@ astroid==2.15.6 # pylint-celery attrs==23.1.0 # via -r requirements/base.txt -certifi==2023.5.7 +certifi==2023.7.22 # via # -r requirements/base.txt # requests @@ -24,13 +24,13 @@ cffi==1.15.1 # -r requirements/base.txt # cryptography # pynacl -chardet==5.1.0 +chardet==5.2.0 # via diff-cover charset-normalizer==3.2.0 # via # -r requirements/base.txt # requests -click==8.1.5 +click==8.1.6 # via # -r requirements/base.txt # click-log @@ -39,13 +39,13 @@ click==8.1.5 # edx-lint click-log==0.4.0 # via edx-lint -code-annotations==1.3.0 +code-annotations==1.5.0 # via edx-lint coverage[toml]==7.2.7 # via # -r requirements/test.in # pytest-cov -cryptography==41.0.2 +cryptography==41.0.3 # via # -r requirements/base.txt # pyjwt @@ -59,7 +59,7 @@ defusedxml==0.7.1 # social-auth-core diff-cover==7.7.0 # via -r requirements/test.in -dill==0.3.6 +dill==0.3.7 # via pylint django==3.2.20 # via @@ -68,6 +68,7 @@ django==3.2.20 # -r requirements/base.txt # django-crum # django-filter + # django-waffle # djangorestframework # drf-nested-routers # drf-yasg @@ -86,7 +87,7 @@ django-environ==0.10.0 # via -r requirements/base.txt django-filter==23.2 # via -r requirements/base.txt -django-waffle==3.0.0 +django-waffle==4.0.0 # via # -r requirements/base.txt # edx-django-utils @@ -98,25 +99,25 @@ djangorestframework==3.14.0 # edx-api-doc-tools drf-nested-routers==0.93.4 # via -r requirements/base.txt -drf-yasg==1.21.6 +drf-yasg==1.21.7 # via # -r requirements/base.txt # edx-api-doc-tools -edx-api-doc-tools==1.6.0 +edx-api-doc-tools==1.7.0 # via -r requirements/base.txt edx-auth-backends==4.1.0 # 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 edx-lint==5.3.4 # via -r requirements/test.in exceptiongroup==1.1.2 # via pytest -factory-boy==3.2.1 +factory-boy==3.3.0 # via -r requirements/test.in -faker==19.1.0 +faker==19.2.0 # via factory-boy idna==3.4 # via @@ -146,7 +147,7 @@ mypy-extensions==1.0.0 # via mypy 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 @@ -164,7 +165,7 @@ pbr==5.11.1 # via # -r requirements/base.txt # stevedore -platformdirs==3.9.1 +platformdirs==3.10.0 # via pylint pluggy==1.2.0 # via @@ -174,7 +175,7 @@ psutil==5.9.5 # via # -r requirements/base.txt # edx-django-utils -pycodestyle==2.10.0 +pycodestyle==2.11.0 # via -r requirements/test.in pycparser==2.21 # via @@ -182,12 +183,12 @@ pycparser==2.21 # cffi pygments==2.15.1 # via diff-cover -pyjwt[crypto]==2.7.0 +pyjwt[crypto]==2.8.0 # via # -r requirements/base.txt # edx-auth-backends # social-auth-core -pylint==2.17.4 +pylint==2.17.5 # via # edx-lint # pylint-celery @@ -228,7 +229,7 @@ pytz==2023.3 # django # djangorestframework # drf-yasg -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements/base.txt # code-annotations @@ -277,7 +278,7 @@ tomli==2.0.1 # mypy # pylint # pytest -tomlkit==0.11.8 +tomlkit==0.12.1 # via pylint typing-extensions==4.7.1 # via From 5068c0491438efa35a194915a67f6603c718f1bc Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Mon, 7 Aug 2023 19:23:29 +0500 Subject: [PATCH 27/29] fix: codemod for django42 applied --- blockstore/apps/bundles/admin.py | 6 ++---- blockstore/apps/bundles/store.py | 2 +- blockstore/apps/bundles/tests/storage_utils.py | 4 ++-- blockstore/apps/core/admin.py | 6 ++---- blockstore/apps/core/models.py | 2 +- blockstore/apps/rest_api/urls.py | 4 ++-- blockstore/apps/rest_api/v1/urls.py | 4 ++-- blockstore/urls.py | 14 +++++++------- 8 files changed, 19 insertions(+), 23 deletions(-) diff --git a/blockstore/apps/bundles/admin.py b/blockstore/apps/bundles/admin.py index c2f5a12..027aef8 100644 --- a/blockstore/apps/bundles/admin.py +++ b/blockstore/apps/bundles/admin.py @@ -73,6 +73,7 @@ def get_max_num(self, request, obj=None, **kwargs): return max(obj.drafts.count(), 3) +@admin.register(Bundle) class BundleAdmin(admin.ModelAdmin): """ View for creating or updating Bundles and their BundleVersions & Drafts. @@ -90,9 +91,6 @@ def get_readonly_fields(self, request, obj=None): return ('uuid',) +@admin.register(Collection) class CollectionAdmin(admin.ModelAdmin): list_display = ('title', 'uuid') - - -admin.site.register(Bundle, BundleAdmin) -admin.site.register(Collection, CollectionAdmin) diff --git a/blockstore/apps/bundles/store.py b/blockstore/apps/bundles/store.py index e0270f9..b405ba4 100644 --- a/blockstore/apps/bundles/store.py +++ b/blockstore/apps/bundles/store.py @@ -28,7 +28,7 @@ from .storage import default_asset_storage logger = logging.getLogger(__name__) -snapshot_created = Signal(providing_args=["bundle_uuid", "hash_digest"]) +snapshot_created = Signal() @attr.s(frozen=True) diff --git a/blockstore/apps/bundles/tests/storage_utils.py b/blockstore/apps/bundles/tests/storage_utils.py index 5ce5f8c..23bbe94 100644 --- a/blockstore/apps/bundles/tests/storage_utils.py +++ b/blockstore/apps/bundles/tests/storage_utils.py @@ -18,7 +18,7 @@ import re from django.conf import settings -from django.conf.urls import url +from django.urls import re_path from django.views.static import serve from django.test import override_settings @@ -122,7 +122,7 @@ def url_for_test_media(): horrible performance characteristics. """ media_url = re.escape(settings.MEDIA_URL.lstrip('/')) - return url( + return re_path( fr'^{media_url}(?P.*)$', serve_media, ) diff --git a/blockstore/apps/core/admin.py b/blockstore/apps/core/admin.py index 387c3f3..0317719 100644 --- a/blockstore/apps/core/admin.py +++ b/blockstore/apps/core/admin.py @@ -2,11 +2,12 @@ from django.contrib import admin from django.contrib.auth.admin import UserAdmin -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from blockstore.apps.core.models import User +@admin.register(User) class CustomUserAdmin(UserAdmin): """ Admin configuration for the custom User model. """ list_display = ('username', 'email', 'full_name', 'first_name', 'last_name', 'is_staff') @@ -17,6 +18,3 @@ class CustomUserAdmin(UserAdmin): 'groups', 'user_permissions')}), (_('Important dates'), {'fields': ('last_login', 'date_joined')}), ) - - -admin.site.register(User, CustomUserAdmin) diff --git a/blockstore/apps/core/models.py b/blockstore/apps/core/models.py index e7e66c8..5f83f7f 100644 --- a/blockstore/apps/core/models.py +++ b/blockstore/apps/core/models.py @@ -2,7 +2,7 @@ from django.contrib.auth.models import AbstractUser from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ class User(AbstractUser): diff --git a/blockstore/apps/rest_api/urls.py b/blockstore/apps/rest_api/urls.py index 8ccdd35..8ef89e6 100644 --- a/blockstore/apps/rest_api/urls.py +++ b/blockstore/apps/rest_api/urls.py @@ -4,10 +4,10 @@ All API URLs should be versioned, so urlpatterns should only contain namespaces for the active versions of the API. """ -from django.conf.urls import url, include +from django.urls import include, path app_name = 'blockstore' urlpatterns = [ - url(r'^v1/', include('blockstore.apps.rest_api.v1.urls', namespace='v1')), + path('v1/', include('blockstore.apps.rest_api.v1.urls', namespace='v1')), ] diff --git a/blockstore/apps/rest_api/v1/urls.py b/blockstore/apps/rest_api/v1/urls.py index bd55c39..1e5411a 100644 --- a/blockstore/apps/rest_api/v1/urls.py +++ b/blockstore/apps/rest_api/v1/urls.py @@ -1,6 +1,6 @@ """ API v1 URLs. """ -from django.conf.urls import url, include +from django.urls import include, path from ..routers import DefaultRouter from .views.bundles import BundleViewSet, BundleVersionViewSet @@ -17,5 +17,5 @@ root_router.register(r'drafts', DraftViewSet) urlpatterns = [ - url(r'^', include(root_router.urls)), + path('', include(root_router.urls)), ] diff --git a/blockstore/urls.py b/blockstore/urls.py index 6589622..19e4225 100644 --- a/blockstore/urls.py +++ b/blockstore/urls.py @@ -16,7 +16,7 @@ from auth_backends.urls import oauth2_urlpatterns from django.conf import settings -from django.conf.urls import include, url +from django.urls import include, path, re_path from django.conf.urls.static import static from django.contrib import admin @@ -35,19 +35,19 @@ urlpatterns = oauth2_urlpatterns + [ - url(r'^admin/', admin.site.urls), - url(r'^api/', include('blockstore.apps.rest_api.urls', namespace='api')), + re_path(r'^admin/', admin.site.urls), + path('api/', include('blockstore.apps.rest_api.urls', namespace='api')), # Use the same auth views for all logins, including those originating from the browseable API. - url(r'^api-auth/', include((oauth2_urlpatterns, 'auth_backends'), namespace='rest_framework')), - url(r'^auto_auth/$', core_views.AutoAuth.as_view(), name='auto_auth'), - url(r'^health/$', core_views.health, name='health'), + path('api-auth/', include((oauth2_urlpatterns, 'auth_backends'), namespace='rest_framework')), + path('auto_auth/', core_views.AutoAuth.as_view(), name='auto_auth'), + path('health/', core_views.health, name='health'), ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) urlpatterns += make_docs_urls(api_info) if settings.DEBUG: # pragma: no cover import debug_toolbar # pylint: disable=import-error,useless-suppression - urlpatterns.append(url(r'^__debug__/', include(debug_toolbar.urls))) + urlpatterns.append(path('__debug__/', include(debug_toolbar.urls))) if settings.DEBUG or os.environ['DJANGO_SETTINGS_MODULE'] == 'blockstore.settings.test': urlpatterns.append(url_for_test_media()) From 949d0cc1bbbcfbb343f8701589fb04f1f50426b3 Mon Sep 17 00:00:00 2001 From: zubairshakoorarbisoft Date: Mon, 7 Aug 2023 19:38:19 +0500 Subject: [PATCH 28/29] fix: version bumbed to 1.4.0 --- CHANGELOG.rst | 9 +++++++++ blockstore/__init__.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 85d7512..e183070 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -16,6 +16,15 @@ Unreleased * +[1.4.0] - 2023-08-07 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Added +_______ + +* Added support for Django 4.2 + + [1.3.1] - 2023-03-06 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/blockstore/__init__.py b/blockstore/__init__.py index 6d395a1..aaaedd1 100644 --- a/blockstore/__init__.py +++ b/blockstore/__init__.py @@ -2,4 +2,4 @@ Blockstore is a system for storing educational content. """ -__version__ = '1.3.1' +__version__ = '1.4.0' From f5174f75355b843774dce3aafa3a7d516c937587 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sun, 6 Aug 2023 20:23:09 -0400 Subject: [PATCH 29/29] chore: Updating Python Requirements --- requirements/base.txt | 4 ++-- requirements/docs.txt | 2 +- requirements/local.txt | 6 +++--- requirements/pip-tools.txt | 2 +- requirements/pip.txt | 2 +- requirements/production.txt | 8 ++++---- requirements/test.txt | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index b1709ef..7ef1fe9 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -64,11 +64,11 @@ drf-yasg==1.21.7 # via edx-api-doc-tools edx-api-doc-tools==1.7.0 # via -r requirements/base.in -edx-auth-backends==4.1.0 +edx-auth-backends==4.2.0 # via -r requirements/base.in edx-django-release-util==1.3.0 # via -r requirements/base.in -edx-django-utils==5.6.0 +edx-django-utils==5.7.0 # via -r requirements/base.in idna==3.4 # via requests diff --git a/requirements/docs.txt b/requirements/docs.txt index 89e8e6b..5d3a489 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -38,7 +38,7 @@ packaging==23.1 # sphinx pydata-sphinx-theme==0.13.3 # via sphinx-book-theme -pygments==2.15.1 +pygments==2.16.1 # via # accessible-pygments # pydata-sphinx-theme diff --git a/requirements/local.txt b/requirements/local.txt index 74c207b..724ae1b 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -140,11 +140,11 @@ drf-yasg==1.21.7 # edx-api-doc-tools edx-api-doc-tools==1.7.0 # via -r requirements/test.txt -edx-auth-backends==4.1.0 +edx-auth-backends==4.2.0 # via -r requirements/test.txt edx-django-release-util==1.3.0 # via -r requirements/test.txt -edx-django-utils==5.6.0 +edx-django-utils==5.7.0 # via -r requirements/test.txt edx-lint==5.3.4 # via -r requirements/test.txt @@ -255,7 +255,7 @@ pydata-sphinx-theme==0.13.3 # via # -r requirements/docs.txt # sphinx-book-theme -pygments==2.15.1 +pygments==2.16.1 # via # -r requirements/docs.txt # -r requirements/test.txt diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 8167e08..ed274ee 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -19,7 +19,7 @@ tomli==2.0.1 # build # pip-tools # pyproject-hooks -wheel==0.41.0 +wheel==0.41.1 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index fb1908e..5e2f760 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,7 +4,7 @@ # # make upgrade # -wheel==0.41.0 +wheel==0.41.1 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/production.txt b/requirements/production.txt index 5c350b2..520b77d 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -10,11 +10,11 @@ asgiref==3.7.2 # django attrs==23.1.0 # via -r requirements/base.txt -boto3==1.28.18 +boto3==1.28.20 # via # -c requirements/constraints.txt # -r requirements/production.in -botocore==1.31.18 +botocore==1.31.20 # via # boto3 # s3transfer @@ -90,11 +90,11 @@ drf-yasg==1.21.7 # edx-api-doc-tools edx-api-doc-tools==1.7.0 # via -r requirements/base.txt -edx-auth-backends==4.1.0 +edx-auth-backends==4.2.0 # via -r requirements/base.txt edx-django-release-util==1.3.0 # via -r requirements/base.txt -edx-django-utils==5.6.0 +edx-django-utils==5.7.0 # via -r requirements/base.txt gevent==23.7.0 # via -r requirements/production.in diff --git a/requirements/test.txt b/requirements/test.txt index 6f87885..02b3c22 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -105,11 +105,11 @@ drf-yasg==1.21.7 # edx-api-doc-tools edx-api-doc-tools==1.7.0 # via -r requirements/base.txt -edx-auth-backends==4.1.0 +edx-auth-backends==4.2.0 # via -r requirements/base.txt edx-django-release-util==1.3.0 # via -r requirements/base.txt -edx-django-utils==5.6.0 +edx-django-utils==5.7.0 # via -r requirements/base.txt edx-lint==5.3.4 # via -r requirements/test.in @@ -181,7 +181,7 @@ pycparser==2.21 # via # -r requirements/base.txt # cffi -pygments==2.15.1 +pygments==2.16.1 # via diff-cover pyjwt[crypto]==2.8.0 # via