Merge pull request #119 from openedx/jenkins/aht/POST-DJANGO32-CLEANU…

…P-936c077 Post Django32 Cleanup
openedx · Feb 16, 2022 · 7513e29 · 7513e29
2 parents 936c077 + e5b598b
commit 7513e29
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 57 deletions.
diff --git a/.github/workflows/ci.yml b/.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: [py38-django22-drflatest, py38-django30-drflatest, py38-django31-drflatest, py38-django32-drflatest,quality]
+        python-version: ["3.8"]
+        toxenv:
+          [
+            py38-django32-drf312,
+            py38-django32-drflatest,
+            py38-django40-drf312,
+            py38-django40-drflatest,
+            quality,
+          ]
 
     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
-        pip install -r requirements/quality.txt
+      - name: Install Dependencies
+        run: |
+          pip install -r requirements/ci.txt
+          pip install -r requirements/quality.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-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=='py38-django32-drflatest'
+        uses: codecov/codecov-action@v2
+        with:
+          flags: unittests
+          fail_ci_if_error: true
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -14,6 +14,12 @@ Change Log
 Unreleased
 ----------
 
+1.6.0 --- 2022-02-11
+--------------------
+
+* Dropped support for django 2.2, 3.0, 3.1
+* Added support for Django 4.0
+
 1.5.0 --- 2021-07-19
 --------------------
 

diff --git a/edx_api_doc_tools/__init__.py b/edx_api_doc_tools/__init__.py
@@ -46,6 +46,6 @@
 )
 
 
-__version__ = '1.5.1'
+__version__ = '1.6.0'
 
 default_app_config = 'edx_api_doc_tools.apps.EdxApiDocToolsConfig'
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -101,7 +101,7 @@ docutils==0.18.1
     #   readme-renderer
 drf-yasg==1.20.0
     # via -r requirements/quality.txt
-edx-i18n-tools==0.8.1
+edx-i18n-tools==0.9.1
     # via -r requirements/dev.in
 edx-lint==5.2.1
     # via -r requirements/quality.txt
@@ -115,7 +115,7 @@ idna==3.3
     #   -r requirements/ci.txt
     #   -r requirements/quality.txt
     #   requests
-importlib-metadata==4.10.1
+importlib-metadata==4.11.0
     # via
     #   -r requirements/quality.txt
     #   keyring

diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -73,7 +73,7 @@ idna==3.3
     #   requests
 imagesize==1.3.0
     # via sphinx
-importlib-metadata==4.10.1
+importlib-metadata==4.11.0
     # via
     #   keyring
     #   sphinx

diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -74,7 +74,7 @@ idna==3.3
     # via
     #   -r requirements/test.txt
     #   requests
-importlib-metadata==4.10.1
+importlib-metadata==4.11.0
     # via
     #   keyring
     #   twine

diff --git a/setup.py b/setup.py
@@ -124,10 +124,8 @@ def is_requirement(line):
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Framework :: Django',
-        'Framework :: Django :: 2.2',
-        'Framework :: Django :: 3.0',
-        'Framework :: Django :: 3.1',
         'Framework :: Django :: 3.2',
+        'Framework :: Django :: 4.0',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: Apache Software License',
         'Natural Language :: English',

diff --git a/tox.ini b/tox.ini
@@ -1,37 +1,36 @@
 [tox]
-envlist = drf{311,latest},py38-django{22,30,31,32}-drf{311,latest}, quality
+envlist = py38-django{32,40}-drf{312, latest}, quality
 
 [pytest]
 DJANGO_SETTINGS_MODULE = test_settings
 addopts = --cov edx_api_doc_tools --cov-report term-missing --cov-report xml
 norecursedirs = .* docs requirements
 
 [testenv]
-deps =
-	django22: Django>=2.2,<2.3
-	django30: Django>=3.0,<3.1
-	django31: Django>=3.1,<3.2
-	django32: Django>=3.2,<4.0
-	drf311: djangorestframework>=3.11,<3.12
-	drflatest: djangorestframework
-	-r{toxinidir}/requirements/test.txt
-commands =
-	pytest {posargs}
+deps = 
+    django32: Django>=3.2,<4.0
+    django40: Django>=4.0,<4.1
+    drf312: djangorestframework>=3.12,<3.13
+    drflatest: djangorestframework
+    -r{toxinidir}/requirements/test.txt
+commands = 
+    pytest {posargs}
 
 [testenv:docs]
-setenv =
-	DJANGO_SETTINGS_MODULE = test_settings
-	PYTHONPATH = {toxinidir}
-whitelist_externals =
-	make
-	rm
-deps =
-	-r{toxinidir}/requirements/doc.txt
-commands =
-	make build_docs
+setenv = 
+    DJANGO_SETTINGS_MODULE = test_settings
+    PYTHONPATH = {toxinidir}
+whitelist_externals = 
+    make
+    rm
+deps = 
+    -r{toxinidir}/requirements/doc.txt
+commands = 
+    make build_docs
 
 [testenv:quality]
-deps =
-	-r{toxinidir}/requirements/quality.txt
-commands =
-	make quality
+deps = 
+    -r{toxinidir}/requirements/quality.txt
+commands = 
+    make quality
+