Merge pull request #3442 from bjester/update-django-cte

Update django-cte to resolve query issue preventing access to API key

Author: rtibbles

contentcuration/contentcuration/apps.py

@@ -14,22 +14,3 @@ def ready(self):
         if settings.AWS_AUTO_CREATE_BUCKET and not is_gcs_backend():
             from contentcuration.utils.minio_utils import ensure_storage_bucket_public
             ensure_storage_bucket_public()
-
-        self._patch_django_cte_qjoin()
-
-    def _patch_django_cte_qjoin(self):
-        """
-        TODO Remove after the following prs/issues are resolved:
-        https://github.com/learningequality/studio/pull/3442
-        https://github.com/dimagi/django-cte/pull/60
-
-        @see fix: https://github.com/dimagi/django-cte/pull/50/files
-        """
-        from django_cte.join import QJoin
-
-        class join_field:
-            class related_model:
-                class _meta:
-                    local_concrete_fields = ()
-
-        QJoin.join_field = join_field

contentcuration/contentcuration/management/commands/runserver.py

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.6
 # To update, run:
 #
 #    pip-compile requirements-dev.in
@@ -67,14 +67,20 @@ coverage[toml]==6.2
     #   -r requirements-dev.in
     #   codecov
     #   pytest-cov
-git+https://github.com/someshchaturvedi/customizable-django-profiler.git#customizable-django-profiler
+customizable-django-profiler @ git+https://github.com/someshchaturvedi/customizable-django-profiler.git
     # via -r requirements-dev.in
 dataclasses==0.8
     # via werkzeug
 dill==0.3.4
     # via pylint
 distlib==0.3.4
     # via virtualenv
+django==3.2.13
+    # via
+    #   -c requirements.txt
+    #   django-debug-toolbar
+    #   djangorestframework
+    #   drf-yasg
 django-concurrent-test-helper==0.7.0
     # via -r requirements-dev.in
 django-debug-panel==0.8.3
@@ -83,12 +89,6 @@ django-debug-toolbar==1.9.1
     # via
     #   -r requirements-dev.in
     #   django-debug-panel
-django==3.2.13
-    # via
-    #   -c requirements.txt
-    #   django-debug-toolbar
-    #   djangorestframework
-    #   drf-yasg
 djangorestframework==3.12.4
     # via
     #   -c requirements.txt
@@ -105,15 +105,15 @@ filelock==3.4.1
     # via virtualenv
 flake8==3.4.1
     # via -r requirements-dev.in
-flask-basicauth==0.2.0
-    # via locust
-flask-cors==3.0.10
-    # via locust
 flask==2.0.3
     # via
     #   flask-basicauth
     #   flask-cors
     #   locust
+flask-basicauth==0.2.0
+    # via locust
+flask-cors==3.0.10
+    # via locust
 flower==0.9.4
     # via -r requirements-dev.in
 fonttools==4.27.1
@@ -237,10 +237,10 @@ pyflakes==1.5.0
     # via
     #   autoflake
     #   flake8
-pyinstrument-cext==0.2.4
-    # via pyinstrument
 pyinstrument==3.4.2
     # via -r requirements-dev.in
+pyinstrument-cext==0.2.4
+    # via pyinstrument
 pylint==2.13.9
     # via -r requirements-dev.in
 pyls-isort==0.2.2
@@ -253,6 +253,15 @@ pyparsing==2.4.7
     # via
     #   -c requirements.txt
     #   packaging
+pytest==6.2.5
+    # via
+    #   -r requirements-dev.in
+    #   pytest-cov
+    #   pytest-django
+    #   pytest-logging
+    #   pytest-pythonpath
+    #   pytest-timeout
+    #   pytest-watch
 pytest-cov==3.0.0
     # via -r requirements-dev.in
 pytest-django==4.5.2
@@ -265,15 +274,6 @@ pytest-timeout==2.1.0
     # via -r requirements-dev.in
 pytest-watch==4.2.0
     # via -r requirements-dev.in
-pytest==6.2.5
-    # via
-    #   -r requirements-dev.in
-    #   pytest-cov
-    #   pytest-django
-    #   pytest-logging
-    #   pytest-pythonpath
-    #   pytest-timeout
-    #   pytest-watch
 python-dateutil==2.8.1
     # via
     #   -c requirements.txt
@@ -308,10 +308,10 @@ rope==1.1.1
     # via -r requirements-dev.in
 roundrobin==0.0.2
     # via locust
-ruamel.yaml.clib==0.2.6
-    # via ruamel.yaml
 ruamel.yaml==0.17.21
     # via drf-yasg
+ruamel.yaml.clib==0.2.6
+    # via ruamel.yaml
 service-factory==0.1.6
     # via -r requirements-dev.in
 six==1.16.0
@@ -350,6 +350,7 @@ typed-ast==1.5.4
     # via astroid
 typing-extensions==4.1.1
     # via
+    #   -c requirements.txt
     #   asgiref
     #   astroid
     #   locust

requirements-dev.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.6
 # To update, run:
 #
 #    pip-compile requirements-docs.in
@@ -65,17 +65,17 @@ six==1.16.0
     #   sphinx
 snowballstemmer==2.2.0
     # via sphinx
+sphinx==1.6.4
+    # via
+    #   -r requirements-docs.in
+    #   sphinx-intl
+    #   sphinx-rtd-theme
 sphinx-autobuild==0.7.1
     # via -r requirements-docs.in
 sphinx-intl==2.0.1
     # via -r requirements-docs.in
 sphinx-rtd-theme==1.0.0
     # via -r requirements-docs.in
-sphinx==1.6.4
-    # via
-    #   -r requirements-docs.in
-    #   sphinx-intl
-    #   sphinx-rtd-theme
 sphinxcontrib-serializinghtml==1.1.5
     # via sphinxcontrib-websupport
 sphinxcontrib-websupport==1.2.4

requirements-docs.txt

@@ -1,5 +1,5 @@
 attrs==19.3.0
-django-cte==1.1.5
+django-cte==1.2.1
 django-mptt==0.11.0
 django-filter==2.4.0
 djangorestframework==3.12.4

requirements.in

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.6
 # To update, run:
 #
 #    pip-compile requirements.in
@@ -54,7 +54,7 @@ django==3.2.13
     #   jsonfield
 django-bulk-update==2.2.0
     # via -r requirements.in
-django-cte==1.1.5
+django-cte==1.2.1
     # via -r requirements.in
 django-db-readonly==0.7.0
     # via -r requirements.in
@@ -151,7 +151,10 @@ httplib2==0.19.1
 idna==2.10
     # via requests
 importlib-metadata==1.7.0
-    # via -r requirements.in
+    # via
+    #   -r requirements.in
+    #   jsonschema
+    #   kombu
 jmespath==0.10.0
     # via
     #   boto3
@@ -265,6 +268,8 @@ six==1.16.0
     #   python-utils
 sqlparse==0.4.1
     # via django
+typing-extensions==4.1.1
+    # via asgiref
 uritemplate==3.0.1
     # via google-api-python-client
 urllib3==1.26.5