Merge pull request #111 from openedx/jenkins/cleanup-python-code-42ef3aa

chore: Post Django32 Cleanup

Author: aht007

.github/workflows/ci.yml

@@ -1,37 +1,37 @@
 name: Python CI
 
 on:
-   push:
-     branches: [master]
-   pull_request:
-     branches:
-       - '**'
+  push:
+    branches: [master]
+  pull_request:
+    branches:
+    - '**'
 
 
 jobs:
-   run_tests:
-     name: tests
-     runs-on: ${{ matrix.os }}
-     strategy:
-       matrix:
-         os: [ubuntu-20.04]
-         python-version: ['3.8']
-         toxenv: [django22, django30, django31, django32, quality]
+  run_tests:
+    name: tests
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-20.04]
+        python-version: ['3.8']
+        toxenv: [quality, django32]
 
-     steps:
-       - uses: actions/checkout@v1
-       - name: setup python
-         uses: actions/setup-python@v2
-         with:
-           python-version: ${{ matrix.python-version }}
+    steps:
+    - uses: actions/checkout@v1
+    - 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: make requirements
+    - name: Install Dependencies
+      run: make requirements
 
-       - name: Run Tests
-         env:
-           TOXENV: ${{ matrix.toxenv }}
-         run: tox
+    - name: Run Tests
+      env:
+        TOXENV: ${{ matrix.toxenv }}
+      run: tox

lang_pref_middleware/__init__.py

@@ -1,3 +1,3 @@
 """Init module for lang_pref_middleware."""
 
-__version__ = '1.1.0'
+__version__ = '1.2.0'

setup.py

@@ -100,9 +100,6 @@ def get_version(*file_paths):
         "License :: OSI Approved :: Apache Software License",
         "Operating System :: OS Independent",
         "Framework :: Django",
-        "Framework :: Django :: 2.2",
-        "Framework :: Django :: 3.0",
-        "Framework :: Django :: 3.1",
         "Framework :: Django :: 3.2",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.8",

tox.ini

@@ -1,20 +1,17 @@
 [tox]
-envlist = py38-django{22,30,31,32},quality
+envlist = py38-django{32,40},quality
 
 [testenv]
-deps =
-	django22: Django>=2.2,<2.3
-	django30: Django>=3.0,<3.1
-	django31: Django>=3.1,<3.2
-	django32: Django>=3.2,<3.3
-	-r{toxinidir}/requirements/test.txt
-setenv =
-	DJANGO_SETTINGS_MODULE=settings
+deps = 
+    django32: Django>=3.2,<4.0
+    -r{toxinidir}/requirements/test.txt
+setenv = 
+    DJANGO_SETTINGS_MODULE=settings
 commands = pytest --cov-branch  --cov-report=html:build/coverage/html --cov-report=xml:build/coverage/coverage.xml --cov=lang_pref_middleware
 
 [testenv:quality]
-commands =
-	pycodestyle --config=.pep8 lang_pref_middleware
-	pylint --rcfile=.pylintrc lang_pref_middleware
-	pep257 --ignore=D100,D203 --match='(?!test).*py' lang_pref_middleware
+commands = 
+    pycodestyle --config=.pep8 lang_pref_middleware
+    pylint --rcfile=.pylintrc lang_pref_middleware
+    pep257 --ignore=D100,D203 --match='(?!test).*py' lang_pref_middleware