Merge pull request #7 from edx/BOM-1026

Added the support for Django 2.2 - BOM-1026

Author: mraarif

.travis.yml

@@ -5,18 +5,23 @@ language: python
 python:
   - 2.7
   - 3.5
+  - 3.6
 
 env:
-  - TOXENV=django18
-  - TOXENV=django19
-  - TOXENV=django110
   - TOXENV=django111
 
 matrix:
   include:
+    - python: 3.5
+      env: TOXENV=django20
+    - python: 3.5
+      env: TOXENV=django21
+    - python: 3.5
+      env: TOXENV=django22
     - python: 3.5
       env: TOXENV=quality
 
+
 cache:
   - pip
 

help_tokens/__init__.py

@@ -6,6 +6,6 @@
 
 from .context_processor import context_processor
 
-__version__ = '1.0.4'
+__version__ = '1.0.5'
 
 default_app_config = 'help_tokens.apps.HelpTokensConfig'  # pylint: disable=invalid-name

requirements/dev.txt

@@ -5,69 +5,72 @@
 #    make upgrade
 #
 argparse==1.4.0           # via caniusepython3
-astroid==1.5.3            # via pylint, pylint-celery
-backports.functools-lru-cache==1.5  # via astroid, caniusepython3, isort, pylint
+astroid==1.6.6            # via pylint, pylint-celery
+backports.functools-lru-cache==1.6.1  # via astroid, caniusepython3, isort, pylint
+backports.os==0.1.1       # via path.py
 bleach==3.1.0             # via readme-renderer
-caniusepython3==7.1.0
-certifi==2019.3.9         # via requests
+caniusepython3==7.2.0
+certifi==2019.9.11        # via requests
 chardet==3.0.4            # via requests
 click-log==0.3.2          # via edx-lint
 click==7.0                # via click-log, edx-lint, pip-tools
-configparser==3.7.4       # via importlib-metadata, pylint
-contextlib2==0.5.5        # via importlib-metadata
-diff-cover==2.2.0
-distlib==0.2.9.post0      # via caniusepython3
-django==1.11.21
-docutils==0.14            # via readme-renderer
+configparser==4.0.2       # via importlib-metadata, pylint
+contextlib2==0.6.0.post1  # via importlib-metadata
+diff-cover==2.4.0
+distlib==0.3.0            # via caniusepython3
+django==1.11.26
+docutils==0.15.2          # via readme-renderer
 edx-i18n-tools==0.4.8
-edx-lint==1.3.0
+edx-lint==1.4.1
 enum34==1.1.6             # via astroid
 filelock==3.0.12          # via tox
-futures==3.2.0 ; python_version == "2.7"  # via caniusepython3, isort
+future==0.18.2            # via backports.os
+futures==3.3.0 ; python_version == "2.7"  # via caniusepython3, isort
 idna==2.8                 # via requests
-importlib-metadata==0.18  # via pluggy
-inflect==2.1.0            # via jinja2-pluralize
-isort==4.3.20
+importlib-metadata==0.23  # via inflect, path.py, pluggy, tox
+inflect==3.0.2            # via jinja2-pluralize
+isort==4.3.21
 jinja2-pluralize==0.3.0   # via diff-cover
-jinja2==2.10.1            # via diff-cover, jinja2-pluralize
-lazy-object-proxy==1.4.1  # via astroid
+jinja2==2.10.3            # via diff-cover, jinja2-pluralize
+lazy-object-proxy==1.4.3  # via astroid
 markupsafe==1.1.1         # via jinja2
 mccabe==0.6.1             # via pylint
-packaging==19.0           # via caniusepython3
+more-itertools==5.0.0     # via zipp
+packaging==19.2           # via caniusepython3, tox
 path.py==11.5.2           # via edx-i18n-tools
-pathlib2==2.3.3           # via importlib-metadata
-pip-tools==3.8.0
+pathlib2==2.3.5           # via importlib-metadata
+pip-tools==4.2.0
 pkginfo==1.5.0.1          # via twine
-pluggy==0.12.0            # via tox
+pluggy==0.13.0            # via tox
 polib==1.1.0              # via edx-i18n-tools
 py==1.8.0                 # via tox
 pycodestyle==2.5.0
 pydocstyle==1.1.1
 pygments==2.4.2           # via diff-cover, readme-renderer
 pylint-celery==0.3        # via edx-lint
-pylint-django==0.7.2      # via edx-lint
-pylint-plugin-utils==0.5  # via pylint-celery, pylint-django
-pylint==1.7.6             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
-pyparsing==2.4.0          # via packaging
-pytz==2019.1              # via django
-pyyaml==5.1.1             # via edx-i18n-tools
+pylint-django==0.11.1     # via edx-lint
+pylint-plugin-utils==0.6  # via pylint-celery, pylint-django
+pylint==1.9.5             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
+pyparsing==2.4.5          # via packaging
+pytz==2019.3              # via django
+pyyaml==5.1.2             # via edx-i18n-tools
 readme-renderer==24.0
 requests-toolbelt==0.9.1  # via twine
 requests==2.22.0          # via caniusepython3, requests-toolbelt, twine
 scandir==1.10.0           # via pathlib2
 singledispatch==3.4.0.3   # via astroid, pylint
-six==1.12.0
+six==1.13.0
 toml==0.10.0              # via tox
 tox-battery==0.5.1
-tox==3.12.1
-tqdm==4.32.1              # via twine
-twine==1.13.0
-urllib3==1.25.3           # via requests
-virtualenv==16.6.0        # via tox
+tox==3.14.0
+tqdm==4.38.0              # via twine
+twine==1.15.0
+urllib3==1.25.6           # via requests
+virtualenv==16.7.7        # via tox
 webencodings==0.5.1       # via bleach
-wheel==0.33.4
-wrapt==1.11.1             # via astroid
-zipp==0.5.1               # via importlib-metadata
+wheel==0.33.6
+wrapt==1.11.2             # via astroid
+zipp==0.6.0               # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools==41.0.1        # via caniusepython3, tox, twine
+# setuptools==41.6.0        # via caniusepython3, twine

requirements/quality.txt

@@ -5,40 +5,40 @@
 #    make upgrade
 #
 argparse==1.4.0           # via caniusepython3
-astroid==1.5.3            # via pylint, pylint-celery
-backports.functools-lru-cache==1.5  # via astroid, caniusepython3, isort, pylint
+astroid==1.6.6            # via pylint, pylint-celery
+backports.functools-lru-cache==1.6.1  # via astroid, caniusepython3, isort, pylint
 bleach==3.1.0             # via readme-renderer
-caniusepython3==7.1.0
-certifi==2019.3.9         # via requests
+caniusepython3==7.2.0
+certifi==2019.9.11        # via requests
 chardet==3.0.4            # via requests
 click-log==0.3.2          # via edx-lint
 click==7.0                # via click-log, edx-lint
-configparser==3.7.4       # via pylint
-distlib==0.2.9.post0      # via caniusepython3
-docutils==0.14            # via readme-renderer
-edx-lint==1.3.0
+configparser==4.0.2       # via pylint
+distlib==0.3.0            # via caniusepython3
+docutils==0.15.2          # via readme-renderer
+edx-lint==1.4.1
 enum34==1.1.6             # via astroid
-futures==3.2.0 ; python_version == "2.7"  # via caniusepython3, isort
+futures==3.3.0 ; python_version == "2.7"  # via caniusepython3, isort
 idna==2.8                 # via requests
-isort==4.3.20
-lazy-object-proxy==1.4.1  # via astroid
+isort==4.3.21
+lazy-object-proxy==1.4.3  # via astroid
 mccabe==0.6.1             # via pylint
-packaging==19.0           # via caniusepython3
+packaging==19.2           # via caniusepython3
 pycodestyle==2.5.0
 pydocstyle==1.1.1
 pygments==2.4.2           # via readme-renderer
 pylint-celery==0.3        # via edx-lint
-pylint-django==0.7.2      # via edx-lint
-pylint-plugin-utils==0.5  # via pylint-celery, pylint-django
-pylint==1.7.6             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
-pyparsing==2.4.0          # via packaging
+pylint-django==0.11.1     # via edx-lint
+pylint-plugin-utils==0.6  # via pylint-celery, pylint-django
+pylint==1.9.5             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
+pyparsing==2.4.5          # via packaging
 readme-renderer==24.0
 requests==2.22.0          # via caniusepython3
 singledispatch==3.4.0.3   # via astroid, pylint
-six==1.12.0               # via astroid, bleach, edx-lint, packaging, pylint, readme-renderer, singledispatch
-urllib3==1.25.3           # via requests
+six==1.13.0               # via astroid, bleach, edx-lint, packaging, pylint, readme-renderer, singledispatch
+urllib3==1.25.6           # via requests
 webencodings==0.5.1       # via bleach
-wrapt==1.11.1             # via astroid
+wrapt==1.11.2             # via astroid
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools==41.0.1        # via caniusepython3
+# setuptools==41.6.0        # via caniusepython3

requirements/test.txt

@@ -5,24 +5,24 @@
 #    make upgrade
 #
 atomicwrites==1.3.0       # via pytest
-attrs==19.1.0             # via pytest
-configparser==3.7.4       # via importlib-metadata
-contextlib2==0.5.5        # via importlib-metadata
-coverage==4.5.3           # via pytest-cov
+attrs==19.3.0             # via pytest
+configparser==4.0.2       # via importlib-metadata
+contextlib2==0.6.0.post1  # via importlib-metadata
+coverage==4.5.4           # via pytest-cov
 funcsigs==1.0.2           # via pytest
-importlib-metadata==0.18  # via pluggy, pytest
-more-itertools==5.0.0     # via pytest
-packaging==19.0           # via pytest
-pathlib2==2.3.3           # via importlib-metadata, pytest, pytest-django
-pluggy==0.12.0            # via pytest
+importlib-metadata==0.23  # via pluggy, pytest
+more-itertools==5.0.0     # via pytest, zipp
+packaging==19.2           # via pytest
+pathlib2==2.3.5           # via importlib-metadata, pytest, pytest-django
+pluggy==0.13.0            # via pytest
 py==1.8.0                 # via pytest, pytest-catchlog
-pyparsing==2.4.0          # via packaging
+pyparsing==2.4.5          # via packaging
 pytest-catchlog==1.2.2
-pytest-cov==2.7.1
-pytest-django==3.5.0
-pytest==4.6.3             # via pytest-catchlog, pytest-cov, pytest-django
-pytz==2019.1              # via django
+pytest-cov==2.8.1
+pytest-django==3.7.0
+pytest==4.6.6             # via pytest-catchlog, pytest-cov, pytest-django
+pytz==2019.3              # via django
 scandir==1.10.0           # via pathlib2
-six==1.12.0
+six==1.13.0
 wcwidth==0.1.7            # via pytest
-zipp==0.5.1               # via importlib-metadata
+zipp==0.6.0               # via importlib-metadata

requirements/travis.txt

@@ -4,27 +4,27 @@
 #
 #    make upgrade
 #
-certifi==2019.3.9         # via requests
+certifi==2019.9.11        # via requests
 chardet==3.0.4            # via requests
 codecov==2.0.15
-configparser==3.7.4       # via importlib-metadata
-contextlib2==0.5.5        # via importlib-metadata
-coverage==4.5.3           # via codecov
+configparser==4.0.2       # via importlib-metadata
+contextlib2==0.6.0.post1  # via importlib-metadata
+coverage==4.5.4           # via codecov
 filelock==3.0.12          # via tox
 idna==2.8                 # via requests
-importlib-metadata==0.18  # via pluggy
-pathlib2==2.3.3           # via importlib-metadata
-pluggy==0.12.0            # via tox
+importlib-metadata==0.23  # via pluggy, tox
+more-itertools==5.0.0     # via zipp
+packaging==19.2           # via tox
+pathlib2==2.3.5           # via importlib-metadata
+pluggy==0.13.0            # via tox
 py==1.8.0                 # via tox
+pyparsing==2.4.5          # via packaging
 requests==2.22.0          # via codecov
 scandir==1.10.0           # via pathlib2
-six==1.12.0               # via pathlib2, tox
+six==1.13.0               # via more-itertools, packaging, pathlib2, tox
 toml==0.10.0              # via tox
 tox-battery==0.5.1
-tox==3.12.1
-urllib3==1.25.3           # via requests
-virtualenv==16.6.0        # via tox
-zipp==0.5.1               # via importlib-metadata
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools==41.0.1        # via tox
+tox==3.14.0
+urllib3==1.25.6           # via requests
+virtualenv==16.7.7        # via tox
+zipp==0.6.0               # via importlib-metadata

setup.py

@@ -3,6 +3,7 @@
 # pylint: disable=C0111,W6005,W6100
 from __future__ import absolute_import, print_function
 
+import io
 import os
 import re
 import sys
@@ -35,7 +36,7 @@ def load_requirements(*requirements_paths):
                 line.split('#')[0].strip() for line in reqs
                 if is_requirement(line.strip())
             )
-    return list(requirements) + ["Django>=1.8,<2"]
+    return list(requirements) + ['Django>=1.11,<2.0;python_version<"3"', 'Django>=1.11;python_version>"3"']
 
 
 def is_requirement(line):
@@ -54,8 +55,8 @@ def is_requirement(line):
     os.system("git push --tags")
     sys.exit()
 
-README = open(os.path.join(os.path.dirname(__file__), 'README.rst')).read()
-CHANGELOG = open(os.path.join(os.path.dirname(__file__), 'CHANGELOG.rst')).read()
+README = io.open(os.path.join(os.path.dirname(__file__), 'README.rst'), encoding='utf-8').read()
+CHANGELOG = io.open(os.path.join(os.path.dirname(__file__), 'CHANGELOG.rst'), encoding='utf-8').read()
 
 setup(
     name='help-tokens',
@@ -76,10 +77,10 @@ def is_requirement(line):
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Framework :: Django',
-        'Framework :: Django :: 1.8',
-        'Framework :: Django :: 1.9',
-        'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
+        'Framework :: Django :: 2.0',
+        'Framework :: Django :: 2.1',
+        'Framework :: Django :: 2.2',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
         'Natural Language :: English',

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = {py27,py35}-django{18,19,110,111}
+envlist = py{27,35}-django{111},py{35,36}-django{20,21,22}
 
 [pycodestyle]
 exclude = .git,.tox,migrations
@@ -20,13 +20,13 @@ norecursedirs = .* requirements
 
 [testenv]
 deps =
-    django18: Django>=1.8,<1.9
-    django19: Django>=1.9,<1.10
-    django110: Django>=1.10,<1.11
-    django111: Django>=1.11,<2
+    django111: Django>=1.11,<2.0
+    django20: Django>=2.0,<2.1
+    django21: Django>=2.1,<2.2
+    django22: Django>=2.2,<2.3
     -r{toxinidir}/requirements/test.txt
 commands =
-    py.test {posargs}
+    python -Wd -m pytest {posargs}
 
 [testenv:quality]
 whitelist_externals =