From effc78c2c9141ffa47ffef846ca88793e3df82b8 Mon Sep 17 00:00:00 2001 From: hamzawaleed01 Date: Tue, 11 Jun 2024 14:47:16 +0500 Subject: [PATCH 1/9] feat: bump edx-enterprise to 4.19.15 --- requirements/constraints.txt | 2 +- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/doc.txt | 2 +- requirements/edx/testing.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 2a7b6d6bb5..75f80e22c0 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -23,7 +23,7 @@ click>=8.0,<9.0 # The team that owns this package will manually bump this package rather than having it pulled in automatically. # This is to allow them to better control its deployment and to do it in a process that works better # for them. -edx-enterprise==4.19.14 +edx-enterprise==4.19.15 # Stay on LTS version, remove once this is added to common constraint Django<5.0 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 0a55b7e894..51f065e47d 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -464,7 +464,7 @@ edx-drf-extensions==10.3.0 # edx-when # edxval # openedx-learning -edx-enterprise==4.19.14 +edx-enterprise==4.19.15 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/kernel.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 5855fb2ebf..7bd013afd2 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -743,7 +743,7 @@ edx-drf-extensions==10.3.0 # edx-when # edxval # openedx-learning -edx-enterprise==4.19.14 +edx-enterprise==4.19.15 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 2623f9c720..1f4dca75dd 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -538,7 +538,7 @@ edx-drf-extensions==10.3.0 # edx-when # edxval # openedx-learning -edx-enterprise==4.19.14 +edx-enterprise==4.19.15 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index a1045c9766..4e9ed2585b 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -571,7 +571,7 @@ edx-drf-extensions==10.3.0 # edx-when # edxval # openedx-learning -edx-enterprise==4.19.14 +edx-enterprise==4.19.15 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt From 17d3e6686d7eba12c1b6ed09d9c94173e76c0441 Mon Sep 17 00:00:00 2001 From: Alex Dusenbery Date: Tue, 11 Jun 2024 09:42:52 -0400 Subject: [PATCH 2/9] feat: edx-enterprise 4.19.16 | submit create_enterprise_enrollment on commit Helps avoid a race-condition-induced lock error. https://github.com/openedx/edx-enterprise/releases/tag/4.19.16 --- requirements/constraints.txt | 2 +- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/doc.txt | 2 +- requirements/edx/testing.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 75f80e22c0..226ffe7c3f 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -23,7 +23,7 @@ click>=8.0,<9.0 # The team that owns this package will manually bump this package rather than having it pulled in automatically. # This is to allow them to better control its deployment and to do it in a process that works better # for them. -edx-enterprise==4.19.15 +edx-enterprise==4.19.16 # Stay on LTS version, remove once this is added to common constraint Django<5.0 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 51f065e47d..cc387ab7d6 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -464,7 +464,7 @@ edx-drf-extensions==10.3.0 # edx-when # edxval # openedx-learning -edx-enterprise==4.19.15 +edx-enterprise==4.19.16 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/kernel.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 7bd013afd2..b90b6e0a3c 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -743,7 +743,7 @@ edx-drf-extensions==10.3.0 # edx-when # edxval # openedx-learning -edx-enterprise==4.19.15 +edx-enterprise==4.19.16 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 1f4dca75dd..a4280860e6 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -538,7 +538,7 @@ edx-drf-extensions==10.3.0 # edx-when # edxval # openedx-learning -edx-enterprise==4.19.15 +edx-enterprise==4.19.16 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 4e9ed2585b..9abf17fe0a 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -571,7 +571,7 @@ edx-drf-extensions==10.3.0 # edx-when # edxval # openedx-learning -edx-enterprise==4.19.15 +edx-enterprise==4.19.16 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt From 7f1d7237138adf3ee15515d3f73f0427e7c87425 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Fri, 10 May 2024 12:30:38 -0400 Subject: [PATCH 3/9] build: Add a missing import for importlib_metadata. This was being pulled in as a transitive dependency before but it turns out we need this directly for the usage in openedx/core/djangoapps/plugins/i18n_api.py We add it to kernel.in before re-building the requirements files. --- requirements/edx/kernel.in | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/edx/kernel.in b/requirements/edx/kernel.in index 9321ca67ff..518b4149ea 100644 --- a/requirements/edx/kernel.in +++ b/requirements/edx/kernel.in @@ -100,6 +100,7 @@ help-tokens html5lib # HTML parser, used for capa problems icalendar # .ics generator, used by calendar_sync ipaddress # Ip network support for Embargo feature +importlib_metadata # Used to access entry_points in i18n_api plugin jsonfield # Django model field for validated JSON; used in several apps laboratory # Library for testing that code refactors/infrastructure changes produce identical results importlib_metadata # Used to access entry_points in i18n_api plugin From ff4d084e8b32b1e55f2534ad64357127908f463b Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Mon, 13 May 2024 11:16:36 -0400 Subject: [PATCH 4/9] fix: Update to adjust for new scipy.stats.mode behavior. Previously the default for the `keepdims` parameter was True, but as of SciPy 1.11.0 it is false. This is actually the behavior we want here since we only care about the mode value and not other values. https://docs.scipy.org/doc/scipy/release/1.11.0-notes.html#expired-deprecations --- cms/djangoapps/contentstore/api/views/course_quality.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/djangoapps/contentstore/api/views/course_quality.py b/cms/djangoapps/contentstore/api/views/course_quality.py index 297a530d76..42489978b8 100644 --- a/cms/djangoapps/contentstore/api/views/course_quality.py +++ b/cms/djangoapps/contentstore/api/views/course_quality.py @@ -272,5 +272,5 @@ class CourseQualityView(DeveloperErrorViewMixin, GenericAPIView): max=max(data), mean=np.around(np.mean(data)), median=np.around(np.median(data)), - mode=stats.mode(data, axis=None)[0][0], + mode=stats.mode(data, axis=None)[0], ) From 63ff4966b9c3af96f8b43509d2fd5223fa15814a Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Fri, 17 May 2024 12:36:05 -0400 Subject: [PATCH 5/9] build: Check consistencies with Python 3.11 now. --- .github/workflows/check-consistent-dependencies.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-consistent-dependencies.yml b/.github/workflows/check-consistent-dependencies.yml index 0e4595a9d0..048cbe6b00 100644 --- a/.github/workflows/check-consistent-dependencies.yml +++ b/.github/workflows/check-consistent-dependencies.yml @@ -40,7 +40,7 @@ jobs: - uses: actions/setup-python@v5 if: ${{ env.RELEVANT == 'true' }} with: - python-version: "3.8" + python-version: '3.11' - name: "Recompile requirements" if: ${{ env.RELEVANT == 'true' }} From 3660503d2de1be9fa90c6cb6c6de36de7fa655c7 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Tue, 11 Jun 2024 10:15:52 -0400 Subject: [PATCH 6/9] build: Update dispatch workflows to also run with 3.11 --- .github/workflows/compile-python-requirements.yml | 2 +- .github/workflows/upgrade-one-python-dependency.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/compile-python-requirements.yml b/.github/workflows/compile-python-requirements.yml index fda1d3b338..0ff99b9c68 100644 --- a/.github/workflows/compile-python-requirements.yml +++ b/.github/workflows/compile-python-requirements.yml @@ -26,7 +26,7 @@ jobs: - name: Set up Python environment uses: actions/setup-python@v5 with: - python-version: "3.8" + python-version: "3.11" - name: Run make compile-requirements env: diff --git a/.github/workflows/upgrade-one-python-dependency.yml b/.github/workflows/upgrade-one-python-dependency.yml index baed246246..6ca5dfcb35 100644 --- a/.github/workflows/upgrade-one-python-dependency.yml +++ b/.github/workflows/upgrade-one-python-dependency.yml @@ -39,7 +39,7 @@ jobs: - name: Set up Python environment uses: actions/setup-python@v5 with: - python-version: "3.8" + python-version: "3.11" - name: Update any pinned dependencies env: From 623061fde5955c70408331f0e7437065b080965f Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Fri, 10 May 2024 10:57:38 -0400 Subject: [PATCH 7/9] chore: Run `make upgarde` with Python 3.11 --- requirements/edx-sandbox/base.txt | 26 +-- requirements/edx/assets.txt | 7 +- requirements/edx/base.txt | 121 ++++------ requirements/edx/coverage.txt | 4 +- requirements/edx/development.txt | 207 ++++++------------ requirements/edx/doc.txt | 147 +++++-------- requirements/edx/paver.txt | 12 +- requirements/edx/semgrep.txt | 24 +- requirements/edx/testing.txt | 162 +++++--------- requirements/pip-tools.txt | 14 +- requirements/pip.txt | 4 +- .../structures_pruning/requirements/base.txt | 6 +- .../requirements/testing.txt | 14 +- scripts/user_retirement/requirements/base.txt | 34 ++- .../user_retirement/requirements/testing.txt | 41 ++-- scripts/xblock/requirements.txt | 6 +- 16 files changed, 310 insertions(+), 519 deletions(-) diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt index 5e3a673caa..bf5148b100 100644 --- a/requirements/edx-sandbox/base.txt +++ b/requirements/edx-sandbox/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -14,15 +14,13 @@ click==8.1.6 # nltk codejail-includes==1.0.0 # via -r requirements/edx-sandbox/base.in -contourpy==1.1.1 +contourpy==1.2.1 # via matplotlib -cryptography==42.0.7 +cryptography==42.0.8 # via -r requirements/edx-sandbox/base.in cycler==0.12.1 # via matplotlib -fonttools==4.51.0 - # via matplotlib -importlib-resources==6.4.0 +fonttools==4.53.0 # via matplotlib joblib==1.4.2 # via nltk @@ -37,17 +35,17 @@ markupsafe==2.1.5 # via # chem # openedx-calc -matplotlib==3.7.5 +matplotlib==3.9.0 # via -r requirements/edx-sandbox/base.in mpmath==1.3.0 # via sympy -networkx==3.1 +networkx==3.3 # via -r requirements/edx-sandbox/base.in nltk==3.8.1 # via # -r requirements/edx-sandbox/base.in # chem -numpy==1.24.4 +numpy==1.26.4 # via # chem # contourpy @@ -56,7 +54,7 @@ numpy==1.24.4 # scipy openedx-calc==3.1.0 # via -r requirements/edx-sandbox/base.in -packaging==24.0 +packaging==24.1 # via matplotlib pillow==10.3.0 # via matplotlib @@ -72,9 +70,9 @@ python-dateutil==2.9.0.post0 # via matplotlib random2==1.0.2 # via -r requirements/edx-sandbox/base.in -regex==2024.5.10 +regex==2024.5.15 # via nltk -scipy==1.10.1 +scipy==1.13.1 # via # -r requirements/edx-sandbox/base.in # chem @@ -83,11 +81,9 @@ six==1.16.0 # via # codejail-includes # python-dateutil -sympy==1.12 +sympy==1.12.1 # via # -r requirements/edx-sandbox/base.in # openedx-calc tqdm==4.66.4 # via nltk -zipp==3.18.1 - # via importlib-resources diff --git a/requirements/edx/assets.txt b/requirements/edx/assets.txt index bcac144e0e..6c3e1a4151 100644 --- a/requirements/edx/assets.txt +++ b/requirements/edx/assets.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -12,10 +12,7 @@ libsass==0.10.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/assets.in -nodeenv==1.8.0 +nodeenv==1.9.1 # via -r requirements/edx/assets.in six==1.16.0 # via libsass - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index cc387ab7d6..53d2350191 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -22,7 +22,7 @@ analytics-python==1.4.post1 # via -r requirements/edx/kernel.in aniso8601==9.0.1 # via edx-tincan-py35 -annotated-types==0.6.0 +annotated-types==0.7.0 # via pydantic appdirs==1.4.4 # via fs @@ -33,10 +33,6 @@ asgiref==3.8.1 # django-countries asn1crypto==1.5.1 # via snowflake-connector-python -async-timeout==4.0.3 - # via - # aiohttp - # redis attrs==23.2.0 # via # -r requirements/edx/kernel.in @@ -54,14 +50,6 @@ babel==2.15.0 # enmerkar-underscore backoff==1.10.0 # via analytics-python -backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" - # via - # -c requirements/edx/../constraints.txt - # celery - # django - # edx-milestones - # icalendar - # kombu beautifulsoup4==4.12.3 # via pynliner billiard==4.2.0 @@ -77,13 +65,13 @@ bleach[css]==6.1.0 # xblock-poll boto==2.49.0 # via -r requirements/edx/kernel.in -boto3==1.34.104 +boto3==1.34.123 # via # -r requirements/edx/kernel.in # django-ses # fs-s3fs # ora2 -botocore==1.34.104 +botocore==1.34.123 # via # -r requirements/edx/kernel.in # boto3 @@ -102,7 +90,7 @@ celery==5.4.0 # edx-enterprise # event-tracking # openedx-learning -certifi==2024.2.2 +certifi==2024.6.2 # via # -r requirements/edx/paver.txt # elasticsearch @@ -155,7 +143,7 @@ coreschema==0.0.4 # drf-yasg crowdsourcehinter-xblock==0.7 # via -r requirements/edx/bundled.in -cryptography==42.0.7 +cryptography==42.0.8 # via # -r requirements/edx/kernel.in # django-fernet-fields-v2 @@ -167,7 +155,7 @@ cryptography==42.0.7 # pyopenssl # snowflake-connector-python # social-auth-core -cssutils==2.10.3 +cssutils==2.11.1 # via pynliner defusedxml==0.7.1 # via @@ -309,7 +297,7 @@ django-model-utils==4.5.1 # edxval # ora2 # super-csv -django-mptt==0.14.0 +django-mptt==0.16.0 # via # -r requirements/edx/kernel.in # openedx-django-wiki @@ -332,7 +320,7 @@ django-sekizai==4.1.0 # via # -r requirements/edx/kernel.in # openedx-django-wiki -django-ses==4.0.0 +django-ses==4.1.0 # via -r requirements/edx/bundled.in django-simple-history==3.4.0 # via @@ -348,6 +336,7 @@ django-statici18n==2.5.0 # -r requirements/edx/kernel.in # lti-consumer-xblock # xblock-drag-and-drop-v2 + # xblock-poll django-storages==1.14.3 # via # -r requirements/edx/kernel.in @@ -428,11 +417,12 @@ edx-celeryutils==1.3.0 # super-csv edx-codejail==3.4.1 # via -r requirements/edx/kernel.in -edx-completion==4.6.0 +edx-completion==4.6.2 # via -r requirements/edx/kernel.in edx-django-release-util==1.4.0 # via # -r requirements/edx/kernel.in + # edx-submissions # edxval edx-django-sites-extensions==4.2.0 # via -r requirements/edx/kernel.in @@ -481,7 +471,7 @@ edx-milestones==0.6.0 # via -r requirements/edx/kernel.in edx-name-affirmation==2.3.7 # via -r requirements/edx/kernel.in -edx-opaque-keys[django]==2.9.0 +edx-opaque-keys[django]==2.10.0 # via # -r requirements/edx/kernel.in # -r requirements/edx/paver.txt @@ -499,13 +489,13 @@ edx-opaque-keys[django]==2.9.0 # ora2 edx-organizations==6.13.0 # via -r requirements/edx/kernel.in -edx-proctoring==4.17.0 +edx-proctoring==4.18.1 # via # -r requirements/edx/kernel.in # edx-proctoring-proctortrack edx-rbac==1.9.0 # via edx-enterprise -edx-rest-api-client==5.7.0 +edx-rest-api-client==5.6.1 # via # -r requirements/edx/kernel.in # edx-enterprise @@ -514,7 +504,7 @@ edx-search==3.9.1 # via -r requirements/edx/kernel.in edx-sga==0.25.0 # via -r requirements/edx/bundled.in -edx-submissions==3.7.0 +edx-submissions==3.7.1 # via # -r requirements/edx/kernel.in # ora2 @@ -599,12 +589,6 @@ importlib-metadata==6.11.0 # via # -c requirements/edx/../common_constraints.txt # -r requirements/edx/kernel.in - # markdown -importlib-resources==5.13.0 - # via - # jsonschema - # jsonschema-specifications - # pycountry inflection==0.5.1 # via # drf-spectacular @@ -704,9 +688,9 @@ markupsafe==2.1.5 # mako # openedx-calc # xblock -maxminddb==2.6.1 +maxminddb==2.6.2 # via geoip2 -meilisearch==0.31.1 +meilisearch==0.31.3 # via -r requirements/edx/kernel.in mock==5.1.0 # via -r requirements/edx/paver.txt @@ -716,6 +700,8 @@ monotonic==1.6 # via # analytics-python # py2neo +more-itertools==10.3.0 + # via cssutils mpmath==1.3.0 # via sympy multidict==6.0.5 @@ -724,15 +710,15 @@ multidict==6.0.5 # yarl mysqlclient==2.2.4 # via -r requirements/edx/kernel.in -newrelic==9.9.1 +newrelic==9.10.0 # via # -r requirements/edx/bundled.in # edx-django-utils nltk==3.8.1 # via chem -nodeenv==1.8.0 +nodeenv==1.9.1 # via -r requirements/edx/kernel.in -numpy==1.24.4 +numpy==1.26.4 # via # chem # openedx-calc @@ -751,7 +737,7 @@ openai==0.28.1 # via # -c requirements/edx/../constraints.txt # edx-enterprise -openedx-atlas==0.6.0 +openedx-atlas==0.6.1 # via -r requirements/edx/kernel.in openedx-calc==3.1.0 # via -r requirements/edx/kernel.in @@ -787,7 +773,7 @@ optimizely-sdk==4.1.1 # -r requirements/edx/bundled.in ora2==6.11.1 # via -r requirements/edx/bundled.in -packaging==24.0 +packaging==24.1 # via # drf-yasg # gunicorn @@ -823,13 +809,11 @@ pillow==10.3.0 # edx-enterprise # edx-organizations # edxval -pkgutil-resolve-name==1.3.10 - # via jsonschema -platformdirs==4.2.1 +platformdirs==4.2.2 # via snowflake-connector-python polib==1.2.0 # via edx-i18n-tools -prompt-toolkit==3.0.43 +prompt-toolkit==3.0.47 # via click-repl psutil==5.9.8 # via @@ -841,7 +825,7 @@ py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo- # -r requirements/edx/bundled.in pyasn1==0.6.0 # via pgpy -pycountry==23.12.11 +pycountry==24.6.1 # via -r requirements/edx/kernel.in pycparser==2.22 # via cffi @@ -851,9 +835,9 @@ pycryptodomex==3.20.0 # edx-proctoring # lti-consumer-xblock # pyjwkest -pydantic==2.7.1 +pydantic==2.7.3 # via camel-converter -pydantic-core==2.18.2 +pydantic-core==2.18.4 # via pydantic pygments==2.18.0 # via @@ -927,7 +911,7 @@ python-memcached==1.62 # via -r requirements/edx/paver.txt python-slugify==8.0.4 # via code-annotations -python-swiftclient==4.5.0 +python-swiftclient==4.6.0 # via ora2 python3-openid==3.2.0 ; python_version >= "3" # via @@ -938,7 +922,6 @@ python3-saml==1.16.0 pytz==2024.1 # via # -r requirements/edx/kernel.in - # babel # django-ses # djangorestframework # drf-yasg @@ -969,7 +952,7 @@ random2==1.0.2 # via -r requirements/edx/kernel.in recommender-xblock==2.2.0 # via -r requirements/edx/bundled.in -redis==5.0.4 +redis==5.0.5 # via # -r requirements/edx/kernel.in # walrus @@ -977,9 +960,9 @@ referencing==0.35.1 # via # jsonschema # jsonschema-specifications -regex==2024.5.10 +regex==2024.5.15 # via nltk -requests==2.31.0 +requests==2.32.3 # via # -r requirements/edx/paver.txt # algoliasearch @@ -1016,7 +999,7 @@ ruamel-yaml==0.18.6 # via drf-yasg ruamel-yaml-clib==0.2.8 # via ruamel-yaml -rules==3.3 +rules==3.4 # via # -r requirements/edx/kernel.in # edx-enterprise @@ -1026,7 +1009,7 @@ s3transfer==0.10.1 # via boto3 sailthru-client==2.2.3 # via edx-ace -scipy==1.10.1 +scipy==1.13.1 # via # chem # openedx-calc @@ -1075,7 +1058,7 @@ slumber==0.7.1 # edx-bulk-grades # edx-enterprise # edx-rest-api-client -snowflake-connector-python==3.10.0 +snowflake-connector-python==3.10.1 # via edx-enterprise social-auth-app-django==5.0.0 # via @@ -1113,9 +1096,9 @@ stevedore==5.2.0 # edx-opaque-keys super-csv==3.2.0 # via edx-bulk-grades -sympy==1.12 +sympy==1.12.1 # via openedx-calc -testfixtures==8.2.0 +testfixtures==8.3.0 # via edx-enterprise text-unidecode==1.3 # via python-slugify @@ -1127,24 +1110,18 @@ tqdm==4.66.4 # via # nltk # openai -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via # -r requirements/edx/paver.txt - # annotated-types - # asgiref # django-countries - # drf-spectacular # edx-opaque-keys # jwcrypto - # kombu # pydantic # pydantic-core # pylti1p3 # snowflake-connector-python tzdata==2024.1 - # via - # backports-zoneinfo - # celery + # via celery unicodecsv==0.14.1 # via # -r requirements/edx/kernel.in @@ -1162,7 +1139,6 @@ urllib3==1.26.18 # elasticsearch # py2neo # requests - # snowflake-connector-python user-util==1.1.0 # via -r requirements/edx/kernel.in vine==5.1.0 @@ -1174,7 +1150,7 @@ voluptuous==0.14.2 # via ora2 walrus==0.9.3 # via edx-event-bus-redis -watchdog==4.0.0 +watchdog==4.0.1 # via -r requirements/edx/paver.txt wcwidth==0.2.13 # via prompt-toolkit @@ -1211,16 +1187,17 @@ xblock[django]==4.0.1 # staff-graded-xblock # xblock-drag-and-drop-v2 # xblock-google-drive - # xblock-poll # xblock-utils xblock-drag-and-drop-v2==4.0.2 # via -r requirements/edx/bundled.in xblock-google-drive==0.7.0 # via -r requirements/edx/bundled.in -xblock-poll==1.13.0 +xblock-poll==1.14.0 # via -r requirements/edx/bundled.in xblock-utils==4.0.0 - # via edx-sga + # via + # edx-sga + # xblock-poll xmlsec==1.3.13 # via # -c requirements/edx/../constraints.txt @@ -1229,10 +1206,8 @@ xss-utils==0.6.0 # via -r requirements/edx/kernel.in yarl==1.9.4 # via aiohttp -zipp==3.18.1 - # via - # importlib-metadata - # importlib-resources +zipp==3.19.2 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index e150dc3fe2..73c03573cc 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -1,12 +1,12 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # chardet==5.2.0 # via diff-cover -coverage==7.5.1 +coverage==7.5.3 # via -r requirements/edx/coverage.in diff-cover==9.0.0 # via -r requirements/edx/coverage.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index b90b6e0a3c..696a7e0ae3 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -8,7 +8,7 @@ # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -accessible-pygments==0.0.4 +accessible-pygments==0.0.5 # via # -r requirements/edx/doc.txt # pydata-sphinx-theme @@ -27,7 +27,7 @@ aiosignal==1.3.1 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # aiohttp -alabaster==0.7.13 +alabaster==0.7.16 # via # -r requirements/edx/doc.txt # sphinx @@ -49,12 +49,12 @@ aniso8601==9.0.1 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-tincan-py35 -annotated-types==0.6.0 +annotated-types==0.7.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # pydantic -anyio==4.3.0 +anyio==4.4.0 # via # -r requirements/edx/testing.txt # httpx @@ -82,12 +82,6 @@ astroid==2.13.5 # -r requirements/edx/testing.txt # pylint # pylint-celery -async-timeout==4.0.3 - # via - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt - # aiohttp - # redis attrs==23.2.0 # via # -r requirements/edx/doc.txt @@ -112,16 +106,6 @@ backoff==1.10.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # analytics-python -backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" - # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt - # celery - # django - # edx-milestones - # icalendar - # kombu beautifulsoup4==4.12.3 # via # -r requirements/edx/doc.txt @@ -147,14 +131,14 @@ boto==2.49.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -boto3==1.34.104 +boto3==1.34.123 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # django-ses # fs-s3fs # ora2 -botocore==1.34.104 +botocore==1.34.123 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -188,7 +172,7 @@ celery==5.4.0 # edx-enterprise # event-tracking # openedx-learning -certifi==2024.2.2 +certifi==2024.6.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -292,7 +276,7 @@ coreschema==0.0.4 # -r requirements/edx/testing.txt # coreapi # drf-yasg -coverage[toml]==7.5.1 +coverage[toml]==7.5.3 # via # -r requirements/edx/testing.txt # pytest-cov @@ -300,7 +284,7 @@ crowdsourcehinter-xblock==0.7 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -cryptography==42.0.7 +cryptography==42.0.8 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -317,7 +301,7 @@ cssselect==1.2.0 # via # -r requirements/edx/testing.txt # pyquery -cssutils==2.10.3 +cssutils==2.11.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -465,7 +449,7 @@ django-crum==0.7.9 # edx-rbac # edx-toggles # super-csv -django-debug-toolbar==4.3.0 +django-debug-toolbar==4.4.2 # via -r requirements/edx/development.in django-fernet-fields-v2==0.9 # via @@ -512,7 +496,7 @@ django-model-utils==4.5.1 # edxval # ora2 # super-csv -django-mptt==0.14.0 +django-mptt==0.16.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -550,7 +534,7 @@ django-sekizai==4.1.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # openedx-django-wiki -django-ses==4.0.0 +django-ses==4.1.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -570,6 +554,7 @@ django-statici18n==2.5.0 # -r requirements/edx/testing.txt # lti-consumer-xblock # xblock-drag-and-drop-v2 + # xblock-poll django-storages==1.14.3 # via # -r requirements/edx/doc.txt @@ -580,7 +565,7 @@ django-stubs==1.16.0 # -c requirements/edx/../constraints.txt # -r requirements/edx/development.in # djangorestframework-stubs -django-stubs-ext==5.0.0 +django-stubs-ext==5.0.2 # via django-stubs django-user-tasks==3.2.0 # via @@ -635,7 +620,7 @@ dnspython==2.6.1 # via # -r requirements/edx/testing.txt # email-validator -docutils==0.19 +docutils==0.21.2 # via # -r requirements/edx/doc.txt # pydata-sphinx-theme @@ -700,7 +685,7 @@ edx-codejail==3.4.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -edx-completion==4.6.0 +edx-completion==4.6.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -708,6 +693,7 @@ edx-django-release-util==1.4.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt + # edx-submissions # edxval edx-django-sites-extensions==4.2.0 # via @@ -772,7 +758,7 @@ edx-name-affirmation==2.3.7 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -edx-opaque-keys[django]==2.9.0 +edx-opaque-keys[django]==2.10.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -792,7 +778,7 @@ edx-organizations==6.13.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -edx-proctoring==4.17.0 +edx-proctoring==4.18.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -802,7 +788,7 @@ edx-rbac==1.9.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-enterprise -edx-rest-api-client==5.7.0 +edx-rest-api-client==5.6.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -816,7 +802,7 @@ edx-sga==0.25.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -edx-submissions==3.7.0 +edx-submissions==3.7.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -878,27 +864,21 @@ event-tracking==2.4.0 # edx-completion # edx-proctoring # edx-search -exceptiongroup==1.2.1 - # via - # -r requirements/edx/testing.txt - # anyio - # pytest execnet==2.1.1 # via # -r requirements/edx/testing.txt # pytest-xdist factory-boy==3.3.0 # via -r requirements/edx/testing.txt -faker==25.2.0 +faker==25.8.0 # via # -r requirements/edx/testing.txt # factory-boy fastapi==0.111.0 # via # -r requirements/edx/testing.txt - # fastapi-cli # pact-python -fastapi-cli==0.0.3 +fastapi-cli==0.0.4 # via # -r requirements/edx/testing.txt # fastapi @@ -1013,20 +993,8 @@ import-linter==2.0 importlib-metadata==6.11.0 # via # -c requirements/edx/../common_constraints.txt - # -r requirements/edx/../pip-tools.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt - # build - # markdown - # pytest-randomly - # sphinx -importlib-resources==5.13.0 - # via - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt - # jsonschema - # jsonschema-specifications - # pycountry inflection==0.5.1 # via # -r requirements/edx/doc.txt @@ -1197,7 +1165,7 @@ markupsafe==2.1.5 # mako # openedx-calc # xblock -maxminddb==2.6.1 +maxminddb==2.6.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1210,7 +1178,7 @@ mdurl==0.1.2 # via # -r requirements/edx/testing.txt # markdown-it-py -meilisearch==0.31.1 +meilisearch==0.31.3 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1232,6 +1200,11 @@ monotonic==1.6 # -r requirements/edx/testing.txt # analytics-python # py2neo +more-itertools==10.3.0 + # via + # -r requirements/edx/doc.txt + # -r requirements/edx/testing.txt + # cssutils mpmath==1.3.0 # via # -r requirements/edx/doc.txt @@ -1254,7 +1227,7 @@ mysqlclient==2.2.4 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -newrelic==9.9.1 +newrelic==9.10.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1264,12 +1237,12 @@ nltk==3.8.1 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # chem -nodeenv==1.8.0 +nodeenv==1.9.1 # via # -r requirements/edx/assets.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -numpy==1.24.4 +numpy==1.26.4 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1295,7 +1268,7 @@ openai==0.28.1 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-enterprise -openedx-atlas==0.6.0 +openedx-atlas==0.6.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1349,11 +1322,11 @@ ora2==6.11.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -orjson==3.10.3 +orjson==3.10.4 # via # -r requirements/edx/testing.txt # fastapi -packaging==24.0 +packaging==24.1 # via # -r requirements/edx/../pip-tools.txt # -r requirements/edx/doc.txt @@ -1420,12 +1393,7 @@ pillow==10.3.0 # edxval pip-tools==7.4.1 # via -r requirements/edx/../pip-tools.txt -pkgutil-resolve-name==1.3.10 - # via - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt - # jsonschema -platformdirs==4.2.1 +platformdirs==4.2.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1444,7 +1412,7 @@ polib==1.2.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-i18n-tools -prompt-toolkit==3.0.43 +prompt-toolkit==3.0.47 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1472,7 +1440,7 @@ pycodestyle==2.8.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt -pycountry==23.12.11 +pycountry==24.6.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1488,18 +1456,18 @@ pycryptodomex==3.20.0 # edx-proctoring # lti-consumer-xblock # pyjwkest -pydantic==2.7.1 +pydantic==2.7.3 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # camel-converter # fastapi -pydantic-core==2.18.2 +pydantic-core==2.18.4 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # pydantic -pydata-sphinx-theme==0.14.4 +pydata-sphinx-theme==0.15.3 # via # -r requirements/edx/doc.txt # sphinx-book-theme @@ -1620,7 +1588,7 @@ pysrt==1.1.2 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edxval -pytest==8.2.0 +pytest==8.2.2 # via # -r requirements/edx/testing.txt # pylint-pytest @@ -1685,7 +1653,7 @@ python-slugify==8.0.4 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # code-annotations -python-swiftclient==4.5.0 +python-swiftclient==4.6.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1703,7 +1671,6 @@ pytz==2024.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt - # babel # django-ses # djangorestframework # drf-yasg @@ -1745,7 +1712,7 @@ recommender-xblock==2.2.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -redis==5.0.4 +redis==5.0.5 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1756,12 +1723,12 @@ referencing==0.35.1 # -r requirements/edx/testing.txt # jsonschema # jsonschema-specifications -regex==2024.5.10 +regex==2024.5.15 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # nltk -requests==2.31.0 +requests==2.32.3 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1815,7 +1782,7 @@ ruamel-yaml-clib==0.2.8 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # ruamel-yaml -rules==3.3 +rules==3.4 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1832,7 +1799,7 @@ sailthru-client==2.2.3 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-ace -scipy==1.10.1 +scipy==1.13.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1913,7 +1880,7 @@ snowballstemmer==2.2.0 # via # -r requirements/edx/doc.txt # sphinx -snowflake-connector-python==3.10.0 +snowflake-connector-python==3.10.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1946,35 +1913,36 @@ soupsieve==2.5 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # beautifulsoup4 -sphinx==6.2.1 +sphinx==7.3.7 # via # -r requirements/edx/doc.txt # pydata-sphinx-theme # sphinx-book-theme # sphinx-design + # sphinx-mdinclude # sphinx-reredirects # sphinxcontrib-httpdomain # sphinxcontrib-openapi # sphinxext-rediraffe -sphinx-book-theme==1.0.1 +sphinx-book-theme==1.1.2 # via -r requirements/edx/doc.txt -sphinx-design==0.5.0 +sphinx-design==0.6.0 # via -r requirements/edx/doc.txt -sphinx-mdinclude==0.6.0 +sphinx-mdinclude==0.6.1 # via # -r requirements/edx/doc.txt # sphinxcontrib-openapi sphinx-reredirects==0.1.3 # via -r requirements/edx/doc.txt -sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-applehelp==1.0.8 # via # -r requirements/edx/doc.txt # sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==1.0.6 # via # -r requirements/edx/doc.txt # sphinx -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.0.5 # via # -r requirements/edx/doc.txt # sphinx @@ -1988,11 +1956,11 @@ sphinxcontrib-jsmath==1.0.1 # sphinx sphinxcontrib-openapi[markdown]==0.8.4 # via -r requirements/edx/doc.txt -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==1.0.7 # via # -r requirements/edx/doc.txt # sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==1.1.10 # via # -r requirements/edx/doc.txt # sphinx @@ -2026,12 +1994,12 @@ super-csv==3.2.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-bulk-grades -sympy==1.12 +sympy==1.12.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # openedx-calc -testfixtures==8.2.0 +testfixtures==8.3.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -2047,27 +2015,14 @@ tinycss2==1.2.1 # -r requirements/edx/testing.txt # bleach tomli==2.0.1 - # via - # -r requirements/edx/../pip-tools.txt - # -r requirements/edx/testing.txt - # build - # coverage - # django-stubs - # import-linter - # mypy - # pip-tools - # pylint - # pyproject-api - # pytest - # tox - # vulture + # via django-stubs tomlkit==0.12.5 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # pylint # snowflake-connector-python -tox==4.15.0 +tox==4.15.1 # via -r requirements/edx/testing.txt tqdm==4.66.4 # via @@ -2089,42 +2044,30 @@ types-requests==2.31.0.6 # via djangorestframework-stubs types-urllib3==1.26.25.14 # via types-requests -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt - # annotated-types - # anyio - # asgiref - # astroid # django-countries # django-stubs # django-stubs-ext # djangorestframework-stubs - # drf-spectacular # edx-opaque-keys # fastapi # grimp # import-linter # jwcrypto - # kombu # mypy - # pact-python # pydantic # pydantic-core # pydata-sphinx-theme - # pylint # pylti1p3 - # rich # snowflake-connector-python - # starlette # typer - # uvicorn tzdata==2024.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt - # backports-zoneinfo # celery ujson==5.10.0 # via @@ -2153,16 +2096,14 @@ urllib3==1.26.18 # elasticsearch # py2neo # requests - # snowflake-connector-python user-util==1.1.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -uvicorn[standard]==0.29.0 +uvicorn[standard]==0.30.1 # via # -r requirements/edx/testing.txt # fastapi - # fastapi-cli # pact-python uvloop==0.19.0 # via @@ -2191,12 +2132,12 @@ walrus==0.9.3 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-event-bus-redis -watchdog==4.0.0 +watchdog==4.0.1 # via # -r requirements/edx/development.in # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -watchfiles==0.21.0 +watchfiles==0.22.0 # via # -r requirements/edx/testing.txt # uvicorn @@ -2254,7 +2195,6 @@ xblock[django]==4.0.1 # staff-graded-xblock # xblock-drag-and-drop-v2 # xblock-google-drive - # xblock-poll # xblock-utils xblock-drag-and-drop-v2==4.0.2 # via @@ -2264,7 +2204,7 @@ xblock-google-drive==0.7.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -xblock-poll==1.13.0 +xblock-poll==1.14.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -2273,6 +2213,7 @@ xblock-utils==4.0.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-sga + # xblock-poll xmlsec==1.3.13 # via # -c requirements/edx/../constraints.txt @@ -2289,13 +2230,11 @@ yarl==1.9.4 # -r requirements/edx/testing.txt # aiohttp # pact-python -zipp==3.18.1 +zipp==3.19.2 # via - # -r requirements/edx/../pip-tools.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index a4280860e6..35a6c945e7 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -1,12 +1,12 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # -e git+https://github.com/anupdhabarde/edx-proctoring-proctortrack.git@31c6c9923a51c903ae83760ecbbac191363aa2a2#egg=edx_proctoring_proctortrack # via -r requirements/edx/base.txt -accessible-pygments==0.0.4 +accessible-pygments==0.0.5 # via pydata-sphinx-theme acid-xblock==0.3.1 # via -r requirements/edx/base.txt @@ -19,7 +19,7 @@ aiosignal==1.3.1 # via # -r requirements/edx/base.txt # aiohttp -alabaster==0.7.13 +alabaster==0.7.16 # via sphinx algoliasearch==3.0.0 # via -r requirements/edx/base.txt @@ -33,7 +33,7 @@ aniso8601==9.0.1 # via # -r requirements/edx/base.txt # edx-tincan-py35 -annotated-types==0.6.0 +annotated-types==0.7.0 # via # -r requirements/edx/base.txt # pydantic @@ -51,11 +51,6 @@ asn1crypto==1.5.1 # via # -r requirements/edx/base.txt # snowflake-connector-python -async-timeout==4.0.3 - # via - # -r requirements/edx/base.txt - # aiohttp - # redis attrs==23.2.0 # via # -r requirements/edx/base.txt @@ -77,15 +72,6 @@ backoff==1.10.0 # via # -r requirements/edx/base.txt # analytics-python -backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" - # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/base.txt - # celery - # django - # edx-milestones - # icalendar - # kombu beautifulsoup4==4.12.3 # via # -r requirements/edx/base.txt @@ -106,13 +92,13 @@ bleach[css]==6.1.0 # xblock-poll boto==2.49.0 # via -r requirements/edx/base.txt -boto3==1.34.104 +boto3==1.34.123 # via # -r requirements/edx/base.txt # django-ses # fs-s3fs # ora2 -botocore==1.34.104 +botocore==1.34.123 # via # -r requirements/edx/base.txt # boto3 @@ -133,7 +119,7 @@ celery==5.4.0 # edx-enterprise # event-tracking # openedx-learning -certifi==2024.2.2 +certifi==2024.6.2 # via # -r requirements/edx/base.txt # elasticsearch @@ -201,7 +187,7 @@ coreschema==0.0.4 # drf-yasg crowdsourcehinter-xblock==0.7 # via -r requirements/edx/base.txt -cryptography==42.0.7 +cryptography==42.0.8 # via # -r requirements/edx/base.txt # django-fernet-fields-v2 @@ -213,7 +199,7 @@ cryptography==42.0.7 # pyopenssl # snowflake-connector-python # social-auth-core -cssutils==2.10.3 +cssutils==2.11.1 # via # -r requirements/edx/base.txt # pynliner @@ -369,7 +355,7 @@ django-model-utils==4.5.1 # edxval # ora2 # super-csv -django-mptt==0.14.0 +django-mptt==0.16.0 # via # -r requirements/edx/base.txt # openedx-django-wiki @@ -396,7 +382,7 @@ django-sekizai==4.1.0 # via # -r requirements/edx/base.txt # openedx-django-wiki -django-ses==4.0.0 +django-ses==4.1.0 # via -r requirements/edx/base.txt django-simple-history==3.4.0 # via @@ -412,6 +398,7 @@ django-statici18n==2.5.0 # -r requirements/edx/base.txt # lti-consumer-xblock # xblock-drag-and-drop-v2 + # xblock-poll django-storages==1.14.3 # via # -r requirements/edx/base.txt @@ -455,7 +442,7 @@ djangorestframework-xml==2.0.0 # via # -r requirements/edx/base.txt # edx-enterprise -docutils==0.19 +docutils==0.21.2 # via # pydata-sphinx-theme # sphinx @@ -502,11 +489,12 @@ edx-celeryutils==1.3.0 # super-csv edx-codejail==3.4.1 # via -r requirements/edx/base.txt -edx-completion==4.6.0 +edx-completion==4.6.2 # via -r requirements/edx/base.txt edx-django-release-util==1.4.0 # via # -r requirements/edx/base.txt + # edx-submissions # edxval edx-django-sites-extensions==4.2.0 # via -r requirements/edx/base.txt @@ -555,7 +543,7 @@ edx-milestones==0.6.0 # via -r requirements/edx/base.txt edx-name-affirmation==2.3.7 # via -r requirements/edx/base.txt -edx-opaque-keys[django]==2.9.0 +edx-opaque-keys[django]==2.10.0 # via # -r requirements/edx/base.txt # edx-bulk-grades @@ -572,7 +560,7 @@ edx-opaque-keys[django]==2.9.0 # ora2 edx-organizations==6.13.0 # via -r requirements/edx/base.txt -edx-proctoring==4.17.0 +edx-proctoring==4.18.1 # via # -r requirements/edx/base.txt # edx-proctoring-proctortrack @@ -580,7 +568,7 @@ edx-rbac==1.9.0 # via # -r requirements/edx/base.txt # edx-enterprise -edx-rest-api-client==5.7.0 +edx-rest-api-client==5.6.1 # via # -r requirements/edx/base.txt # edx-enterprise @@ -589,7 +577,7 @@ edx-search==3.9.1 # via -r requirements/edx/base.txt edx-sga==0.25.0 # via -r requirements/edx/base.txt -edx-submissions==3.7.0 +edx-submissions==3.7.1 # via # -r requirements/edx/base.txt # ora2 @@ -692,14 +680,6 @@ importlib-metadata==6.11.0 # via # -c requirements/edx/../common_constraints.txt # -r requirements/edx/base.txt - # markdown - # sphinx -importlib-resources==5.13.0 - # via - # -r requirements/edx/base.txt - # jsonschema - # jsonschema-specifications - # pycountry inflection==0.5.1 # via # -r requirements/edx/base.txt @@ -822,11 +802,11 @@ markupsafe==2.1.5 # mako # openedx-calc # xblock -maxminddb==2.6.1 +maxminddb==2.6.2 # via # -r requirements/edx/base.txt # geoip2 -meilisearch==0.31.1 +meilisearch==0.31.3 # via -r requirements/edx/base.txt mistune==3.0.2 # via sphinx-mdinclude @@ -839,6 +819,10 @@ monotonic==1.6 # -r requirements/edx/base.txt # analytics-python # py2neo +more-itertools==10.3.0 + # via + # -r requirements/edx/base.txt + # cssutils mpmath==1.3.0 # via # -r requirements/edx/base.txt @@ -850,7 +834,7 @@ multidict==6.0.5 # yarl mysqlclient==2.2.4 # via -r requirements/edx/base.txt -newrelic==9.9.1 +newrelic==9.10.0 # via # -r requirements/edx/base.txt # edx-django-utils @@ -858,9 +842,9 @@ nltk==3.8.1 # via # -r requirements/edx/base.txt # chem -nodeenv==1.8.0 +nodeenv==1.9.1 # via -r requirements/edx/base.txt -numpy==1.24.4 +numpy==1.26.4 # via # -r requirements/edx/base.txt # chem @@ -881,7 +865,7 @@ openai==0.28.1 # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # edx-enterprise -openedx-atlas==0.6.0 +openedx-atlas==0.6.1 # via -r requirements/edx/base.txt openedx-calc==3.1.0 # via -r requirements/edx/base.txt @@ -918,7 +902,7 @@ optimizely-sdk==4.1.1 # -r requirements/edx/base.txt ora2==6.11.1 # via -r requirements/edx/base.txt -packaging==24.0 +packaging==24.1 # via # -r requirements/edx/base.txt # drf-yasg @@ -963,11 +947,7 @@ pillow==10.3.0 # edx-enterprise # edx-organizations # edxval -pkgutil-resolve-name==1.3.10 - # via - # -r requirements/edx/base.txt - # jsonschema -platformdirs==4.2.1 +platformdirs==4.2.2 # via # -r requirements/edx/base.txt # snowflake-connector-python @@ -975,7 +955,7 @@ polib==1.2.0 # via # -r requirements/edx/base.txt # edx-i18n-tools -prompt-toolkit==3.0.43 +prompt-toolkit==3.0.47 # via # -r requirements/edx/base.txt # click-repl @@ -991,7 +971,7 @@ pyasn1==0.6.0 # via # -r requirements/edx/base.txt # pgpy -pycountry==23.12.11 +pycountry==24.6.1 # via -r requirements/edx/base.txt pycparser==2.22 # via @@ -1003,15 +983,15 @@ pycryptodomex==3.20.0 # edx-proctoring # lti-consumer-xblock # pyjwkest -pydantic==2.7.1 +pydantic==2.7.3 # via # -r requirements/edx/base.txt # camel-converter -pydantic-core==2.18.2 +pydantic-core==2.18.4 # via # -r requirements/edx/base.txt # pydantic -pydata-sphinx-theme==0.14.4 +pydata-sphinx-theme==0.15.3 # via sphinx-book-theme pygments==2.18.0 # via @@ -1100,7 +1080,7 @@ python-slugify==8.0.4 # via # -r requirements/edx/base.txt # code-annotations -python-swiftclient==4.5.0 +python-swiftclient==4.6.0 # via # -r requirements/edx/base.txt # ora2 @@ -1113,7 +1093,6 @@ python3-saml==1.16.0 pytz==2024.1 # via # -r requirements/edx/base.txt - # babel # django-ses # djangorestframework # drf-yasg @@ -1145,7 +1124,7 @@ random2==1.0.2 # via -r requirements/edx/base.txt recommender-xblock==2.2.0 # via -r requirements/edx/base.txt -redis==5.0.4 +redis==5.0.5 # via # -r requirements/edx/base.txt # walrus @@ -1154,11 +1133,11 @@ referencing==0.35.1 # -r requirements/edx/base.txt # jsonschema # jsonschema-specifications -regex==2024.5.10 +regex==2024.5.15 # via # -r requirements/edx/base.txt # nltk -requests==2.31.0 +requests==2.32.3 # via # -r requirements/edx/base.txt # algoliasearch @@ -1201,7 +1180,7 @@ ruamel-yaml-clib==0.2.8 # via # -r requirements/edx/base.txt # ruamel-yaml -rules==3.3 +rules==3.4 # via # -r requirements/edx/base.txt # edx-enterprise @@ -1215,7 +1194,7 @@ sailthru-client==2.2.3 # via # -r requirements/edx/base.txt # edx-ace -scipy==1.10.1 +scipy==1.13.1 # via # -r requirements/edx/base.txt # chem @@ -1271,7 +1250,7 @@ smmap==5.0.1 # via gitdb snowballstemmer==2.2.0 # via sphinx -snowflake-connector-python==3.10.0 +snowflake-connector-python==3.10.1 # via # -r requirements/edx/base.txt # edx-enterprise @@ -1298,29 +1277,30 @@ soupsieve==2.5 # via # -r requirements/edx/base.txt # beautifulsoup4 -sphinx==6.2.1 +sphinx==7.3.7 # via # -r requirements/edx/doc.in # pydata-sphinx-theme # sphinx-book-theme # sphinx-design + # sphinx-mdinclude # sphinx-reredirects # sphinxcontrib-httpdomain # sphinxcontrib-openapi # sphinxext-rediraffe -sphinx-book-theme==1.0.1 +sphinx-book-theme==1.1.2 # via -r requirements/edx/doc.in -sphinx-design==0.5.0 +sphinx-design==0.6.0 # via -r requirements/edx/doc.in -sphinx-mdinclude==0.6.0 +sphinx-mdinclude==0.6.1 # via sphinxcontrib-openapi sphinx-reredirects==0.1.3 # via -r requirements/edx/doc.in -sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-applehelp==1.0.8 # via sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==1.0.6 # via sphinx -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.0.5 # via sphinx sphinxcontrib-httpdomain==1.8.1 # via sphinxcontrib-openapi @@ -1328,9 +1308,9 @@ sphinxcontrib-jsmath==1.0.1 # via sphinx sphinxcontrib-openapi[markdown]==0.8.4 # via -r requirements/edx/doc.in -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==1.0.7 # via sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==1.1.10 # via sphinx sphinxext-rediraffe==0.2.7 # via -r requirements/edx/doc.in @@ -1352,11 +1332,11 @@ super-csv==3.2.0 # via # -r requirements/edx/base.txt # edx-bulk-grades -sympy==1.12 +sympy==1.12.1 # via # -r requirements/edx/base.txt # openedx-calc -testfixtures==8.2.0 +testfixtures==8.3.0 # via # -r requirements/edx/base.txt # edx-enterprise @@ -1377,16 +1357,12 @@ tqdm==4.66.4 # -r requirements/edx/base.txt # nltk # openai -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via # -r requirements/edx/base.txt - # annotated-types - # asgiref # django-countries - # drf-spectacular # edx-opaque-keys # jwcrypto - # kombu # pydantic # pydantic-core # pydata-sphinx-theme @@ -1395,7 +1371,6 @@ typing-extensions==4.11.0 tzdata==2024.1 # via # -r requirements/edx/base.txt - # backports-zoneinfo # celery unicodecsv==0.14.1 # via @@ -1415,7 +1390,6 @@ urllib3==1.26.18 # elasticsearch # py2neo # requests - # snowflake-connector-python user-util==1.1.0 # via -r requirements/edx/base.txt vine==5.1.0 @@ -1432,7 +1406,7 @@ walrus==0.9.3 # via # -r requirements/edx/base.txt # edx-event-bus-redis -watchdog==4.0.0 +watchdog==4.0.1 # via -r requirements/edx/base.txt wcwidth==0.2.13 # via @@ -1472,18 +1446,18 @@ xblock[django]==4.0.1 # staff-graded-xblock # xblock-drag-and-drop-v2 # xblock-google-drive - # xblock-poll # xblock-utils xblock-drag-and-drop-v2==4.0.2 # via -r requirements/edx/base.txt xblock-google-drive==0.7.0 # via -r requirements/edx/base.txt -xblock-poll==1.13.0 +xblock-poll==1.14.0 # via -r requirements/edx/base.txt xblock-utils==4.0.0 # via # -r requirements/edx/base.txt # edx-sga + # xblock-poll xmlsec==1.3.13 # via # -c requirements/edx/../constraints.txt @@ -1495,11 +1469,10 @@ yarl==1.9.4 # via # -r requirements/edx/base.txt # aiohttp -zipp==3.18.1 +zipp==3.19.2 # via # -r requirements/edx/base.txt # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index e099e333ea..7699847940 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -1,16 +1,16 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # -certifi==2024.2.2 +certifi==2024.6.2 # via requests charset-normalizer==2.0.12 # via # -c requirements/edx/../constraints.txt # requests -edx-opaque-keys==2.9.0 +edx-opaque-keys==2.10.0 # via -r requirements/edx/paver.in idna==3.7 # via requests @@ -43,7 +43,7 @@ pymongo==3.13.0 # edx-opaque-keys python-memcached==1.62 # via -r requirements/edx/paver.in -requests==2.31.0 +requests==2.32.3 # via -r requirements/edx/paver.in six==1.16.0 # via @@ -53,13 +53,13 @@ stevedore==5.2.0 # via # -r requirements/edx/paver.in # edx-opaque-keys -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via edx-opaque-keys urllib3==1.26.18 # via # -c requirements/edx/../constraints.txt # requests -watchdog==4.0.0 +watchdog==4.0.1 # via -r requirements/edx/paver.in wrapt==1.16.0 # via -r requirements/edx/paver.in diff --git a/requirements/edx/semgrep.txt b/requirements/edx/semgrep.txt index e3c9ca0ce3..98c261bbd7 100644 --- a/requirements/edx/semgrep.txt +++ b/requirements/edx/semgrep.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -17,7 +17,7 @@ boltons==21.0.0 # semgrep bracex==2.4 # via wcmatch -certifi==2024.2.2 +certifi==2024.6.2 # via requests charset-normalizer==2.0.12 # via @@ -40,10 +40,6 @@ glom==22.1.0 # via semgrep idna==3.7 # via requests -importlib-resources==6.4.0 - # via - # jsonschema - # jsonschema-specifications jsonschema==4.22.0 # via semgrep jsonschema-specifications==2023.12.1 @@ -52,19 +48,17 @@ markdown-it-py==3.0.0 # via rich mdurl==0.1.2 # via markdown-it-py -packaging==24.0 +packaging==24.1 # via semgrep peewee==3.17.5 # via semgrep -pkgutil-resolve-name==1.3.10 - # via jsonschema pygments==2.18.0 # via rich referencing==0.35.1 # via # jsonschema # jsonschema-specifications -requests==2.31.0 +requests==2.32.3 # via semgrep rich==13.7.1 # via semgrep @@ -80,16 +74,12 @@ semgrep==1.52.0 # via -r requirements/edx/semgrep.in tomli==2.0.1 # via semgrep -typing-extensions==4.11.0 - # via - # rich - # semgrep +typing-extensions==4.12.2 + # via semgrep urllib3==1.26.18 # via # -c requirements/edx/../constraints.txt # requests # semgrep -wcmatch==8.5.1 +wcmatch==8.5.2 # via semgrep -zipp==3.18.1 - # via importlib-resources diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 9abf17fe0a..4aa5b3e67a 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -29,11 +29,11 @@ aniso8601==9.0.1 # via # -r requirements/edx/base.txt # edx-tincan-py35 -annotated-types==0.6.0 +annotated-types==0.7.0 # via # -r requirements/edx/base.txt # pydantic -anyio==4.3.0 +anyio==4.4.0 # via # httpx # starlette @@ -56,11 +56,6 @@ astroid==2.13.5 # via # pylint # pylint-celery -async-timeout==4.0.3 - # via - # -r requirements/edx/base.txt - # aiohttp - # redis attrs==23.2.0 # via # -r requirements/edx/base.txt @@ -80,15 +75,6 @@ backoff==1.10.0 # via # -r requirements/edx/base.txt # analytics-python -backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9" - # via - # -c requirements/edx/../constraints.txt - # -r requirements/edx/base.txt - # celery - # django - # edx-milestones - # icalendar - # kombu beautifulsoup4==4.12.3 # via # -r requirements/edx/base.txt @@ -109,13 +95,13 @@ bleach[css]==6.1.0 # xblock-poll boto==2.49.0 # via -r requirements/edx/base.txt -boto3==1.34.104 +boto3==1.34.123 # via # -r requirements/edx/base.txt # django-ses # fs-s3fs # ora2 -botocore==1.34.104 +botocore==1.34.123 # via # -r requirements/edx/base.txt # boto3 @@ -138,7 +124,7 @@ celery==5.4.0 # edx-enterprise # event-tracking # openedx-learning -certifi==2024.2.2 +certifi==2024.6.2 # via # -r requirements/edx/base.txt # elasticsearch @@ -221,13 +207,13 @@ coreschema==0.0.4 # -r requirements/edx/base.txt # coreapi # drf-yasg -coverage[toml]==7.5.1 +coverage[toml]==7.5.3 # via # -r requirements/edx/coverage.txt # pytest-cov crowdsourcehinter-xblock==0.7 # via -r requirements/edx/base.txt -cryptography==42.0.7 +cryptography==42.0.8 # via # -r requirements/edx/base.txt # django-fernet-fields-v2 @@ -243,7 +229,7 @@ cssselect==1.2.0 # via # -r requirements/edx/testing.in # pyquery -cssutils==2.10.3 +cssutils==2.11.1 # via # -r requirements/edx/base.txt # pynliner @@ -405,7 +391,7 @@ django-model-utils==4.5.1 # edxval # ora2 # super-csv -django-mptt==0.14.0 +django-mptt==0.16.0 # via # -r requirements/edx/base.txt # openedx-django-wiki @@ -432,7 +418,7 @@ django-sekizai==4.1.0 # via # -r requirements/edx/base.txt # openedx-django-wiki -django-ses==4.0.0 +django-ses==4.1.0 # via -r requirements/edx/base.txt django-simple-history==3.4.0 # via @@ -448,6 +434,7 @@ django-statici18n==2.5.0 # -r requirements/edx/base.txt # lti-consumer-xblock # xblock-drag-and-drop-v2 + # xblock-poll django-storages==1.14.3 # via # -r requirements/edx/base.txt @@ -535,11 +522,12 @@ edx-celeryutils==1.3.0 # super-csv edx-codejail==3.4.1 # via -r requirements/edx/base.txt -edx-completion==4.6.0 +edx-completion==4.6.2 # via -r requirements/edx/base.txt edx-django-release-util==1.4.0 # via # -r requirements/edx/base.txt + # edx-submissions # edxval edx-django-sites-extensions==4.2.0 # via -r requirements/edx/base.txt @@ -590,7 +578,7 @@ edx-milestones==0.6.0 # via -r requirements/edx/base.txt edx-name-affirmation==2.3.7 # via -r requirements/edx/base.txt -edx-opaque-keys[django]==2.9.0 +edx-opaque-keys[django]==2.10.0 # via # -r requirements/edx/base.txt # edx-bulk-grades @@ -607,7 +595,7 @@ edx-opaque-keys[django]==2.9.0 # ora2 edx-organizations==6.13.0 # via -r requirements/edx/base.txt -edx-proctoring==4.17.0 +edx-proctoring==4.18.1 # via # -r requirements/edx/base.txt # edx-proctoring-proctortrack @@ -615,7 +603,7 @@ edx-rbac==1.9.0 # via # -r requirements/edx/base.txt # edx-enterprise -edx-rest-api-client==5.7.0 +edx-rest-api-client==5.6.1 # via # -r requirements/edx/base.txt # edx-enterprise @@ -624,7 +612,7 @@ edx-search==3.9.1 # via -r requirements/edx/base.txt edx-sga==0.25.0 # via -r requirements/edx/base.txt -edx-submissions==3.7.0 +edx-submissions==3.7.1 # via # -r requirements/edx/base.txt # ora2 @@ -671,21 +659,15 @@ event-tracking==2.4.0 # edx-completion # edx-proctoring # edx-search -exceptiongroup==1.2.1 - # via - # anyio - # pytest execnet==2.1.1 # via pytest-xdist factory-boy==3.3.0 # via -r requirements/edx/testing.in -faker==25.2.0 +faker==25.8.0 # via factory-boy fastapi==0.111.0 - # via - # fastapi-cli - # pact-python -fastapi-cli==0.0.3 + # via pact-python +fastapi-cli==0.0.4 # via fastapi fastavro==1.9.4 # via @@ -762,14 +744,6 @@ importlib-metadata==6.11.0 # via # -c requirements/edx/../common_constraints.txt # -r requirements/edx/base.txt - # markdown - # pytest-randomly -importlib-resources==5.13.0 - # via - # -r requirements/edx/base.txt - # jsonschema - # jsonschema-specifications - # pycountry inflection==0.5.1 # via # -r requirements/edx/base.txt @@ -905,7 +879,7 @@ markupsafe==2.1.5 # mako # openedx-calc # xblock -maxminddb==2.6.1 +maxminddb==2.6.2 # via # -r requirements/edx/base.txt # geoip2 @@ -913,7 +887,7 @@ mccabe==0.7.0 # via pylint mdurl==0.1.2 # via markdown-it-py -meilisearch==0.31.1 +meilisearch==0.31.3 # via -r requirements/edx/base.txt mock==5.1.0 # via -r requirements/edx/base.txt @@ -924,6 +898,10 @@ monotonic==1.6 # -r requirements/edx/base.txt # analytics-python # py2neo +more-itertools==10.3.0 + # via + # -r requirements/edx/base.txt + # cssutils mpmath==1.3.0 # via # -r requirements/edx/base.txt @@ -935,7 +913,7 @@ multidict==6.0.5 # yarl mysqlclient==2.2.4 # via -r requirements/edx/base.txt -newrelic==9.9.1 +newrelic==9.10.0 # via # -r requirements/edx/base.txt # edx-django-utils @@ -943,9 +921,9 @@ nltk==3.8.1 # via # -r requirements/edx/base.txt # chem -nodeenv==1.8.0 +nodeenv==1.9.1 # via -r requirements/edx/base.txt -numpy==1.24.4 +numpy==1.26.4 # via # -r requirements/edx/base.txt # chem @@ -966,7 +944,7 @@ openai==0.28.1 # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # edx-enterprise -openedx-atlas==0.6.0 +openedx-atlas==0.6.1 # via -r requirements/edx/base.txt openedx-calc==3.1.0 # via -r requirements/edx/base.txt @@ -1003,9 +981,9 @@ optimizely-sdk==4.1.1 # -r requirements/edx/base.txt ora2==6.11.1 # via -r requirements/edx/base.txt -orjson==3.10.3 +orjson==3.10.4 # via fastapi -packaging==24.0 +packaging==24.1 # via # -r requirements/edx/base.txt # drf-yasg @@ -1051,11 +1029,7 @@ pillow==10.3.0 # edx-enterprise # edx-organizations # edxval -pkgutil-resolve-name==1.3.10 - # via - # -r requirements/edx/base.txt - # jsonschema -platformdirs==4.2.1 +platformdirs==4.2.2 # via # -r requirements/edx/base.txt # pylint @@ -1073,7 +1047,7 @@ polib==1.2.0 # -r requirements/edx/base.txt # -r requirements/edx/testing.in # edx-i18n-tools -prompt-toolkit==3.0.43 +prompt-toolkit==3.0.47 # via # -r requirements/edx/base.txt # click-repl @@ -1097,7 +1071,7 @@ pycodestyle==2.8.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.in -pycountry==23.12.11 +pycountry==24.6.1 # via -r requirements/edx/base.txt pycparser==2.22 # via @@ -1109,12 +1083,12 @@ pycryptodomex==3.20.0 # edx-proctoring # lti-consumer-xblock # pyjwkest -pydantic==2.7.1 +pydantic==2.7.3 # via # -r requirements/edx/base.txt # camel-converter # fastapi -pydantic-core==2.18.2 +pydantic-core==2.18.4 # via # -r requirements/edx/base.txt # pydantic @@ -1203,7 +1177,7 @@ pysrt==1.1.2 # via # -r requirements/edx/base.txt # edxval -pytest==8.2.0 +pytest==8.2.2 # via # -r requirements/edx/testing.in # pylint-pytest @@ -1259,7 +1233,7 @@ python-slugify==8.0.4 # via # -r requirements/edx/base.txt # code-annotations -python-swiftclient==4.5.0 +python-swiftclient==4.6.0 # via # -r requirements/edx/base.txt # ora2 @@ -1272,7 +1246,6 @@ python3-saml==1.16.0 pytz==2024.1 # via # -r requirements/edx/base.txt - # babel # django-ses # djangorestframework # drf-yasg @@ -1304,7 +1277,7 @@ random2==1.0.2 # via -r requirements/edx/base.txt recommender-xblock==2.2.0 # via -r requirements/edx/base.txt -redis==5.0.4 +redis==5.0.5 # via # -r requirements/edx/base.txt # walrus @@ -1313,11 +1286,11 @@ referencing==0.35.1 # -r requirements/edx/base.txt # jsonschema # jsonschema-specifications -regex==2024.5.10 +regex==2024.5.15 # via # -r requirements/edx/base.txt # nltk -requests==2.31.0 +requests==2.32.3 # via # -r requirements/edx/base.txt # algoliasearch @@ -1362,7 +1335,7 @@ ruamel-yaml-clib==0.2.8 # via # -r requirements/edx/base.txt # ruamel-yaml -rules==3.3 +rules==3.4 # via # -r requirements/edx/base.txt # edx-enterprise @@ -1376,7 +1349,7 @@ sailthru-client==2.2.3 # via # -r requirements/edx/base.txt # edx-ace -scipy==1.10.1 +scipy==1.13.1 # via # -r requirements/edx/base.txt # chem @@ -1437,7 +1410,7 @@ sniffio==1.3.1 # via # anyio # httpx -snowflake-connector-python==3.10.0 +snowflake-connector-python==3.10.1 # via # -r requirements/edx/base.txt # edx-enterprise @@ -1484,11 +1457,11 @@ super-csv==3.2.0 # via # -r requirements/edx/base.txt # edx-bulk-grades -sympy==1.12 +sympy==1.12.1 # via # -r requirements/edx/base.txt # openedx-calc -testfixtures==8.2.0 +testfixtures==8.3.0 # via # -r requirements/edx/base.txt # -r requirements/edx/testing.in @@ -1501,20 +1474,12 @@ tinycss2==1.2.1 # via # -r requirements/edx/base.txt # bleach -tomli==2.0.1 - # via - # coverage - # import-linter - # pylint - # pyproject-api - # pytest - # tox tomlkit==0.12.5 # via # -r requirements/edx/base.txt # pylint # snowflake-connector-python -tox==4.15.0 +tox==4.15.1 # via -r requirements/edx/testing.in tqdm==4.66.4 # via @@ -1523,35 +1488,23 @@ tqdm==4.66.4 # openai typer==0.12.3 # via fastapi-cli -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via # -r requirements/edx/base.txt - # annotated-types - # anyio - # asgiref - # astroid # django-countries - # drf-spectacular # edx-opaque-keys # fastapi # grimp # import-linter # jwcrypto - # kombu - # pact-python # pydantic # pydantic-core - # pylint # pylti1p3 - # rich # snowflake-connector-python - # starlette # typer - # uvicorn tzdata==2024.1 # via # -r requirements/edx/base.txt - # backports-zoneinfo # celery ujson==5.10.0 # via fastapi @@ -1575,13 +1528,11 @@ urllib3==1.26.18 # elasticsearch # py2neo # requests - # snowflake-connector-python user-util==1.1.0 # via -r requirements/edx/base.txt -uvicorn[standard]==0.29.0 +uvicorn[standard]==0.30.1 # via # fastapi - # fastapi-cli # pact-python uvloop==0.19.0 # via uvicorn @@ -1601,9 +1552,9 @@ walrus==0.9.3 # via # -r requirements/edx/base.txt # edx-event-bus-redis -watchdog==4.0.0 +watchdog==4.0.1 # via -r requirements/edx/base.txt -watchfiles==0.21.0 +watchfiles==0.22.0 # via uvicorn wcwidth==0.2.13 # via @@ -1647,18 +1598,18 @@ xblock[django]==4.0.1 # staff-graded-xblock # xblock-drag-and-drop-v2 # xblock-google-drive - # xblock-poll # xblock-utils xblock-drag-and-drop-v2==4.0.2 # via -r requirements/edx/base.txt xblock-google-drive==0.7.0 # via -r requirements/edx/base.txt -xblock-poll==1.13.0 +xblock-poll==1.14.0 # via -r requirements/edx/base.txt xblock-utils==4.0.0 # via # -r requirements/edx/base.txt # edx-sga + # xblock-poll xmlsec==1.3.13 # via # -c requirements/edx/../constraints.txt @@ -1671,11 +1622,10 @@ yarl==1.9.4 # -r requirements/edx/base.txt # aiohttp # pact-python -zipp==3.18.1 +zipp==3.19.2 # via # -r requirements/edx/base.txt # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 4b631a73d7..3630835e94 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -10,11 +10,7 @@ click==8.1.6 # via # -c requirements/constraints.txt # pip-tools -importlib-metadata==6.11.0 - # via - # -c requirements/common_constraints.txt - # build -packaging==24.0 +packaging==24.1 # via build pip-tools==7.4.1 # via -r requirements/pip-tools.in @@ -22,14 +18,8 @@ pyproject-hooks==1.1.0 # via # build # pip-tools -tomli==2.0.1 - # via - # build - # pip-tools wheel==0.43.0 # via pip-tools -zipp==3.18.1 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/pip.txt b/requirements/pip.txt index e3ffcc7b6d..78af7cdafd 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -10,5 +10,5 @@ wheel==0.43.0 # The following packages are considered to be unsafe in a requirements file: pip==24.0 # via -r requirements/pip.in -setuptools==69.5.1 +setuptools==70.0.0 # via -r requirements/pip.in diff --git a/scripts/structures_pruning/requirements/base.txt b/scripts/structures_pruning/requirements/base.txt index dcf9fe1eb0..87aa858e9f 100644 --- a/scripts/structures_pruning/requirements/base.txt +++ b/scripts/structures_pruning/requirements/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -11,7 +11,7 @@ click==8.1.6 # click-log click-log==0.4.0 # via -r scripts/structures_pruning/requirements/base.in -edx-opaque-keys==2.9.0 +edx-opaque-keys==2.10.0 # via -r scripts/structures_pruning/requirements/base.in pbr==6.0.0 # via stevedore @@ -22,5 +22,5 @@ pymongo==3.13.0 # edx-opaque-keys stevedore==5.2.0 # via edx-opaque-keys -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via edx-opaque-keys diff --git a/scripts/structures_pruning/requirements/testing.txt b/scripts/structures_pruning/requirements/testing.txt index 12c5d2dbda..2590ca8ca5 100644 --- a/scripts/structures_pruning/requirements/testing.txt +++ b/scripts/structures_pruning/requirements/testing.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -12,13 +12,11 @@ click-log==0.4.0 # via -r scripts/structures_pruning/requirements/base.txt ddt==1.7.2 # via -r scripts/structures_pruning/requirements/testing.in -edx-opaque-keys==2.9.0 +edx-opaque-keys==2.10.0 # via -r scripts/structures_pruning/requirements/base.txt -exceptiongroup==1.2.1 - # via pytest iniconfig==2.0.0 # via pytest -packaging==24.0 +packaging==24.1 # via pytest pbr==6.0.0 # via @@ -30,15 +28,13 @@ pymongo==3.13.0 # via # -r scripts/structures_pruning/requirements/base.txt # edx-opaque-keys -pytest==8.2.0 +pytest==8.2.2 # via -r scripts/structures_pruning/requirements/testing.in stevedore==5.2.0 # via # -r scripts/structures_pruning/requirements/base.txt # edx-opaque-keys -tomli==2.0.1 - # via pytest -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via # -r scripts/structures_pruning/requirements/base.txt # edx-opaque-keys diff --git a/scripts/user_retirement/requirements/base.txt b/scripts/user_retirement/requirements/base.txt index 8164ea76ed..da08ad4989 100644 --- a/scripts/user_retirement/requirements/base.txt +++ b/scripts/user_retirement/requirements/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -10,19 +10,15 @@ attrs==23.2.0 # via zeep backoff==2.2.1 # via -r scripts/user_retirement/requirements/base.in -backports-zoneinfo==0.2.1 ; python_version < "3.9" - # via - # -c scripts/user_retirement/requirements/../../../requirements/constraints.txt - # django -boto3==1.34.104 +boto3==1.34.123 # via -r scripts/user_retirement/requirements/base.in -botocore==1.34.104 +botocore==1.34.123 # via # boto3 # s3transfer cachetools==5.3.3 # via google-auth -certifi==2024.2.2 +certifi==2024.6.2 # via requests cffi==1.16.0 # via @@ -37,7 +33,7 @@ click==8.1.6 # -c scripts/user_retirement/requirements/../../../requirements/constraints.txt # -r scripts/user_retirement/requirements/base.in # edx-django-utils -cryptography==42.0.7 +cryptography==42.0.8 # via pyjwt django==4.2.13 # via @@ -56,16 +52,16 @@ edx-rest-api-client==5.7.0 # via -r scripts/user_retirement/requirements/base.in google-api-core==2.19.0 # via google-api-python-client -google-api-python-client==2.129.0 +google-api-python-client==2.133.0 # via -r scripts/user_retirement/requirements/base.in -google-auth==2.29.0 +google-auth==2.30.0 # via # google-api-core # google-api-python-client # google-auth-httplib2 google-auth-httplib2==0.2.0 # via google-api-python-client -googleapis-common-protos==1.63.0 +googleapis-common-protos==1.63.1 # via google-api-core httplib2==0.22.0 # via @@ -85,13 +81,13 @@ lxml==4.9.4 # via # -c scripts/user_retirement/requirements/../../../requirements/constraints.txt # zeep -more-itertools==10.2.0 +more-itertools==10.3.0 # via simple-salesforce -newrelic==9.9.1 +newrelic==9.10.0 # via edx-django-utils pbr==6.0.0 # via stevedore -platformdirs==4.2.1 +platformdirs==4.2.2 # via zeep proto-plus==1.23.0 # via google-api-core @@ -137,7 +133,7 @@ requests==2.31.0 # simple-salesforce # slumber # zeep -requests-file==2.0.0 +requests-file==2.1.0 # via zeep requests-toolbelt==1.0.0 # via zeep @@ -160,10 +156,8 @@ sqlparse==0.5.0 # via django stevedore==5.2.0 # via edx-django-utils -typing-extensions==4.11.0 - # via - # asgiref - # simple-salesforce +typing-extensions==4.12.2 + # via simple-salesforce unicodecsv==0.14.1 # via -r scripts/user_retirement/requirements/base.in uritemplate==4.1.1 diff --git a/scripts/user_retirement/requirements/testing.txt b/scripts/user_retirement/requirements/testing.txt index ddce3e0147..c009f8ec8a 100644 --- a/scripts/user_retirement/requirements/testing.txt +++ b/scripts/user_retirement/requirements/testing.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -14,15 +14,11 @@ attrs==23.2.0 # zeep backoff==2.2.1 # via -r scripts/user_retirement/requirements/base.txt -backports-zoneinfo==0.2.1 ; python_version < "3.9" - # via - # -r scripts/user_retirement/requirements/base.txt - # django -boto3==1.34.104 +boto3==1.34.123 # via # -r scripts/user_retirement/requirements/base.txt # moto -botocore==1.34.104 +botocore==1.34.123 # via # -r scripts/user_retirement/requirements/base.txt # boto3 @@ -32,7 +28,7 @@ cachetools==5.3.3 # via # -r scripts/user_retirement/requirements/base.txt # google-auth -certifi==2024.2.2 +certifi==2024.6.2 # via # -r scripts/user_retirement/requirements/base.txt # requests @@ -49,7 +45,7 @@ click==8.1.6 # via # -r scripts/user_retirement/requirements/base.txt # edx-django-utils -cryptography==42.0.7 +cryptography==42.0.8 # via # -r scripts/user_retirement/requirements/base.txt # moto @@ -76,15 +72,13 @@ edx-django-utils==5.14.2 # edx-rest-api-client edx-rest-api-client==5.7.0 # via -r scripts/user_retirement/requirements/base.txt -exceptiongroup==1.2.1 - # via pytest google-api-core==2.19.0 # via # -r scripts/user_retirement/requirements/base.txt # google-api-python-client -google-api-python-client==2.129.0 +google-api-python-client==2.133.0 # via -r scripts/user_retirement/requirements/base.txt -google-auth==2.29.0 +google-auth==2.30.0 # via # -r scripts/user_retirement/requirements/base.txt # google-api-core @@ -94,7 +88,7 @@ google-auth-httplib2==0.2.0 # via # -r scripts/user_retirement/requirements/base.txt # google-api-python-client -googleapis-common-protos==1.63.0 +googleapis-common-protos==1.63.1 # via # -r scripts/user_retirement/requirements/base.txt # google-api-core @@ -132,23 +126,23 @@ markupsafe==2.1.5 # werkzeug mock==5.1.0 # via -r scripts/user_retirement/requirements/testing.in -more-itertools==10.2.0 +more-itertools==10.3.0 # via # -r scripts/user_retirement/requirements/base.txt # simple-salesforce moto==4.2.14 # via -r scripts/user_retirement/requirements/testing.in -newrelic==9.9.1 +newrelic==9.10.0 # via # -r scripts/user_retirement/requirements/base.txt # edx-django-utils -packaging==24.0 +packaging==24.1 # via pytest pbr==6.0.0 # via # -r scripts/user_retirement/requirements/base.txt # stevedore -platformdirs==4.2.1 +platformdirs==4.2.2 # via # -r scripts/user_retirement/requirements/base.txt # zeep @@ -194,7 +188,7 @@ pyparsing==3.1.2 # via # -r scripts/user_retirement/requirements/base.txt # httplib2 -pytest==8.2.0 +pytest==8.2.2 # via -r scripts/user_retirement/requirements/testing.in python-dateutil==2.9.0.post0 # via @@ -224,7 +218,7 @@ requests==2.31.0 # simple-salesforce # slumber # zeep -requests-file==2.0.0 +requests-file==2.1.0 # via # -r scripts/user_retirement/requirements/base.txt # zeep @@ -234,7 +228,7 @@ requests-toolbelt==1.0.0 # via # -r scripts/user_retirement/requirements/base.txt # zeep -responses==0.25.0 +responses==0.25.2 # via # -r scripts/user_retirement/requirements/testing.in # moto @@ -268,12 +262,9 @@ stevedore==5.2.0 # via # -r scripts/user_retirement/requirements/base.txt # edx-django-utils -tomli==2.0.1 - # via pytest -typing-extensions==4.11.0 +typing-extensions==4.12.2 # via # -r scripts/user_retirement/requirements/base.txt - # asgiref # simple-salesforce unicodecsv==0.14.1 # via -r scripts/user_retirement/requirements/base.txt diff --git a/scripts/xblock/requirements.txt b/scripts/xblock/requirements.txt index 241676ac91..af62756937 100644 --- a/scripts/xblock/requirements.txt +++ b/scripts/xblock/requirements.txt @@ -1,10 +1,10 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # -certifi==2024.2.2 +certifi==2024.6.2 # via requests charset-normalizer==2.0.12 # via @@ -12,7 +12,7 @@ charset-normalizer==2.0.12 # requests idna==3.7 # via requests -requests==2.31.0 +requests==2.32.3 # via -r scripts/xblock/requirements.in urllib3==1.26.18 # via From 221e333154ac4baf23b31926ad5200c94ec4af17 Mon Sep 17 00:00:00 2001 From: Yusuf Musleh Date: Tue, 11 Jun 2024 21:15:25 +0300 Subject: [PATCH 8/9] feat: Use default pagination class for v2 library views (#34879) This ensures `num_pages` is included in paginated response. --- .../tests/test_content_libraries.py | 4 +- .../djangoapps/content_libraries/views.py | 38 +++++++++---------- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py b/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py index 67933f2964..06588c13f9 100644 --- a/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py +++ b/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py @@ -137,7 +137,7 @@ class ContentLibrariesTestCase(ContentLibrariesRestApiTest, OpenEdxEventsTestMix } @skip("This endpoint shouldn't support num_blocks and has_unpublished_*.") - @patch("openedx.core.djangoapps.content_libraries.views.LibraryApiPagination.page_size", new=2) + @patch("openedx.core.djangoapps.content_libraries.views.LibraryRootView.pagination_class.page_size", new=2) def test_list_library(self): """ Test the /libraries API and its pagination @@ -374,7 +374,7 @@ class ContentLibrariesTestCase(ContentLibrariesRestApiTest, OpenEdxEventsTestMix assert 'resources' in fragment assert 'Hello world!' in fragment['content'] - @patch("openedx.core.djangoapps.content_libraries.views.LibraryApiPagination.page_size", new=2) + @patch("openedx.core.djangoapps.content_libraries.views.LibraryBlocksView.pagination_class.page_size", new=2) def test_list_library_blocks(self): """ Test the /libraries/{lib_key_str}/blocks API and its pagination diff --git a/openedx/core/djangoapps/content_libraries/views.py b/openedx/core/djangoapps/content_libraries/views.py index 38f3e7efd6..78bc5ac205 100644 --- a/openedx/core/djangoapps/content_libraries/views.py +++ b/openedx/core/djangoapps/content_libraries/views.py @@ -90,11 +90,11 @@ from organizations.exceptions import InvalidOrganizationException from organizations.models import Organization from rest_framework import status from rest_framework.exceptions import NotFound, PermissionDenied, ValidationError -from rest_framework.pagination import PageNumberPagination +from rest_framework.generics import GenericAPIView from rest_framework.parsers import MultiPartParser from rest_framework.response import Response from rest_framework.views import APIView -from rest_framework.viewsets import ViewSet +from rest_framework.viewsets import GenericViewSet from openedx.core.djangoapps.content_libraries import api, permissions from openedx.core.djangoapps.content_libraries.serializers import ( @@ -153,13 +153,10 @@ def convert_exceptions(fn): return wrapped_fn -class LibraryApiPagination(PageNumberPagination): +class LibraryApiPaginationDocs: """ - Paginates over ContentLibraryMetadata objects. + API docs for query params related to paginating ContentLibraryMetadata objects. """ - page_size = 50 - page_size_query_param = 'page_size' - apidoc_params = [ apidocs.query_parameter( 'pagination', @@ -181,14 +178,14 @@ class LibraryApiPagination(PageNumberPagination): @method_decorator(non_atomic_requests, name="dispatch") @view_auth_classes() -class LibraryRootView(APIView): +class LibraryRootView(GenericAPIView): """ Views to list, search for, and create content libraries. """ @apidocs.schema( parameters=[ - *LibraryApiPagination.apidoc_params, + *LibraryApiPaginationDocs.apidoc_params, apidocs.query_parameter( 'org', str, @@ -211,21 +208,20 @@ class LibraryRootView(APIView): library_type = serializer.validated_data['type'] text_search = serializer.validated_data['text_search'] - paginator = LibraryApiPagination() queryset = api.get_libraries_for_user( request.user, org=org, library_type=library_type, text_search=text_search, ) - paginated_qs = paginator.paginate_queryset(queryset, request) + paginated_qs = self.paginate_queryset(queryset) result = api.get_metadata(paginated_qs) serializer = ContentLibraryMetadataSerializer(result, many=True) # Verify `pagination` param to maintain compatibility with older # non pagination-aware clients if request.GET.get('pagination', 'false').lower() == 'true': - return paginator.get_paginated_response(serializer.data) + return self.get_paginated_response(serializer.data) return Response(serializer.data) def post(self, request): @@ -506,13 +502,14 @@ class LibraryCommitView(APIView): @method_decorator(non_atomic_requests, name="dispatch") @view_auth_classes() -class LibraryBlocksView(APIView): +class LibraryBlocksView(GenericAPIView): """ Views to work with XBlocks in a specific content library. """ + @apidocs.schema( parameters=[ - *LibraryApiPagination.apidoc_params, + *LibraryApiPaginationDocs.apidoc_params, apidocs.query_parameter( 'text_search', str, @@ -538,13 +535,12 @@ class LibraryBlocksView(APIView): api.require_permission_for_library_key(key, request.user, permissions.CAN_VIEW_THIS_CONTENT_LIBRARY) components = api.get_library_components(key, text_search=text_search, block_types=block_types) - paginator = LibraryApiPagination() paginated_xblock_metadata = [ api.LibraryXBlockMetadata.from_component(key, component) - for component in paginator.paginate_queryset(components, request) + for component in self.paginate_queryset(components) ] serializer = LibraryXBlockMetadataSerializer(paginated_xblock_metadata, many=True) - return paginator.get_paginated_response(serializer.data) + return self.get_paginated_response(serializer.data) @convert_exceptions def post(self, request, lib_key_str): @@ -742,7 +738,7 @@ class LibraryBlockAssetView(APIView): @method_decorator(non_atomic_requests, name="dispatch") @view_auth_classes() -class LibraryImportTaskViewSet(ViewSet): +class LibraryImportTaskViewSet(GenericViewSet): """ Import blocks from Courseware through modulestore. """ @@ -760,9 +756,9 @@ class LibraryImportTaskViewSet(ViewSet): ) queryset = api.ContentLibrary.objects.get_by_key(library_key).import_tasks result = ContentLibraryBlockImportTaskSerializer(queryset, many=True).data - paginator = LibraryApiPagination() - return paginator.get_paginated_response( - paginator.paginate_queryset(result, request) + + return self.get_paginated_response( + self.paginate_queryset(result) ) @convert_exceptions From 6d053bef1eb79beb224bbd72ab9258565e8d2309 Mon Sep 17 00:00:00 2001 From: sameeramin <35958006+sameeramin@users.noreply.github.com> Date: Wed, 12 Jun 2024 04:35:01 +0000 Subject: [PATCH 9/9] feat: Upgrade Python dependency edx-enterprise Adds new fields enable_learner_portal_sidebar_message and learner_portal_sidebar_content in EnterpriseCustomer. Commit generated by workflow `openedx/edx-platform/.github/workflows/upgrade-one-python-dependency.yml@refs/heads/master` --- requirements/constraints.txt | 2 +- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/doc.txt | 2 +- requirements/edx/testing.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 226ffe7c3f..a434033d78 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -23,7 +23,7 @@ click>=8.0,<9.0 # The team that owns this package will manually bump this package rather than having it pulled in automatically. # This is to allow them to better control its deployment and to do it in a process that works better # for them. -edx-enterprise==4.19.16 +edx-enterprise==4.19.17 # Stay on LTS version, remove once this is added to common constraint Django<5.0 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 53d2350191..ceca9c318a 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -454,7 +454,7 @@ edx-drf-extensions==10.3.0 # edx-when # edxval # openedx-learning -edx-enterprise==4.19.16 +edx-enterprise==4.19.17 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/kernel.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 696a7e0ae3..8304489195 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -729,7 +729,7 @@ edx-drf-extensions==10.3.0 # edx-when # edxval # openedx-learning -edx-enterprise==4.19.16 +edx-enterprise==4.19.17 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 35a6c945e7..0a57b39029 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -526,7 +526,7 @@ edx-drf-extensions==10.3.0 # edx-when # edxval # openedx-learning -edx-enterprise==4.19.16 +edx-enterprise==4.19.17 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 4aa5b3e67a..5c9ab466b9 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -559,7 +559,7 @@ edx-drf-extensions==10.3.0 # edx-when # edxval # openedx-learning -edx-enterprise==4.19.16 +edx-enterprise==4.19.17 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt