Merge pull request #902 from openedx/zshkoor/django42-upgrade

Upgrade Django to 4.2 LTS

.github/docker-compose-ci.yml

@@ -19,7 +19,7 @@ services:
 
   xqueue:
     container_name: xqueue
-    image: edxops/xqueue:latest
+    image: edxops/xqueue-dev:latest
     command: tail -f /dev/null
     volumes:
       - ..:/edx/app/xqueue/xqueue

.github/workflows/ci.yml

@@ -12,14 +12,9 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        tox-env: [quality, django32, django42]
+        tox-env: [quality, django42]
         python-version: [3.8]
-        db-version: ['mysql57', 'mysql80']
-        # excluding mysql5.7 with Django 4.2 since Django 4.2 has 
-        # dropped support for MySQL<8
-        exclude:
-          - tox-env: 'django42'
-            db-version: 'mysql57'
+        db-version: ['mysql80']
 
     steps:
     - uses: actions/checkout@v2

Makefile

@@ -44,7 +44,7 @@ $(COMMON_CONSTRAINTS_TXT):
 
 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
+	sed 's/Django<4.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
 	mv requirements/common_constraints.tmp requirements/common_constraints.txt
 	pip install -qr requirements/pip-tools.txt
 	# Make sure to compile files after any other files they include!

requirements.txt

@@ -4,43 +4,44 @@
 #
 #    make upgrade
 #
-asgiref==3.6.0
+asgiref==3.7.2
     # via django
 backoff==2.2.1
     # via -r requirements/base.in
-boto3==1.26.91
+backports-zoneinfo==0.2.1
+    # via django
+boto3==1.28.54
     # via -r requirements/base.in
-botocore==1.29.91
+botocore==1.31.54
     # via
     #   boto3
     #   s3transfer
-certifi==2022.12.7
+certifi==2023.7.22
     # via requests
 cffi==1.15.1
     # via pynacl
-charset-normalizer==3.1.0
+charset-normalizer==3.2.0
     # via requests
-click==8.1.3
+click==8.1.7
     # via edx-django-utils
-django==3.2.20
+django==4.2.5
     # via
-    #   -c requirements/common_constraints.txt
-    #   -r requirements/base.in
     #   django-crum
     #   django-storages
+    #   django-waffle
     #   edx-django-release-util
     #   edx-django-utils
 django-crum==0.7.9
     # via edx-django-utils
-django-storages==1.13.2
+django-storages==1.14
     # via -r requirements/base.in
-django-waffle==3.0.0
+django-waffle==4.0.0
     # via edx-django-utils
-edx-django-release-util==1.2.0
+edx-django-release-util==1.3.0
     # via -r requirements/base.in
-edx-django-utils==5.2.0
+edx-django-utils==5.7.0
     # via -r requirements/base.in
-gunicorn==20.1.0
+gunicorn==21.2.0
     # via -r requirements/base.in
 idna==3.4
     # via requests
@@ -50,17 +51,19 @@ jmespath==1.0.1
     # via
     #   boto3
     #   botocore
-mysqlclient==2.1.1
+mysqlclient==2.2.0
     # via -r requirements/base.in
-newrelic==8.7.0
+newrelic==9.1.0
     # via
     #   -r requirements/base.in
     #   edx-django-utils
+packaging==23.1
+    # via gunicorn
 path-py==11.0.1
     # via -r requirements/base.in
 pbr==5.11.1
     # via stevedore
-psutil==5.9.4
+psutil==5.9.5
     # via edx-django-utils
 pycparser==2.21
     # via cffi
@@ -72,26 +75,26 @@ python-memcached==1.59
     # via -r requirements/base.in
 python-termstyle==0.1.10
     # via -r requirements/base.in
-pytz==2022.7.1
-    # via
-    #   -r requirements/base.in
-    #   django
-pyyaml==6.0
+pytz==2023.3.post1
+    # via -r requirements/base.in
+pyyaml==6.0.1
     # via edx-django-release-util
-requests==2.28.2
+requests==2.31.0
     # via -r requirements/base.in
-s3transfer==0.6.0
+s3transfer==0.6.2
     # via boto3
 six==1.16.0
     # via
     #   edx-django-release-util
     #   python-dateutil
     #   python-memcached
-sqlparse==0.4.3
+sqlparse==0.4.4
     # via django
-stevedore==5.0.0
+stevedore==5.1.0
     # via edx-django-utils
-urllib3==1.26.15
+typing-extensions==4.8.0
+    # via asgiref
+urllib3==1.26.16
     # via
     #   botocore
     #   requests

requirements/base.in

@@ -4,7 +4,7 @@
 mysqlclient
 backoff
 boto3
-Django<4
+Django
 django-storages
 edx-django-release-util
 edx-django-utils

requirements/ci.txt

@@ -4,17 +4,17 @@
 #
 #    make upgrade
 #
-distlib==0.3.6
+distlib==0.3.7
     # via virtualenv
-filelock==3.9.1
+filelock==3.12.4
     # via
     #   tox
     #   virtualenv
-packaging==23.0
+packaging==23.1
     # via tox
-platformdirs==3.1.1
+platformdirs==3.10.0
     # via virtualenv
-pluggy==1.0.0
+pluggy==1.3.0
     # via tox
 py==1.11.0
     # via tox
@@ -27,7 +27,7 @@ tox==3.28.0
     #   -c requirements/common_constraints.txt
     #   -r requirements/ci.in
     #   tox-battery
-tox-battery==0.6.1
+tox-battery==0.6.2
     # via -r requirements/ci.in
-virtualenv==20.21.0
+virtualenv==20.24.5
     # via tox

requirements/common_constraints.txt

@@ -18,7 +18,7 @@
 
 
 # using LTS django version
-Django<4.0
+
 
 # elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
 # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
@@ -30,8 +30,3 @@ django-simple-history==3.0.0
 # tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
 # Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
 tox<4.0.0
-
-# edx-sphinx-theme is not compatible with latest Sphinx==6.0.0 version 
-# Pinning Sphinx version unless the compatibility issue gets resolved
-# For details, see issue https://github.com/openedx/edx-sphinx-theme/issues/197
-sphinx<6.0.0