Merge pull request #93 from openedx/jenkins/cleanup-python-code-f3819d7

chore: Post Django 3.2 cleanup

Author: UsamaSadiq

.github/workflows/ci.yml

@@ -5,7 +5,7 @@ on:
     branches: [master]
   pull_request:
     branches:
-    - '**'
+      - "**"
 
 jobs:
   run_tests:
@@ -14,32 +14,39 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: ['3.8']
-        toxenv: [django22-celery44-drflatest, django22-celery50-drflatest, django30-celery44-drflatest,
-                 django30-celery50-drflatest, django31-celery44-drflatest, django31-celery50-drflatest,
-                 django32-celery44-drflatest, django32-celery50-drflatest, quality, docs, pii_check]
+        python-version: ["3.8"]
+        toxenv:
+          [
+            django32-celery44-drflatest,
+            django32-celery50-drflatest,
+            django40-celery44-drflatest,
+            django40-celery50-drflatest,
+            quality,
+            docs,
+            pii_check,
+          ]
 
     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: Install pip
-      run: pip install -r requirements/pip.txt
+      - name: Install 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-drflatest'
-      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-celery44-drflatest'
+        uses: codecov/codecov-action@v2
+        with:
+          flags: unittests
+          fail_ci_if_error: true

CHANGELOG.rst

@@ -14,7 +14,11 @@ Change Log
 Unreleased
 ----------
 
+[3.0.0] - 2022-02-17
+
 * Fix `dev.in` to pull from `ci.txt` rather than `travis.txt`.
+* Dropped Django22, 30 and 31 support.
+* Added Django40 support.
 
 [2.1.1] - 2021-09-01
 ~~~~~~~~~~~~~~~~~~~~

Makefile

@@ -29,8 +29,13 @@ docs: ## generate Sphinx HTML documentation, including API docs
 	tox -e docs
 	$(BROWSER)docs/_build/html/index.html
 
+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 "$(@)"
+
 upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
-upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
+upgrade: $(COMMON_CONSTRAINTS_TXT)  ## 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 --allow-unsafe -o requirements/pip.txt requirements/pip.in

requirements/base.in

@@ -1,7 +1,7 @@
 # Core requirements for using this application
 -c constraints.txt
 
-Django>=1.11               # Web application framework
+Django            # Web application framework
 django-model-utils         # Provides TimeStampedModel abstract base class
 django-crum
 djangorestframework

requirements/base.txt

@@ -6,15 +6,17 @@
 #
 amqp==2.6.1
     # via kombu
+asgiref==3.5.0
+    # via django
 billiard==3.6.4.0
     # via celery
 celery==4.4.7
     # via
     #   -c requirements/constraints.txt
     #   edx-celeryutils
-django==2.2.26
+django==3.2.12
     # via
-    #   -c requirements/constraints.txt
+    #   -c requirements/common_constraints.txt
     #   -r requirements/base.in
     #   django-crum
     #   django-model-utils
@@ -34,19 +36,19 @@ django-waffle==2.3.0
     # via edx-django-utils
 djangorestframework==3.13.1
     # via -r requirements/base.in
-edx-celeryutils==1.1.1
+edx-celeryutils==1.2.1
     # via -r requirements/base.in
-edx-django-utils==4.4.1
+edx-django-utils==4.5.0
     # via -r requirements/base.in
 future==0.18.2
     # via edx-celeryutils
 jsonfield==3.1.0
     # via edx-celeryutils
 kombu==4.6.11
     # 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
 psutil==5.9.0
     # via edx-django-utils

requirements/ci.txt

@@ -6,29 +6,29 @@
 #
 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
-filelock==3.4.2
+filelock==3.5.0
     # via
     #   tox
     #   virtualenv
 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/common_constraints.txt

@@ -0,0 +1,22 @@
+# A central location for most common version constraints
+# (across edx repos) for pip-installation.
+#
+# Similar to other constraint files this file doesn't install any packages.
+# It specifies version constraints that will be applied if a package is needed.
+# When pinning something here, please provide an explanation of why it is a good
+# idea to pin this package across all edx repos, Ideally, link to other information
+# that will help people in the future to remove the pin when possible.
+# Writing an issue against the offending project and linking to it here is good.
+#
+# Note: Changes to this file will automatically be used by other repos, referencing
+#  this file from Github directly. It does not require packaging in edx-lint.
+
+
+# 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
+elasticsearch<7.14.0
+
+setuptools<60

requirements/constraints.txt

@@ -1,14 +1,14 @@
-# Version constraints for pip installation.
+# Version constraints for pip-installation.
 #
 # This file doesn't install any packages. It specifies version constraints
 # that will be applied if a package is needed.
 #
-# When pinning something here, please provide an explanation of why.  Ideally,
+# When pinning something here, please provide an explanation of why. Ideally,
 # link to other information that will help people in the future to remove the
-# pin when possible.  Writing an issue against the offending project and
+# pin when possible. Writing an issue against the offending project and
 # linking to it here is good.
 
-# stay on LTS version
-django< 2.3
+# Common constraints for edx repos
+-c common_constraints.txt
 
-celery<5.0     # we still want to support celery 4
+celery<5.0 # we still want to support celery 4