Skip to content

Commit

Permalink
Merge branch 'master' into huniafatima/deprecate-edx-sphinx-theme
Browse files Browse the repository at this point in the history
  • Loading branch information
huniafatima-arbi authored Oct 30, 2024
2 parents 599d0fc + 26e8748 commit cc48111
Show file tree
Hide file tree
Showing 9 changed files with 198 additions and 183 deletions.
2 changes: 2 additions & 0 deletions designer/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
MIDDLEWARE = (
'edx_django_utils.monitoring.CookieMonitoringMiddleware',
'edx_django_utils.monitoring.DeploymentMonitoringMiddleware',
'edx_django_utils.cache.middleware.RequestCacheMiddleware',
'waffle.middleware.WaffleMiddleware',
'wagtail.contrib.redirects.middleware.RedirectMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
Expand All @@ -78,6 +79,7 @@
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'social_django.middleware.SocialAuthExceptionMiddleware',
'edx_rest_framework_extensions.middleware.RequestCustomAttributesMiddleware',
)

ROOT_URLCONF = 'designer.urls'
Expand Down
40 changes: 20 additions & 20 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ asgiref==3.8.1
# django-cors-headers
beautifulsoup4==4.12.3
# via wagtail
boto3==1.35.14
boto3==1.35.45
# via -r requirements/base.in
botocore==1.35.14
botocore==1.35.45
# via
# boto3
# s3transfer
Expand All @@ -24,11 +24,11 @@ cffi==1.17.1
# via
# cryptography
# pynacl
charset-normalizer==3.3.2
charset-normalizer==3.4.0
# via requests
click==8.1.7
# via edx-django-utils
cryptography==43.0.1
cryptography==43.0.3
# via
# pyjwt
# social-auth-core
Expand Down Expand Up @@ -63,7 +63,7 @@ django==4.2.16
# laces
# social-auth-app-django
# wagtail
django-cors-headers==4.4.0
django-cors-headers==4.5.0
# via -r requirements/base.in
django-crum==0.7.9
# via edx-django-utils
Expand Down Expand Up @@ -94,23 +94,23 @@ djangorestframework==3.15.2
# edx-api-doc-tools
# edx-drf-extensions
# wagtail
dnspython==2.6.1
dnspython==2.7.0
# via pymongo
draftjs-exporter==5.0.0
# via wagtail
drf-jwt==1.19.2
# via edx-drf-extensions
drf-yasg==1.21.7
drf-yasg==1.21.8
# via
# -r requirements/base.in
# edx-api-doc-tools
edx-api-doc-tools==1.8.0
edx-api-doc-tools==2.0.0
# via -r requirements/base.in
edx-auth-backends==4.3.0
edx-auth-backends==4.4.0
# via -r requirements/base.in
edx-django-release-util==1.4.0
# via -r requirements/base.in
edx-django-utils==5.15.0
edx-django-utils==7.0.0
# via
# -r requirements/base.in
# edx-drf-extensions
Expand All @@ -127,7 +127,7 @@ et-xmlfile==1.1.0
# via openpyxl
filetype==1.2.0
# via willow
idna==3.8
idna==3.10
# via requests
inflect==7.4.0
# via -r requirements/base.in
Expand All @@ -145,9 +145,9 @@ mock==5.1.0
# via -r requirements/base.in
more-itertools==10.5.0
# via inflect
mysqlclient==2.2.4
mysqlclient==2.2.5
# via -r requirements/base.in
newrelic==9.13.0
newrelic==10.2.0
# via edx-django-utils
oauthlib==3.2.2
# via
Expand All @@ -163,9 +163,9 @@ pillow==10.4.0
# via
# pillow-heif
# wagtail
pillow-heif==0.18.0
pillow-heif==0.20.0
# via willow
psutil==6.0.0
psutil==6.1.0
# via edx-django-utils
pycparser==2.22
# via cffi
Expand All @@ -176,7 +176,7 @@ pyjwt[crypto]==2.9.0
# edx-drf-extensions
# edx-rest-api-client
# social-auth-core
pymongo==4.8.0
pymongo==4.10.1
# via edx-opaque-keys
pynacl==1.5.0
# via edx-django-utils
Expand All @@ -186,7 +186,7 @@ python-dateutil==2.9.0.post0
# botocore
python3-openid==3.2.0
# via social-auth-core
pytz==2024.1
pytz==2024.2
# via
# -r requirements/base.in
# django-modelcluster
Expand All @@ -206,7 +206,7 @@ requests==2.32.3
# wagtail
requests-oauthlib==2.0.0
# via social-auth-core
s3transfer==0.10.2
s3transfer==0.10.3
# via boto3
semantic-version==2.10.0
# via edx-drf-extensions
Expand Down Expand Up @@ -250,13 +250,13 @@ urllib3==1.26.20
# -c requirements/constraints.txt
# botocore
# requests
wagtail==6.2.1
wagtail==6.2.2
# via -r requirements/base.in
willow[heif]==1.8.0
# via
# wagtail
# willow
zipp==3.20.1
zipp==3.20.2
# via -r requirements/base.in

# The following packages are considered to be unsafe in a requirements file:
Expand Down
Loading

0 comments on commit cc48111

Please sign in to comment.