Revert "BOM-2844: Upgrade Xqueue to Django 3.2"

openedx · Sep 23, 2021 · 5587744 · 5587744
1 parent 592f4f5
commit 5587744
Show file tree

Hide file tree

Showing 12 changed files with 77 additions and 146 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        tox-env: [ django32 ]
+        tox-env: [ django22, django30, django31, django32 ]
 
     steps:
     - uses: actions/checkout@v2
@@ -29,7 +29,7 @@ jobs:
         docker exec xqueue bash -c "cd /edx/app/xqueue/xqueue/ && tox -e ${TOXENV}"
 
     - name: Code Coverage
-      if: matrix.tox-env=='django32'
+      if: matrix.tox-env=='django22'
       run: |
         python3.8 -m pip install -r requirements/travis.txt &&
         docker exec xqueue bash -c "cd /edx/app/xqueue/xqueue/; coverage xml" && codecov
diff --git a/Makefile b/Makefile
@@ -32,20 +32,8 @@ coverage: clean ## generate and view HTML coverage report
 	pytest --cov-report html
 	$(BROWSER) htmlcov/index.html
 
-define COMMON_CONSTRAINTS_TEMP_COMMENT
-# This is a temporary solution to override the real common_constraints.txt\n# In edx-lint, until the pyjwt constraint in edx-lint has been removed.\n# See BOM-2721 for more details.\n# Below is the copied and edited version of common_constraints\n
-endef
-
-COMMON_CONSTRAINTS_TXT=requirements/common_constraints.txt
-.PHONY: $(COMMON_CONSTRAINTS_TXT)
-$(COMMON_CONSTRAINTS_TXT):
-	wget -O "$(@)" https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt || touch "$(@)"
-	echo "$(COMMON_CONSTRAINTS_TEMP_COMMENT)" | cat - $(@) > temp && mv temp $(@)
-
 export CUSTOM_COMPILE_COMMAND = make upgrade
-upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
-	sed 's/Django<2.3//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
-	mv requirements/common_constraints.tmp requirements/common_constraints.txt
+upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
 	pip install -qr requirements/pip-tools.txt
 	# Make sure to compile files after any other files they include!
 	pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in

diff --git a/requirements.txt b/requirements.txt
@@ -1,31 +1,29 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
+# This file is autogenerated by pip-compile
 # To update, run:
 #
 #    make upgrade
 #
-asgiref==3.4.1
-    # via django
 backoff==1.11.1
     # via -r requirements/base.in
-boto3==1.18.46
+boto3==1.18.9
     # via -r requirements/base.in
-botocore==1.21.46
+botocore==1.21.9
     # via
     #   boto3
     #   s3transfer
 certifi==2021.5.30
     # via requests
-charset-normalizer==2.0.6
+charset-normalizer==2.0.3
     # via requests
-django==3.2.7
+django-storages==1.11.1
+    # via -r requirements/base.in
+django==2.2.24
     # via
-    #   -c requirements/constraints.txt
+    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/base.in
     #   django-storages
     #   edx-django-release-util
-django-storages==1.11.1
-    # via -r requirements/base.in
 edx-django-release-util==1.1.0
     # via -r requirements/base.in
 gunicorn==20.1.0
@@ -40,7 +38,7 @@ jmespath==0.10.0
     #   botocore
 mysqlclient==2.0.3
     # via -r requirements/base.in
-newrelic==7.0.0.166
+newrelic==6.4.4.161
     # via -r requirements/base.in
 path.py==11.0.1
     # via -r requirements/base.in
@@ -65,9 +63,9 @@ six==1.16.0
     #   edx-django-release-util
     #   python-dateutil
     #   python-memcached
-sqlparse==0.4.2
+sqlparse==0.4.1
     # via django
-urllib3==1.26.7
+urllib3==1.26.6
     # via
     #   botocore
     #   requests

diff --git a/requirements/base.in b/requirements/base.in
@@ -4,7 +4,7 @@
 mysqlclient
 backoff
 boto3
-Django
+Django >= 1.11, <2.3
 django-storages
 edx-django-release-util
 gunicorn

diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -8,4 +8,5 @@
 # pin when possible.  Writing an issue against the offending project and
 # linking to it here is good.
 
-Django<4.0
+# Common constraints for edx repos
+-c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -1,13 +1,9 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
+# This file is autogenerated by pip-compile
 # To update, run:
 #
 #    make upgrade
 #
-asgiref==3.4.1
-    # via
-    #   -r requirements/test.txt
-    #   django
 attrs==21.2.0
     # via
     #   -r requirements/test.txt
@@ -18,9 +14,9 @@ backports.entry-points-selectable==1.1.0
     # via
     #   -r requirements/travis.txt
     #   virtualenv
-boto3==1.18.46
+boto3==1.18.9
     # via -r requirements/test.txt
-botocore==1.21.46
+botocore==1.21.9
     # via
     #   -r requirements/test.txt
     #   boto3
@@ -30,7 +26,7 @@ certifi==2021.5.30
     #   -r requirements/test.txt
     #   -r requirements/travis.txt
     #   requests
-charset-normalizer==2.0.6
+charset-normalizer==2.0.3
     # via
     #   -r requirements/test.txt
     #   -r requirements/travis.txt
@@ -39,26 +35,26 @@ click==8.0.1
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools
-codecov==2.1.12
+codecov==2.1.11
     # via -r requirements/travis.txt
 coverage==5.5
     # via
     #   -r requirements/test.txt
     #   -r requirements/travis.txt
     #   codecov
     #   pytest-cov
-distlib==0.3.3
+distlib==0.3.2
     # via
     #   -r requirements/travis.txt
     #   virtualenv
-django==3.2.7
+django-storages==1.11.1
+    # via -r requirements/test.txt
+django==2.2.24
     # via
-    #   -c requirements/constraints.txt
+    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/test.txt
     #   django-storages
     #   edx-django-release-util
-django-storages==1.11.1
-    # via -r requirements/test.txt
 edx-django-release-util==1.1.0
     # via -r requirements/test.txt
 filelock==3.0.12
@@ -86,7 +82,7 @@ jmespath==0.10.0
     #   botocore
 mysqlclient==2.0.3
     # via -r requirements/test.txt
-newrelic==7.0.0.166
+newrelic==6.4.4.161
     # via -r requirements/test.txt
 packaging==21.0
     # via
@@ -100,13 +96,13 @@ pep517==0.11.0
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools
-pip-tools==6.3.0
+pip-tools==6.2.0
     # via -r requirements/pip-tools.txt
-platformdirs==2.3.0
+platformdirs==2.2.0
     # via
     #   -r requirements/travis.txt
     #   virtualenv
-pluggy==1.0.0
+pluggy==0.13.1
     # via
     #   -r requirements/test.txt
     #   -r requirements/travis.txt
@@ -125,15 +121,15 @@ pyparsing==2.4.7
     #   -r requirements/test.txt
     #   -r requirements/travis.txt
     #   packaging
-pytest==6.2.5
-    # via
-    #   -r requirements/test.txt
-    #   pytest-cov
-    #   pytest-django
 pytest-cov==2.12.1
     # via -r requirements/test.txt
 pytest-django==4.4.0
     # via -r requirements/test.txt
+pytest==6.2.4
+    # via
+    #   -r requirements/test.txt
+    #   pytest-cov
+    #   pytest-django
 python-dateutil==2.8.2
     # via
     #   -r requirements/test.txt
@@ -168,7 +164,7 @@ six==1.16.0
     #   python-memcached
     #   tox
     #   virtualenv
-sqlparse==0.4.2
+sqlparse==0.4.1
     # via
     #   -r requirements/test.txt
     #   django
@@ -179,27 +175,27 @@ toml==0.10.2
     #   pytest
     #   pytest-cov
     #   tox
-tomli==1.2.1
+tomli==1.1.0
     # via
     #   -r requirements/pip-tools.txt
     #   pep517
-tox==3.24.4
+tox-battery==0.6.1
+    # via -r requirements/travis.txt
+tox==3.24.0
     # via
     #   -r requirements/travis.txt
     #   tox-battery
-tox-battery==0.6.1
-    # via -r requirements/travis.txt
-urllib3==1.26.7
+urllib3==1.26.6
     # via
     #   -r requirements/test.txt
     #   -r requirements/travis.txt
     #   botocore
     #   requests
-virtualenv==20.8.0
+virtualenv==20.6.0
     # via
     #   -r requirements/travis.txt
     #   tox
-wheel==0.37.0
+wheel==0.36.2
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools

diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
+# This file is autogenerated by pip-compile
 # To update, run:
 #
 #    make upgrade
@@ -8,11 +8,11 @@ click==8.0.1
     # via pip-tools
 pep517==0.11.0
     # via pip-tools
-pip-tools==6.3.0
+pip-tools==6.2.0
     # via -r requirements/pip-tools.in
-tomli==1.2.1
+tomli==1.1.0
     # via pep517
-wheel==0.37.0
+wheel==0.36.2
     # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:

diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
+# This file is autogenerated by pip-compile
 # To update, run:
 #
 #    make upgrade