chore: Post Django32 Cleanup

.github/workflows/ci.yml

@@ -5,7 +5,7 @@ on:
     branches: [master]
   pull_request:
     branches:
-    - '**'
+      - "**"
 
 jobs:
   run_tests:
@@ -14,31 +14,39 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: ['3.8']
-        toxenv: [django22-celery44, django22-celery50, django30-celery50, django31-celery50, django32-celery50,
-          quality, docs, pii_check]
+        python-version: ["3.8"]
+        toxenv:
+          [
+            quality,
+            docs,
+            pii_check,
+            django32-celery44,
+            django32-celery50,
+            django40-celery44,
+            django40-celery50,
+          ]
 
     steps:
-    - uses: actions/checkout@v2
-    - name: setup python
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
+      - uses: actions/checkout@v2
+      - name: setup python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
 
-    - name: Upgrade pip
-      run: pip install -r requirements/pip.txt
+      - name: Upgrade pip
+        run: pip install -r requirements/pip.txt
 
-    - name: Install Dependencies
-      run: pip install -r requirements/ci.txt
+      - name: Install Dependencies
+        run: pip install -r requirements/ci.txt
 
-    - name: Run Tests
-      env:
-        TOXENV: ${{ matrix.toxenv }}
-      run: tox
+      - name: Run Tests
+        env:
+          TOXENV: ${{ matrix.toxenv }}
+        run: tox
 
-    - name: Run Coverage
-      if: matrix.python-version == '3.8' && matrix.toxenv=='django22-celery44'
-      uses: codecov/codecov-action@v1
-      with:
-        flags: unittests
-        fail_ci_if_error: true
+      - name: Run Coverage
+        if: matrix.python-version == '3.8' && matrix.toxenv=='django32-celery50'
+        uses: codecov/codecov-action@v1
+        with:
+          flags: unittests
+          fail_ci_if_error: true

bulk_grades/api.py

@@ -12,7 +12,7 @@
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import Exists, OuterRef
 from django.utils.functional import cached_property
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from lms.djangoapps.grades import api as grades_api
 from opaque_keys.edx.keys import CourseKey, UsageKey
 from openedx.core.djangoapps.course_groups.cohorts import get_cohort

bulk_grades/urls.py

@@ -3,22 +3,22 @@
 """
 
 from django.conf import settings
-from django.conf.urls import url
+from django.urls import re_path
 
 from . import views
 
 urlpatterns = [
-    url(
+    re_path(
         fr'^bulk_grades/course/{settings.COURSE_ID_PATTERN}/$',
         views.GradeImportExport.as_view(),
         name='bulk_grades'
     ),
-    url(
+    re_path(
         fr'^bulk_grades/course/{settings.COURSE_ID_PATTERN}/history/$',
         views.GradeOperationHistoryView.as_view(),
         name='bulk_grades.history'
     ),
-    url(
+    re_path(
         fr'^bulk_grades/course/{settings.COURSE_ID_PATTERN}/intervention/$',
         views.InterventionsExport.as_view(),
         name='interventions'

docs/conf.py

@@ -21,8 +21,6 @@
 import edx_theme
 from django import setup as django_setup
 from django.conf import settings
-from django.utils import six
-
 
 def get_version(*file_paths):
     """
@@ -499,5 +497,5 @@ def on_init(app):  # pylint: disable=unused-argument
 
 def setup(app):
     """Sphinx extension: run sphinx-apidoc."""
-    event = 'builder-inited' if six.PY3 else b'builder-inited'
+    event = 'builder-inited'
     app.connect(event, on_init)

requirements/base.in

@@ -7,4 +7,3 @@ edx-opaque-keys
 super-csv
 requests
 slumber
-six

requirements/base.txt

@@ -6,6 +6,8 @@
 #
 amqp==5.0.9
     # via kombu
+asgiref==3.5.0
+    # via django
 billiard==3.6.4.0
     # via celery
 celery==5.2.3
@@ -14,7 +16,7 @@ celery==5.2.3
     #   edx-celeryutils
 certifi==2021.10.8
     # via requests
-charset-normalizer==2.0.10
+charset-normalizer==2.0.12
     # via requests
 click==8.0.3
     # via
@@ -28,7 +30,7 @@ click-plugins==1.1.1
     # via celery
 click-repl==0.2.0
     # via celery
-django==2.2.26
+django==3.2.12
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -c requirements/constraints.txt
@@ -49,15 +51,15 @@ django-model-utils==4.2.0
     #   -r requirements/base.in
     #   edx-celeryutils
     #   super-csv
-django-waffle==2.2.1
+django-waffle==2.3.0
     # via edx-django-utils
 djangorestframework==3.13.1
     # via super-csv
-edx-celeryutils==1.1.1
+edx-celeryutils==1.2.1
     # via super-csv
-edx-django-utils==4.4.1
+edx-django-utils==4.5.0
     # via super-csv
-edx-opaque-keys==2.2.2
+edx-opaque-keys==2.3.0
     # via -r requirements/base.in
 future==0.18.2
     # via edx-celeryutils
@@ -67,15 +69,15 @@ jsonfield==3.1.0
     # via edx-celeryutils
 kombu==5.2.3
     # via celery
-newrelic==7.2.4.171
+newrelic==7.4.0.172
     # via edx-django-utils
-pbr==5.8.0
+pbr==5.8.1
     # via stevedore
-prompt-toolkit==3.0.24
+prompt-toolkit==3.0.28
     # via click-repl
 psutil==5.9.0
     # via edx-django-utils
-pymongo==4.0.1
+pymongo==3.12.3
     # via edx-opaque-keys
 pytz==2021.3
     # via
@@ -89,9 +91,7 @@ requests==2.27.1
 simplejson==3.17.6
     # via super-csv
 six==1.16.0
-    # via
-    #   -r requirements/base.in
-    #   click-repl
+    # via click-repl
 slumber==0.7.1
     # via -r requirements/base.in
 sqlparse==0.4.2
@@ -100,7 +100,7 @@ stevedore==3.5.0
     # via
     #   edx-django-utils
     #   edx-opaque-keys
-super-csv==2.1.2
+super-csv==2.1.4
     # via -r requirements/base.in
 urllib3==1.26.8
     # via requests

requirements/celery50.txt

@@ -5,5 +5,5 @@ click==8.0.3
 click-didyoumean==0.3.0
 click-repl==0.2.0
 kombu==5.2.3
-prompt-toolkit==3.0.24
+prompt-toolkit==3.0.28
 vine==5.0.0

requirements/ci.txt

@@ -6,11 +6,11 @@
 #
 certifi==2021.10.8
     # via requests
-charset-normalizer==2.0.10
+charset-normalizer==2.0.12
     # via requests
 codecov==2.1.12
     # via -r requirements/ci.in
-coverage==6.2
+coverage==6.3.1
     # via codecov
 distlib==0.3.4
     # via virtualenv
@@ -22,13 +22,13 @@ idna==3.3
     # via requests
 packaging==21.3
     # via tox
-platformdirs==2.4.1
+platformdirs==2.5.0
     # via virtualenv
 pluggy==1.0.0
     # via tox
 py==1.11.0
     # via tox
-pyparsing==3.0.6
+pyparsing==3.0.7
     # via packaging
 requests==2.27.1
     # via codecov
@@ -46,5 +46,5 @@ tox-battery==0.6.1
     # via -r requirements/ci.in
 urllib3==1.26.8
     # via requests
-virtualenv==20.13.0
+virtualenv==20.13.1
     # via tox

requirements/constraints.txt

@@ -12,7 +12,7 @@
 -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
 
 # Stay on an LTS release
-django<2.3
+django<4.0
 
 # pinning celery to latest release
 celery<6.0