Merge pull request #8 from edx/iamsobanjaved/python38

addded python 3.8 in test matrix

Author: iamsobanjaved

.travis.yml

@@ -3,30 +3,18 @@
 language: python
 
 python:
-  - 2.7
   - 3.5
-  - 3.6
+  - 3.8
 
 env:
-  - 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
-
+  - TOXENV=django22
+  - TOXENV=quality
 
 cache:
   - pip
 
 before_install:
-  - pip install --upgrade pip
+  - pip install pip==20.0.2
 
 install:
   - pip install -r requirements/travis.txt

CHANGELOG.rst

@@ -11,6 +11,12 @@ Change Log
 
 .. There should always be an "Unreleased" section for changes pending release.
 
+[1.1.0] - 2020-05-05
+====================
+
+* Removed support of Django < 2.2 version
+* Added support for python 3.8
+
 [1.0.3] - 2017-07-17
 ====================
 

help_tokens/__init__.py

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

help_tokens/core.py

@@ -14,7 +14,7 @@
 log = logging.getLogger(__name__)
 
 
-class HelpUrlExpert(object):
+class HelpUrlExpert:
     """A thing that is good at getting help URLs from tokens."""
 
     def __init__(self, ini_file_name):

requirements/constraints.txt

@@ -8,5 +8,5 @@
 # pin when possible.  Writing an issue against the offending project and
 # linking to it here is good.
 
- # These packages are backports which can only be installed on Python 2.7
-futures ; python_version == "2.7"
+# Stay on an LTS release
+django<2.3

requirements/dev.txt

@@ -4,73 +4,69 @@
 #
 #    make upgrade
 #
+appdirs==1.4.3            # via virtualenv
 argparse==1.4.0           # via caniusepython3
-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.2.0
-certifi==2019.9.11        # via requests
+astroid==2.3.3            # via pylint, pylint-celery
+backports.functools-lru-cache==1.6.1  # via caniusepython3
+bleach==3.1.5             # via readme-renderer
+caniusepython3==7.2.0     # via -r requirements/quality.in
+certifi==2020.4.5.1       # 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==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.4.1
-enum34==1.1.6             # via astroid
-filelock==3.0.12          # via tox
-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.23  # via inflect, path.py, pluggy, tox
+click==7.1.2              # via click-log, edx-lint, pip-tools
+diff-cover==2.6.1         # via -r requirements/dev.in
+distlib==0.3.0            # via caniusepython3, virtualenv
+django==2.2.12            # via -c requirements/constraints.txt, -r requirements/base.in, edx-i18n-tools
+docutils==0.16            # via readme-renderer
+edx-i18n-tools==0.5.0     # via -r requirements/dev.in
+edx-lint==1.4.1           # via -r requirements/dev.in, -r requirements/quality.in
+filelock==3.0.12          # via tox, virtualenv
+idna==2.9                 # via requests
+importlib-metadata==1.6.0  # via importlib-resources, inflect, path, pluggy, tox, virtualenv
+importlib-resources==1.5.0  # via virtualenv
 inflect==3.0.2            # via jinja2-pluralize
-isort==4.3.21
+isort==4.3.21             # via -r requirements/quality.in, pylint
 jinja2-pluralize==0.3.0   # via diff-cover
-jinja2==2.10.3            # via diff-cover, jinja2-pluralize
+jinja2==2.11.2            # 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
-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.5           # via importlib-metadata
-pip-tools==4.2.0
+packaging==20.3           # via bleach, caniusepython3, tox
+path.py==12.4.0           # via edx-i18n-tools
+path==13.1.0              # via path.py
+pip-tools==5.1.2          # via -r requirements/dev.in
 pkginfo==1.5.0.1          # via twine
-pluggy==0.13.0            # via tox
+pluggy==0.13.1            # via diff-cover, 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
+py==1.8.1                 # via tox
+pycodestyle==2.5.0        # via -r requirements/quality.in
+pydocstyle==1.1.1         # via -r requirements/quality.in
+pygments==2.6.1           # via diff-cover, readme-renderer
 pylint-celery==0.3        # via edx-lint
-pylint-django==0.11.1     # via edx-lint
+pylint-django==2.0.11     # 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
+pylint==2.4.2             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
+pyparsing==2.4.7          # via packaging
+pytz==2020.1              # via django
+pyyaml==5.3.1             # via edx-i18n-tools
+readme-renderer==26.0     # via -r requirements/quality.in, twine
 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.13.0
+requests==2.23.0          # via caniusepython3, requests-toolbelt, twine
+six==1.14.0               # via -r requirements/base.in, astroid, bleach, diff-cover, edx-i18n-tools, edx-lint, packaging, pip-tools, readme-renderer, tox, virtualenv
+sqlparse==0.3.1           # via django
 toml==0.10.0              # via tox
-tox-battery==0.5.1
-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
+tox-battery==0.5.2        # via -r requirements/dev.in
+tox==3.15.0               # via -r requirements/dev.in, tox-battery
+tqdm==4.46.0              # via twine
+twine==1.15.0             # via -r requirements/dev.in
+typed-ast==1.4.1          # via astroid
+urllib3==1.25.9           # via requests
+virtualenv==20.0.20       # via tox
 webencodings==0.5.1       # via bleach
-wheel==0.33.6
+wheel==0.34.2             # via -r requirements/dev.in
 wrapt==1.11.2             # via astroid
-zipp==0.6.0               # via importlib-metadata
+zipp==1.2.0               # via importlib-metadata, importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools==41.6.0        # via caniusepython3, twine
+# pip
+# setuptools

requirements/quality.txt

@@ -5,40 +5,37 @@
 #    make upgrade
 #
 argparse==1.4.0           # via caniusepython3
-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.2.0
-certifi==2019.9.11        # via requests
+astroid==2.3.3            # via pylint, pylint-celery
+backports.functools-lru-cache==1.6.1  # via caniusepython3
+bleach==3.1.5             # via readme-renderer
+caniusepython3==7.2.0     # via -r requirements/quality.in
+certifi==2020.4.5.1       # 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==4.0.2       # via pylint
+click==7.1.2              # via click-log, edx-lint
 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.3.0 ; python_version == "2.7"  # via caniusepython3, isort
-idna==2.8                 # via requests
-isort==4.3.21
+docutils==0.16            # via readme-renderer
+edx-lint==1.4.1           # via -r requirements/quality.in
+idna==2.9                 # via requests
+isort==4.3.21             # via -r requirements/quality.in, pylint
 lazy-object-proxy==1.4.3  # via astroid
 mccabe==0.6.1             # via pylint
-packaging==19.2           # via caniusepython3
-pycodestyle==2.5.0
-pydocstyle==1.1.1
-pygments==2.4.2           # via readme-renderer
+packaging==20.3           # via bleach, caniusepython3
+pycodestyle==2.5.0        # via -r requirements/quality.in
+pydocstyle==1.1.1         # via -r requirements/quality.in
+pygments==2.6.1           # via readme-renderer
 pylint-celery==0.3        # via edx-lint
-pylint-django==0.11.1     # via edx-lint
+pylint-django==2.0.11     # 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.13.0               # via astroid, bleach, edx-lint, packaging, pylint, readme-renderer, singledispatch
-urllib3==1.25.6           # via requests
+pylint==2.4.2             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
+pyparsing==2.4.7          # via packaging
+readme-renderer==26.0     # via -r requirements/quality.in
+requests==2.23.0          # via caniusepython3
+six==1.14.0               # via astroid, bleach, edx-lint, packaging, readme-renderer
+typed-ast==1.4.1          # via astroid
+urllib3==1.25.9           # via requests
 webencodings==0.5.1       # via bleach
 wrapt==1.11.2             # via astroid
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools==41.6.0        # via caniusepython3
+# setuptools

requirements/test.txt

@@ -4,25 +4,21 @@
 #
 #    make upgrade
 #
-atomicwrites==1.3.0       # via pytest
 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.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.5          # via packaging
-pytest-catchlog==1.2.2
-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.13.0
-wcwidth==0.1.7            # via pytest
-zipp==0.6.0               # via importlib-metadata
+coverage==5.1             # via pytest-cov
+importlib-metadata==1.6.0  # via pluggy, pytest
+more-itertools==8.2.0     # via pytest
+packaging==20.3           # via pytest
+pathlib2==2.3.5           # via pytest
+pluggy==0.13.1            # via pytest
+py==1.8.1                 # via pytest, pytest-catchlog
+pyparsing==2.4.7          # via packaging
+pytest-catchlog==1.2.2    # via -r requirements/test.in
+pytest-cov==2.8.1         # via -r requirements/test.in
+pytest-django==3.9.0      # via -r requirements/test.in
+pytest==5.4.1             # via pytest-catchlog, pytest-cov, pytest-django
+pytz==2020.1              # via django
+six==1.14.0               # via -r requirements/base.in, -r requirements/test.in, packaging, pathlib2
+sqlparse==0.3.1           # via django
+wcwidth==0.1.9            # via pytest
+zipp==1.2.0               # via importlib-metadata

requirements/travis.txt

@@ -4,27 +4,25 @@
 #
 #    make upgrade
 #
-certifi==2019.9.11        # via requests
+appdirs==1.4.3            # via virtualenv
+certifi==2020.4.5.1       # via requests
 chardet==3.0.4            # via requests
-codecov==2.0.15
-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.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.13.0               # via more-itertools, packaging, pathlib2, tox
+codecov==2.0.22           # via -r requirements/travis.in
+coverage==5.1             # via codecov
+distlib==0.3.0            # via virtualenv
+filelock==3.0.12          # via tox, virtualenv
+idna==2.9                 # via requests
+importlib-metadata==1.6.0  # via importlib-resources, pluggy, tox, virtualenv
+importlib-resources==1.5.0  # via virtualenv
+packaging==20.3           # via tox
+pluggy==0.13.1            # via tox
+py==1.8.1                 # via tox
+pyparsing==2.4.7          # via packaging
+requests==2.23.0          # via codecov
+six==1.14.0               # via packaging, tox, virtualenv
 toml==0.10.0              # via tox
-tox-battery==0.5.1
-tox==3.14.0
-urllib3==1.25.6           # via requests
-virtualenv==16.7.7        # via tox
-zipp==0.6.0               # via importlib-metadata
+tox-battery==0.5.2        # via -r requirements/travis.in
+tox==3.15.0               # via -r requirements/travis.in, tox-battery
+urllib3==1.25.9           # via requests
+virtualenv==20.0.20       # via tox
+zipp==1.2.0               # via importlib-metadata, importlib-resources

setup.py

@@ -75,18 +75,14 @@ def is_requirement(line):
     zip_safe=False,
     keywords='Django edx',
     classifiers=[
-        'Development Status :: 5 - Production/Stable',
+        'Development Status ::5 - Production/Stable',
         'Framework :: Django',
-        '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',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.8',
     ],
 )