Merge branch 'master' into update-django-storages

openedx-unsupported · Oct 5, 2023 · 2f4f9c9 · 2f4f9c9
2 parents 6a3dcb3 + b4cda26
commit 2f4f9c9
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 20 deletions.
diff --git a/registrar/apps/api/v3/views.py b/registrar/apps/api/v3/views.py
@@ -3,7 +3,6 @@
 """
 import logging
 
-from edx_api_doc_tools import query_parameter, schema_for
 from edx_rest_framework_extensions.auth.jwt.authentication import (
     JwtAuthentication,
 )
@@ -20,24 +19,7 @@
 
 logger = logging.getLogger(__name__)
 
-SCHEMA_COMMON_RESPONSES = {
-    401: 'User is not authenticated.',
-    405: 'HTTP method not supported on this path.'
-}
-
-
-@schema_for(
-    'get',
-    parameters=[
-        query_parameter('org_key', str, 'Organization filter'),
-        query_parameter('user_has_perm', str, 'Permission filter'),
-    ],
-    responses={
-        403: 'User lacks access to organization.',
-        404: 'Organization does not exist.',
-        **SCHEMA_COMMON_RESPONSES,
-    },
-)
+
 class ProgramListPaginationView(ProgramListView, TrackViewMixin, ListAPIView):
     """
     A view for listing program objects.

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/devstack.txt b/requirements/devstack.txt
@@ -404,6 +404,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

diff --git a/requirements/monitoring/requirements.txt b/requirements/monitoring/requirements.txt
@@ -647,6 +647,10 @@ pylint-plugin-utils==0.8.2
     #   -r requirements/monitoring/../test.txt
     #   pylint-celery
     #   pylint-django
+pymemcache==4.0.0
+    # via
+    #   -r requirements/monitoring/../devstack.txt
+    #   -r requirements/monitoring/../production.txt
 pymongo==3.13.0
     # via
     #   -r requirements/monitoring/../devstack.txt

diff --git a/requirements/nonlocal.in b/requirements/nonlocal.in
@@ -3,3 +3,4 @@
 
 mysqlclient
 python-memcached
+pymemcache
diff --git a/requirements/nonlocal.txt b/requirements/nonlocal.txt
@@ -6,6 +6,8 @@
 #
 mysqlclient==2.2.0
     # via -r requirements/nonlocal.in
+pymemcache==4.0.0
+    # via -r requirements/nonlocal.in
 python-memcached==1.59
     # via -r requirements/nonlocal.in
 six==1.16.0

diff --git a/requirements/production.txt b/requirements/production.txt
@@ -221,6 +221,8 @@ pyjwt[crypto]==2.8.0
     #   edx-drf-extensions
     #   edx-rest-api-client
     #   social-auth-core
+pymemcache==4.0.0
+    # via -r requirements/nonlocal.txt
 pymongo==3.13.0
     # via
     #   -r requirements/base.txt