Merge branch 'master' into huniafatima/deprecate-edx-sphinx-theme

.annotation_safe_list.yml

@@ -41,6 +41,8 @@ waffle.Switch:
   ".. no_pii:": "This model has no PII"
 wagtailadmin.Admin:
   ".. no_pii:": "This model has no PII"
+wagtailadmin.EditingSession:
+  ".. no_pii:": "This model has no PII"
 wagtailcore.Collection:
   ".. no_pii:": "This model has no PII"
 wagtailcore.CollectionViewRestriction:

requirements/base.txt

@@ -17,15 +17,15 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9"
     #   djangorestframework
 beautifulsoup4==4.12.3
     # via wagtail
-boto3==1.34.151
+boto3==1.35.1
     # via -r requirements/base.in
-botocore==1.34.151
+botocore==1.35.1
     # via
     #   boto3
     #   s3transfer
 certifi==2024.7.4
     # via requests
-cffi==1.16.0
+cffi==1.17.0
     # via
     #   cryptography
     #   pynacl
@@ -42,7 +42,7 @@ defusedxml==0.8.0rc2
     #   python3-openid
     #   social-auth-core
     #   willow
-django==4.2.14
+django==4.2.15
     # via
     #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
@@ -74,7 +74,7 @@ django-crum==0.7.9
     # via edx-django-utils
 django-extensions==3.2.3
     # via -r requirements/base.in
-django-filter==24.2
+django-filter==24.3
     # via wagtail
 django-modelcluster==6.3
     # via wagtail
@@ -134,10 +134,8 @@ filetype==1.2.0
     # via willow
 idna==3.7
     # via requests
-importlib-metadata==6.11.0
-    # via
-    #   -c requirements/common_constraints.txt
-    #   typeguard
+importlib-metadata==8.3.0
+    # via typeguard
 inflect==7.3.1
     # via -r requirements/base.in
 inflection==0.5.1
@@ -152,11 +150,11 @@ laces==0.1.1
     # via wagtail
 mock==5.1.0
     # via -r requirements/base.in
-more-itertools==10.3.0
+more-itertools==10.4.0
     # via inflect
 mysqlclient==2.2.4
     # via -r requirements/base.in
-newrelic==9.12.0
+newrelic==9.13.0
     # via edx-django-utils
 oauthlib==3.2.2
     # via
@@ -178,7 +176,7 @@ psutil==6.0.0
     # via edx-django-utils
 pycparser==2.22
     # via cffi
-pyjwt[crypto]==2.8.0
+pyjwt[crypto]==2.9.0
     # via
     #   drf-jwt
     #   edx-auth-backends
@@ -201,7 +199,7 @@ pytz==2024.1
     #   django-modelcluster
     #   drf-yasg
     #   l18n
-pyyaml==6.0.1
+pyyaml==6.0.2
     # via
     #   drf-yasg
     #   edx-django-release-util
@@ -236,7 +234,7 @@ social-auth-core==4.5.4
     #   -r requirements/base.in
     #   edx-auth-backends
     #   social-auth-app-django
-soupsieve==2.5
+soupsieve==2.6
     # via beautifulsoup4
 sqlparse==0.5.1
     # via django
@@ -260,13 +258,13 @@ urllib3==1.26.19
     # via
     #   botocore
     #   requests
-wagtail==6.1.3
+wagtail==6.2
     # via -r requirements/base.in
 willow[heif]==1.8.0
     # via
     #   wagtail
     #   willow
-zipp==3.19.2
+zipp==3.20.0
     # via
     #   -r requirements/base.in
     #   importlib-metadata

requirements/common_constraints.txt

@@ -23,15 +23,6 @@ elasticsearch<7.14.0
 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
 django-simple-history==3.0.0
 
-# opentelemetry requires version 6.x at the moment:
-# https://github.com/open-telemetry/opentelemetry-python/issues/3570
-# Normally this could be added as a constraint in edx-django-utils, where we're
-# adding the opentelemetry dependency. However, when we compile pip-tools.txt,
-# that uses version 7.x, and then there's no undoing that when compiling base.txt.
-# So we need to pin it globally, for now.
-# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
-importlib-metadata<7
-
 # Cause: https://github.com/openedx/event-tracking/pull/290
 # event-tracking 2.4.1 upgrades to pymongo 4.4.0 which is not supported on edx-platform.
 # We will pin event-tracking to do not break existing installations

requirements/dev.txt

@@ -28,22 +28,22 @@ beautifulsoup4==4.12.3
     # via
     #   -r requirements/quality.txt
     #   wagtail
-boto3==1.34.151
+boto3==1.35.1
     # via -r requirements/quality.txt
-botocore==1.34.151
+botocore==1.35.1
     # via
     #   -r requirements/quality.txt
     #   boto3
     #   s3transfer
-cachetools==5.4.0
+cachetools==5.5.0
     # via
     #   -r requirements/quality.txt
     #   tox
 certifi==2024.7.4
     # via
     #   -r requirements/quality.txt
     #   requests
-cffi==1.16.0
+cffi==1.17.0
     # via
     #   -r requirements/quality.txt
     #   cryptography
@@ -76,7 +76,7 @@ colorama==0.4.6
     # via
     #   -r requirements/quality.txt
     #   tox
-coverage[toml]==7.6.0
+coverage[toml]==7.6.1
     # via
     #   -r requirements/quality.txt
     #   pytest-cov
@@ -101,7 +101,7 @@ distlib==0.3.8
     # via
     #   -r requirements/quality.txt
     #   virtualenv
-django==4.2.14
+django==4.2.15
     # via
     #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
@@ -141,7 +141,7 @@ django-dynamic-fixture==4.0.1
     # via -r requirements/quality.txt
 django-extensions==3.2.3
     # via -r requirements/quality.txt
-django-filter==24.2
+django-filter==24.3
     # via
     #   -r requirements/quality.txt
     #   wagtail
@@ -225,9 +225,9 @@ exceptiongroup==1.2.2
     # via
     #   -r requirements/quality.txt
     #   pytest
-factory-boy==3.3.0
+factory-boy==3.3.1
     # via -r requirements/quality.txt
-faker==26.0.0
+faker==27.0.0
     # via
     #   -r requirements/quality.txt
     #   factory-boy
@@ -244,9 +244,8 @@ idna==3.7
     # via
     #   -r requirements/quality.txt
     #   requests
-importlib-metadata==6.11.0
+importlib-metadata==8.3.0
     # via
-    #   -c requirements/common_constraints.txt
     #   -r requirements/quality.txt
     #   typeguard
 inflect==7.3.1
@@ -281,7 +280,7 @@ laces==0.1.1
     # via
     #   -r requirements/quality.txt
     #   wagtail
-lxml==5.2.2
+lxml==5.3.0
     # via edx-i18n-tools
 markupsafe==2.1.5
     # via
@@ -293,13 +292,13 @@ mccabe==0.7.0
     #   pylint
 mock==5.1.0
     # via -r requirements/quality.txt
-more-itertools==10.3.0
+more-itertools==10.4.0
     # via
     #   -r requirements/quality.txt
     #   inflect
 mysqlclient==2.2.4
     # via -r requirements/quality.txt
-newrelic==9.12.0
+newrelic==9.13.0
     # via
     #   -r requirements/quality.txt
     #   edx-django-utils
@@ -352,7 +351,7 @@ psutil==6.0.0
     # via
     #   -r requirements/quality.txt
     #   edx-django-utils
-pycodestyle==2.12.0
+pycodestyle==2.12.1
     # via -r requirements/quality.txt
 pycparser==2.22
     # via
@@ -362,7 +361,7 @@ pydocstyle==6.3.0
     # via -r requirements/quality.txt
 pygments==2.18.0
     # via diff-cover
-pyjwt[crypto]==2.8.0
+pyjwt[crypto]==2.9.0
     # via
     #   -r requirements/quality.txt
     #   drf-jwt
@@ -430,7 +429,7 @@ pytz==2024.1
     #   django-modelcluster
     #   drf-yasg
     #   l18n
-pyyaml==6.0.1
+pyyaml==6.0.2
     # via
     #   -r requirements/quality.txt
     #   code-annotations
@@ -483,7 +482,7 @@ social-auth-core==4.5.4
     #   -r requirements/quality.txt
     #   edx-auth-backends
     #   social-auth-app-django
-soupsieve==2.5
+soupsieve==2.6
     # via
     #   -r requirements/quality.txt
     #   beautifulsoup4
@@ -514,11 +513,11 @@ tomli==2.0.1
     #   pyproject-api
     #   pytest
     #   tox
-tomlkit==0.13.0
+tomlkit==0.13.2
     # via
     #   -r requirements/quality.txt
     #   pylint
-tox==4.16.0
+tox==4.18.0
     # via -r requirements/quality.txt
 typeguard==4.3.0
     # via
@@ -546,13 +545,13 @@ virtualenv==20.26.3
     # via
     #   -r requirements/quality.txt
     #   tox
-wagtail==6.1.3
+wagtail==6.2
     # via -r requirements/quality.txt
 willow[heif]==1.8.0
     # via
     #   -r requirements/quality.txt
     #   wagtail
-zipp==3.19.2
+zipp==3.20.0
     # via
     #   -r requirements/quality.txt
     #   importlib-metadata

requirements/django.txt

@@ -1 +1 @@
-django==4.2.14
+django==4.2.15