Merge pull request #46 from edx/jenkins/cleanup-python-code-86d7223

Python Code Cleanup

Author: UsamaSadiq

.github/workflows/ci.yml

@@ -15,11 +15,8 @@ jobs:
      strategy:
        matrix:
          os: [ubuntu-20.04]
-         python-version: ['3.5','3.8']
-         toxenv: ['django22','quality']
-         exclude:
-           - python-version: '3.5'
-             toxenv: 'quality'
+         python-version: ['3.8']
+         toxenv: ['django22','django30','django31','quality']
 
      steps:
        - uses: actions/checkout@v1

lang_pref_middleware/__init__.py

@@ -1,3 +1,3 @@
 """Init module for lang_pref_middleware."""
 
-__version__ = '0.3.1'
+__version__ = '1.0.0'

requirements/base.txt

@@ -4,6 +4,11 @@
 #
 #    make upgrade
 #
-django==2.2.17            # via -c requirements/constraints.txt, -r requirements/base.in
-pytz==2020.5              # via django
-sqlparse==0.4.1           # via django
+django==2.2.17
+    # via
+    #   -c requirements/constraints.txt
+    #   -r requirements/base.in
+pytz==2020.5
+    # via django
+sqlparse==0.4.1
+    # via django

requirements/ci.txt

@@ -4,17 +4,29 @@
 #
 #    make upgrade
 #
-appdirs==1.4.4            # via virtualenv
-distlib==0.3.1            # via virtualenv
-filelock==3.0.12          # via tox, virtualenv
-importlib-metadata==2.1.1  # via pluggy, tox, virtualenv
-importlib-resources==3.2.1  # via virtualenv
-packaging==20.8           # via tox
-pluggy==0.13.1            # via tox
-py==1.10.0                # via tox
-pyparsing==2.4.7          # via packaging
-six==1.15.0               # via tox, virtualenv
-toml==0.10.2              # via tox
-tox==3.20.1               # via -r requirements/ci.in
-virtualenv==20.2.2        # via tox
-zipp==1.2.0               # via importlib-metadata, importlib-resources
+appdirs==1.4.4
+    # via virtualenv
+distlib==0.3.1
+    # via virtualenv
+filelock==3.0.12
+    # via
+    #   tox
+    #   virtualenv
+packaging==20.8
+    # via tox
+pluggy==0.13.1
+    # via tox
+py==1.10.0
+    # via tox
+pyparsing==2.4.7
+    # via packaging
+six==1.15.0
+    # via
+    #   tox
+    #   virtualenv
+toml==0.10.2
+    # via tox
+tox==3.21.0
+    # via -r requirements/ci.in
+virtualenv==20.3.0
+    # via tox

requirements/dev.txt

@@ -4,47 +4,160 @@
 #
 #    make upgrade
 #
-appdirs==1.4.4            # via -r requirements/ci.txt, virtualenv
-astroid==2.4.2            # via -r requirements/test.txt, pylint, pylint-celery
-attrs==20.3.0             # via -r requirements/test.txt, pytest
-click-log==0.3.2          # via -r requirements/test.txt, edx-lint
-click==7.1.2              # via -r requirements/pip-tools.txt, -r requirements/test.txt, click-log, edx-lint, pip-tools
-coverage==5.3.1           # via -r requirements/test.txt, pytest-cov
-distlib==0.3.1            # via -r requirements/ci.txt, virtualenv
-django==2.2.17            # via -c requirements/constraints.txt, -r requirements/test.txt
-edx-lint==1.6             # via -r requirements/test.txt
-filelock==3.0.12          # via -r requirements/ci.txt, tox, virtualenv
-importlib-metadata==2.1.1  # via -r requirements/ci.txt, -r requirements/test.txt, pluggy, pytest, tox, virtualenv
-importlib-resources==3.2.1  # via -r requirements/ci.txt, virtualenv
-iniconfig==1.1.1          # via -r requirements/test.txt, pytest
-isort==4.3.21             # via -r requirements/test.txt, pylint
-lazy-object-proxy==1.4.3  # via -r requirements/test.txt, astroid
-mccabe==0.6.1             # via -r requirements/test.txt, pylint
-packaging==20.8           # via -r requirements/ci.txt, -r requirements/test.txt, pytest, tox
-pathlib2==2.3.5           # via -r requirements/test.txt, pytest
-pep257==0.7.0             # via -r requirements/test.txt
-pip-tools==5.5.0          # via -r requirements/pip-tools.txt
-pluggy==0.13.1            # via -r requirements/ci.txt, -r requirements/test.txt, pytest, tox
-py==1.10.0                # via -r requirements/ci.txt, -r requirements/test.txt, pytest, tox
-pycodestyle==2.6.0        # via -r requirements/test.txt
-pylint-celery==0.3        # via -r requirements/test.txt, edx-lint
-pylint-django==2.3.0      # via -r requirements/test.txt, edx-lint
-pylint-plugin-utils==0.6  # via -r requirements/test.txt, pylint-celery, pylint-django
-pylint==2.6.0             # via -r requirements/test.txt, edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
-pyparsing==2.4.7          # via -r requirements/ci.txt, -r requirements/test.txt, packaging
-pytest-cov==2.10.1        # via -r requirements/test.txt
-pytest-django==4.1.0      # via -r requirements/test.txt
-pytest==6.1.2             # via -r requirements/test.txt, pytest-cov, pytest-django
-pytz==2020.5              # via -r requirements/test.txt, django
-six==1.15.0               # via -r requirements/ci.txt, -r requirements/test.txt, astroid, edx-lint, pathlib2, tox, virtualenv
-sqlparse==0.4.1           # via -r requirements/test.txt, django
-toml==0.10.2              # via -r requirements/ci.txt, -r requirements/test.txt, pylint, pytest, tox
-tox-battery==0.6.1        # via -r requirements/dev.in
-tox==3.20.1               # via -r requirements/ci.txt, tox-battery
-typed-ast==1.4.2          # via -r requirements/test.txt, astroid
-virtualenv==20.2.2        # via -r requirements/ci.txt, tox
-wrapt==1.12.1             # via -r requirements/test.txt, astroid
-zipp==1.2.0               # via -r requirements/ci.txt, -r requirements/test.txt, importlib-metadata, importlib-resources
+appdirs==1.4.4
+    # via
+    #   -r requirements/ci.txt
+    #   virtualenv
+astroid==2.4.2
+    # via
+    #   -r requirements/test.txt
+    #   pylint
+    #   pylint-celery
+attrs==20.3.0
+    # via
+    #   -r requirements/test.txt
+    #   pytest
+click-log==0.3.2
+    # via
+    #   -r requirements/test.txt
+    #   edx-lint
+click==7.1.2
+    # via
+    #   -r requirements/pip-tools.txt
+    #   -r requirements/test.txt
+    #   click-log
+    #   edx-lint
+    #   pip-tools
+coverage==5.3.1
+    # via
+    #   -r requirements/test.txt
+    #   pytest-cov
+distlib==0.3.1
+    # via
+    #   -r requirements/ci.txt
+    #   virtualenv
+django==2.2.17
+    # via
+    #   -c requirements/constraints.txt
+    #   -r requirements/test.txt
+edx-lint==1.6
+    # via -r requirements/test.txt
+filelock==3.0.12
+    # via
+    #   -r requirements/ci.txt
+    #   tox
+    #   virtualenv
+iniconfig==1.1.1
+    # via
+    #   -r requirements/test.txt
+    #   pytest
+isort==5.7.0
+    # via
+    #   -r requirements/test.txt
+    #   pylint
+lazy-object-proxy==1.4.3
+    # via
+    #   -r requirements/test.txt
+    #   astroid
+mccabe==0.6.1
+    # via
+    #   -r requirements/test.txt
+    #   pylint
+packaging==20.8
+    # via
+    #   -r requirements/ci.txt
+    #   -r requirements/test.txt
+    #   pytest
+    #   tox
+pep257==0.7.0
+    # via -r requirements/test.txt
+pip-tools==5.5.0
+    # via -r requirements/pip-tools.txt
+pluggy==0.13.1
+    # via
+    #   -r requirements/ci.txt
+    #   -r requirements/test.txt
+    #   pytest
+    #   tox
+py==1.10.0
+    # via
+    #   -r requirements/ci.txt
+    #   -r requirements/test.txt
+    #   pytest
+    #   tox
+pycodestyle==2.6.0
+    # via -r requirements/test.txt
+pylint-celery==0.3
+    # via
+    #   -r requirements/test.txt
+    #   edx-lint
+pylint-django==2.3.0
+    # via
+    #   -r requirements/test.txt
+    #   edx-lint
+pylint-plugin-utils==0.6
+    # via
+    #   -r requirements/test.txt
+    #   pylint-celery
+    #   pylint-django
+pylint==2.6.0
+    # via
+    #   -r requirements/test.txt
+    #   edx-lint
+    #   pylint-celery
+    #   pylint-django
+    #   pylint-plugin-utils
+pyparsing==2.4.7
+    # via
+    #   -r requirements/ci.txt
+    #   -r requirements/test.txt
+    #   packaging
+pytest-cov==2.10.1
+    # via -r requirements/test.txt
+pytest-django==4.1.0
+    # via -r requirements/test.txt
+pytest==6.2.1
+    # via
+    #   -r requirements/test.txt
+    #   pytest-cov
+    #   pytest-django
+pytz==2020.5
+    # via
+    #   -r requirements/test.txt
+    #   django
+six==1.15.0
+    # via
+    #   -r requirements/ci.txt
+    #   -r requirements/test.txt
+    #   astroid
+    #   edx-lint
+    #   tox
+    #   virtualenv
+sqlparse==0.4.1
+    # via
+    #   -r requirements/test.txt
+    #   django
+toml==0.10.2
+    # via
+    #   -r requirements/ci.txt
+    #   -r requirements/test.txt
+    #   pylint
+    #   pytest
+    #   tox
+tox-battery==0.6.1
+    # via -r requirements/dev.in
+tox==3.21.0
+    # via
+    #   -r requirements/ci.txt
+    #   tox-battery
+virtualenv==20.3.0
+    # via
+    #   -r requirements/ci.txt
+    #   tox
+wrapt==1.12.1
+    # via
+    #   -r requirements/test.txt
+    #   astroid
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

requirements/pip-tools.txt

@@ -4,8 +4,10 @@
 #
 #    make upgrade
 #
-click==7.1.2              # via pip-tools
-pip-tools==5.5.0          # via -r requirements/pip-tools.in
+click==7.1.2
+    # via pip-tools
+pip-tools==5.5.0
+    # via -r requirements/pip-tools.in
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

requirements/pip.txt

@@ -4,8 +4,11 @@
 #
 #    make upgrade
 #
-wheel==0.36.2             # via -r requirements/pip.in
+wheel==0.36.2
+    # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==20.3.3               # via -r requirements/pip.in
-setuptools==50.3.2        # via -r requirements/pip.in
+pip==20.3.3
+    # via -r requirements/pip.in
+setuptools==51.1.2
+    # via -r requirements/pip.in