Merge branch 'master' into add-django42

openedx-unsupported · Oct 5, 2023 · 0edfa54 · 0edfa54
2 parents a50d340 + b4cda26
commit 0edfa54
Show file tree

Hide file tree

Showing 13 changed files with 159 additions and 153 deletions.
diff --git a/registrar/settings/devstack.py b/registrar/settings/devstack.py
@@ -16,8 +16,9 @@
 
 CACHES = {
     'default': {
-        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+        'BACKEND': 'django.core.cache.backends.memcached.PyMemcacheCache',
         'LOCATION': os.environ.get('CACHE_LOCATION', 'memcached:11211'),
+        "OPTIONS": {"no_delay": True, "ignore_exc": True, "use_pooling": True},
     }
 }
 

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -29,17 +29,17 @@ cffi==1.15.1
     #   pynacl
 charset-normalizer==3.2.0
     # via requests
-click==8.1.6
+click==8.1.7
     # via edx-django-utils
-cryptography==41.0.3
+cryptography==41.0.4
     # via
     #   pyjwt
     #   social-auth-core
 defusedxml==0.7.1
     # via
     #   python3-openid
     #   social-auth-core
-django==3.2.20
+django==3.2.21
     # via
     #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
@@ -117,9 +117,9 @@ edx-django-utils==5.7.0
     # via
     #   edx-drf-extensions
     #   edx-rest-api-client
-edx-drf-extensions==8.9.0
+edx-drf-extensions==8.10.0
     # via -r requirements/base.in
-edx-opaque-keys==2.4.0
+edx-opaque-keys==2.5.1
     # via edx-drf-extensions
 edx-rest-api-client==5.6.0
     # via -r requirements/base.in
@@ -159,12 +159,10 @@ pymongo==3.13.0
 pynacl==1.5.0
     # via edx-django-utils
 python-dateutil==2.8.2
-    # via
-    #   analytics-python
-    #   edx-drf-extensions
+    # via analytics-python
 python3-openid==3.2.0
     # via social-auth-core
-pytz==2023.3
+pytz==2023.3.post1
     # via
     #   -r requirements/base.in
     #   celery
@@ -175,7 +173,7 @@ pyyaml==6.0.1
     # via
     #   drf-yasg
     #   edx-django-release-util
-redis==5.0.0
+redis==5.0.1
     # via -r requirements/base.in
 requests==2.31.0
     # via
@@ -194,11 +192,10 @@ six==1.16.0
     #   analytics-python
     #   edx-auth-backends
     #   edx-django-release-util
-    #   edx-drf-extensions
     #   python-dateutil
 slumber==0.7.1
     # via edx-rest-api-client
-social-auth-app-django==5.2.0
+social-auth-app-django==5.3.0
     # via
     #   -r requirements/base.in
     #   edx-auth-backends
@@ -212,8 +209,10 @@ stevedore==5.1.0
     # via
     #   edx-django-utils
     #   edx-opaque-keys
-typing-extensions==4.7.1
-    # via asgiref
+typing-extensions==4.8.0
+    # via
+    #   asgiref
+    #   edx-opaque-keys
 uritemplate==4.1.1
     # via drf-yasg
 urllib3==1.26.16

diff --git a/requirements/devstack.txt b/requirements/devstack.txt
@@ -22,7 +22,7 @@ asgiref==3.7.2
     # via
     #   -r requirements/local.txt
     #   django
-astroid==2.15.6
+astroid==2.15.8
     # via
     #   -r requirements/local.txt
     #   pylint
@@ -48,12 +48,12 @@ billiard==3.6.4.0
     # via
     #   -r requirements/local.txt
     #   celery
-boto3==1.28.26
+boto3==1.28.54
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/local.txt
     #   moto
-botocore==1.31.26
+botocore==1.31.54
     # via
     #   -r requirements/local.txt
     #   boto3
@@ -77,7 +77,7 @@ charset-normalizer==3.2.0
     # via
     #   -r requirements/local.txt
     #   requests
-click==8.1.6
+click==8.1.7
     # via
     #   -r requirements/local.txt
     #   click-log
@@ -97,11 +97,11 @@ configobj==5.0.8
     # via
     #   -r requirements/local.txt
     #   ruamel-yaml-cmd
-coverage[toml]==7.3.0
+coverage[toml]==7.3.1
     # via
     #   -r requirements/local.txt
     #   pytest-cov
-cryptography==41.0.3
+cryptography==41.0.4
     # via
     #   -r requirements/local.txt
     #   moto
@@ -122,7 +122,7 @@ distlib==0.3.7
     # via
     #   -r requirements/local.txt
     #   virtualenv
-django==3.2.20
+django==3.2.21
     # via
     #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
@@ -155,7 +155,7 @@ django-crum==0.7.9
     #   edx-django-utils
 django-debug-toolbar==4.2.0
     # via -r requirements/local.txt
-django-dynamic-fixture==3.1.2
+django-dynamic-fixture==4.0.1
     # via -r requirements/local.txt
 django-extensions==3.1.5
     # via
@@ -217,13 +217,13 @@ edx-django-utils==5.7.0
     #   -r requirements/local.txt
     #   edx-drf-extensions
     #   edx-rest-api-client
-edx-drf-extensions==8.9.0
+edx-drf-extensions==8.10.0
     # via -r requirements/local.txt
-edx-i18n-tools==1.1.0
+edx-i18n-tools==1.2.0
     # via -r requirements/local.txt
 edx-lint==5.3.4
     # via -r requirements/local.txt
-edx-opaque-keys==2.4.0
+edx-opaque-keys==2.5.1
     # via
     #   -r requirements/local.txt
     #   edx-drf-extensions
@@ -235,11 +235,11 @@ exceptiongroup==1.1.3
     #   pytest
 factory-boy==3.3.0
     # via -r requirements/local.txt
-faker==19.3.0
+faker==19.6.2
     # via
     #   -r requirements/local.txt
     #   factory-boy
-filelock==3.12.2
+filelock==3.12.4
     # via
     #   -r requirements/local.txt
     #   tox
@@ -306,7 +306,7 @@ monotonic==1.6
     # via
     #   -r requirements/local.txt
     #   analytics-python
-moto==4.1.14
+moto==4.2.4
     # via -r requirements/local.txt
 mysqlclient==2.2.0
     # via -r requirements/nonlocal.txt
@@ -345,7 +345,7 @@ platformdirs==3.10.0
     #   -r requirements/local.txt
     #   pylint
     #   virtualenv
-pluggy==1.2.0
+pluggy==1.3.0
     # via
     #   -r requirements/local.txt
     #   pytest
@@ -368,7 +368,7 @@ pycparser==2.21
     # via
     #   -r requirements/local.txt
     #   cffi
-pydata-sphinx-theme==0.13.3
+pydata-sphinx-theme==0.14.1
     # via
     #   -r requirements/local.txt
     #   sphinx-book-theme
@@ -386,7 +386,7 @@ pyjwt[crypto]==2.8.0
     #   edx-drf-extensions
     #   edx-rest-api-client
     #   social-auth-core
-pylint==2.17.5
+pylint==2.17.6
     # via
     #   -r requirements/local.txt
     #   edx-lint
@@ -406,6 +406,8 @@ pylint-plugin-utils==0.8.2
     #   -r requirements/local.txt
     #   pylint-celery
     #   pylint-django
+pymemcache==4.0.0
+    # via -r requirements/nonlocal.txt
 pymongo==3.13.0
     # via
     #   -r requirements/local.txt
@@ -414,7 +416,7 @@ pynacl==1.5.0
     # via
     #   -r requirements/local.txt
     #   edx-django-utils
-pytest==7.4.0
+pytest==7.4.2
     # via
     #   -r requirements/local.txt
     #   pytest-cov
@@ -428,7 +430,6 @@ python-dateutil==2.8.2
     #   -r requirements/local.txt
     #   analytics-python
     #   botocore
-    #   edx-drf-extensions
     #   faker
     #   freezegun
     #   moto
@@ -444,7 +445,7 @@ python3-openid==3.2.0
     # via
     #   -r requirements/local.txt
     #   social-auth-core
-pytz==2023.3
+pytz==2023.3.post1
     # via
     #   -r requirements/local.txt
     #   babel
@@ -462,7 +463,7 @@ pyyaml==6.0.1
     #   edx-django-release-util
     #   edx-i18n-tools
     #   yamllint
-redis==5.0.0
+redis==5.0.1
     # via -r requirements/local.txt
 requests==2.31.0
     # via
@@ -505,7 +506,7 @@ ruamel-yaml-convert==0.3.2
     # via
     #   -r requirements/local.txt
     #   ruamel-yaml-cmd
-s3transfer==0.6.1
+s3transfer==0.6.2
     # via
     #   -r requirements/local.txt
     #   boto3
@@ -519,10 +520,8 @@ six==1.16.0
     #   -r requirements/nonlocal.txt
     #   analytics-python
     #   configobj
-    #   django-dynamic-fixture
     #   edx-auth-backends
     #   edx-django-release-util
-    #   edx-drf-extensions
     #   edx-lint
     #   python-dateutil
     #   python-memcached
@@ -536,7 +535,7 @@ snowballstemmer==2.2.0
     # via
     #   -r requirements/local.txt
     #   sphinx
-social-auth-app-django==5.2.0
+social-auth-app-django==5.3.0
     # via
     #   -r requirements/local.txt
     #   edx-auth-backends
@@ -545,7 +544,7 @@ social-auth-core==4.4.2
     #   -r requirements/local.txt
     #   edx-auth-backends
     #   social-auth-app-django
-soupsieve==2.4.1
+soupsieve==2.5
     # via
     #   -r requirements/local.txt
     #   beautifulsoup4
@@ -610,11 +609,12 @@ tox==3.28.0
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/local.txt
-typing-extensions==4.7.1
+typing-extensions==4.8.0
     # via
     #   -r requirements/local.txt
     #   asgiref
     #   astroid
+    #   edx-opaque-keys
     #   faker
     #   pydata-sphinx-theme
     #   pylint
@@ -634,7 +634,7 @@ vine==1.3.0
     #   -r requirements/local.txt
     #   amqp
     #   celery
-virtualenv==20.24.3
+virtualenv==20.24.5
     # via
     #   -r requirements/local.txt
     #   tox
@@ -653,7 +653,7 @@ xmltodict==0.13.0
     #   moto
 yamllint==1.32.0
     # via -r requirements/local.txt
-zipp==3.16.2
+zipp==3.17.0
     # via
     #   -r requirements/local.txt
     #   importlib-metadata
diff --git a/requirements/django.txt b/requirements/django.txt
@@ -1 +1 @@
-django==3.2.20
+django==3.2.21
diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -36,20 +36,20 @@ packaging==23.1
     # via
     #   pydata-sphinx-theme
     #   sphinx
-pydata-sphinx-theme==0.13.3
+pydata-sphinx-theme==0.14.1
     # via sphinx-book-theme
 pygments==2.16.1
     # via
     #   accessible-pygments
     #   pydata-sphinx-theme
     #   sphinx
-pytz==2023.3
+pytz==2023.3.post1
     # via babel
 requests==2.31.0
     # via sphinx
 snowballstemmer==2.2.0
     # via sphinx
-soupsieve==2.4.1
+soupsieve==2.5
     # via beautifulsoup4
 sphinx==6.2.1
     # via
@@ -70,11 +70,11 @@ sphinxcontrib-qthelp==1.0.3
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
-typing-extensions==4.7.1
+typing-extensions==4.8.0
     # via pydata-sphinx-theme
 urllib3==1.26.16
     # via
     #   -c requirements/constraints.txt
     #   requests
-zipp==3.16.2
+zipp==3.17.0
     # via importlib-metadata