Merge pull request #37 from edx/usamasadiq/bom-1565

Updating python and django in Travis and Tox

Author: UsamaSadiq

.travis.yml

@@ -2,41 +2,24 @@
 
 language: python
 
-matrix:
-  include:
-    - python: 2.7
-      env: TOXENV=py27-django111
-    - python: 3.5
-      env: TOXENV=py35-django111
-    - python: 3.5
-      env: TOXENV=py35-django111
-    - python: 3.5
-      env: TOXENV=py35-django20
-    - python: 3.5
-      env: TOXENV=py35-django21
-    - python: 3.5
-      env: TOXENV=py35-django22
-    - python: 3.5
-      env: TOXENV=quality
-    - python: 3.5
-      env: TOXENV=docs
-    - python: 3.6
-      env: TOXENV=py36-django111
-    - python: 3.6
-      env: TOXENV=py36-django20
-    - python: 3.6
-      env: TOXENV=py36-django21
-    - python: 3.6
-      env: TOXENV=py36-django22
+python:
+  - 3.5
+  - 3.8
+
+env:
+  - TOXENV=django22
+  - TOXENV=quality
+  - TOXENV=docs
 
 cache:
   - pip
-  
+
 before_install:
   - pip install --upgrade pip
 
 install:
   - pip install -r requirements/travis.txt
+  - pip install pip==20.0.2
 
 script:
   - tox
@@ -52,6 +35,7 @@ deploy:
   distributions: sdist bdist_wheel
   on:
     tags: true
+    python: 3.5
     condition: '$TOXENV = quality'
   password:
     secure: Q+rwwfNHu5nHSowWdT2K0pDr7pwccsFlTHvwXMUaSK7D7tXRYju9fHWGA3zVHJzYxD8V2UvSYapAdQldkwws5jcspZsDK8wyGS8W66lQ/W/5SnEo/u4+G4OAcSJAb7WIv1K9qI15xqQ+o25sh3kZa+8DSX9Aot+jLkm1vuxv8Togj8MGmdxhBnajlonfaTuK6asAkqvKbJqStcMgv10Vy3Yq2vqYLAqgS4aVpruLLb7F+BA0gY/FGgZNXTtFH/X6EX8L7IZIocp3eQylFq9yeQlGS9nIkTagYbBZcmN0khgJoqRksfuTDsleEsJ8kEKnOo56HjuNByljN/Fh5jpQDb7j2IqocwwarKGz7rDdEH28KN/r/GgUIDquuMLxNvqGTjpLeTjAYlHM1GRbOYlqgCMbWpl7/lcawHkSvkYW47gHl6YqmtI4KX/Nm+/SAWZvxjG0sDY5vUtqmLzH7L6FmAMn0C46H5o+MJ9ChdjRnRDU7BJFrXhKerKOwT1jdk7Dj99Uf39mSkLVsE3RC7+8xDCbBY3+qxmD0XsD6uX4CFfmOQrJEoeDlLbTIkQg8vFetEBedRaBrVbBztnWG9wgAWQYA0oxo+s/67BOTd/UkQrReNTwTaMIwuTaibDEl0OEa7jBtkBAbUKJWg+6Ih0HT0J67dULrswPoZ1V8UHVMsQ=

CHANGELOG.rst

@@ -6,7 +6,7 @@ Change Log
    in this file.  It adheres to the structure of http://keepachangelog.com/ ,
    but in reStructuredText instead of Markdown (for ease of incorporation into
    Sphinx documentation and the PyPI description).
-   
+
    This project adheres to Semantic Versioning (http://semver.org/).
 
 .. There should always be an "Unreleased" section for changes pending release.
@@ -16,6 +16,13 @@ Unreleased
 
 *
 
+[0.3.4] - 2020-05-06
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Removed support for Django<2.2
+* Removed support for Python2.7 and Python3.6
+* Added support for Python3.8
+
 [0.3.2] - 2019-06-21
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

code_annotations/__init__.py

@@ -4,4 +4,4 @@
 
 from __future__ import absolute_import, unicode_literals
 
-__version__ = '0.3.3'
+__version__ = '0.3.4'

requirements/base.in

@@ -3,7 +3,7 @@
 -c constraints.txt
 
 click>=7.0,<8.0
-Django>=1.11,<2.3           # Web application framework
+Django           # Web application framework
 Jinja2
 pyyaml
 python-slugify

requirements/base.txt

@@ -4,14 +4,15 @@
 #
 #    make upgrade
 #
-click==7.0
-django==1.11.26
-jinja2==2.10.3
+click==7.1.2              # via -r requirements/base.in
+django==2.2.12            # via -c requirements/constraints.txt, -r requirements/base.in
+jinja2==2.11.2            # via -r requirements/base.in
 markupsafe==1.1.1         # via jinja2
-pbr==5.4.4                # via stevedore
-python-slugify==4.0.0
-pytz==2019.3              # via django
-pyyaml==5.2
-six==1.13.0               # via stevedore
-stevedore==1.31.0
+pbr==5.4.5                # via stevedore
+python-slugify==4.0.0     # via -r requirements/base.in
+pytz==2020.1              # via django
+pyyaml==5.3.1             # via -r requirements/base.in
+six==1.14.0               # via stevedore
+sqlparse==0.3.1           # via django
+stevedore==1.32.0         # via -r requirements/base.in
 text-unidecode==1.3       # via python-slugify

requirements/constraints.txt

@@ -8,9 +8,5 @@
 # pin when possible.  Writing an issue against the offending project and
 # linking to it here is good.
 
-# This package is a  backport which can only be installed on Python 2.7
-futures ; python_version == "2.7"
-
-# These packages are being constrained to versions that are compatible with python 2.7.
-more-itertools<6 
-pytest==4.6.7
+# stay on an lts release
+django<2.3

requirements/dev.txt

@@ -4,71 +4,70 @@
 #
 #    make upgrade
 #
-argparse==1.4.0
-astroid==1.6.6
-atomicwrites==1.3.0
-attrs==19.3.0
-backports.functools-lru-cache==1.6.1
-caniusepython3==7.2.0
-certifi==2019.11.28
-chardet==3.0.4
-click-log==0.3.2
-click==7.0
-codecov==2.0.15
-configparser==4.0.2
-coverage==4.5.4
-diff-cover==2.4.1
-distlib==0.3.0
-django==1.11.26
-edx-lint==1.4.1
-enum34==1.1.6
-filelock==3.0.12
-funcsigs==1.0.2
-futures==3.3.0 ; python_version == "2.7"
-idna==2.8
-importlib-metadata==1.3.0
+appdirs==1.4.3            # via -r requirements/travis.txt, virtualenv
+argparse==1.4.0           # via -r requirements/quality.txt, caniusepython3
+astroid==2.3.3            # via -r requirements/quality.txt, pylint, pylint-celery
+attrs==19.3.0             # via -r requirements/quality.txt, pytest
+backports.functools-lru-cache==1.6.1  # via -r requirements/quality.txt, caniusepython3
+caniusepython3==7.2.0     # via -r requirements/quality.txt
+certifi==2020.4.5.1       # via -r requirements/quality.txt, -r requirements/travis.txt, requests
+chardet==3.0.4            # via -r requirements/quality.txt, -r requirements/travis.txt, requests
+click-log==0.3.2          # via -r requirements/quality.txt, edx-lint
+click==7.1.2              # via -r requirements/pip-tools.txt, -r requirements/quality.txt, click-log, edx-lint, pip-tools
+codecov==2.0.22           # via -r requirements/travis.txt
+coverage==5.1             # via -r requirements/quality.txt, -r requirements/travis.txt, codecov, pytest-cov
+diff-cover==2.6.1         # via -r requirements/dev.in
+distlib==0.3.0            # via -r requirements/quality.txt, -r requirements/travis.txt, caniusepython3, virtualenv
+django==2.2.12            # via -c requirements/constraints.txt, -r requirements/quality.txt
+edx-lint==1.4.1           # via -r requirements/quality.txt
+filelock==3.0.12          # via -r requirements/travis.txt, tox, virtualenv
+idna==2.9                 # via -r requirements/quality.txt, -r requirements/travis.txt, requests
+importlib-metadata==1.6.0  # via -r requirements/quality.txt, -r requirements/travis.txt, importlib-resources, pluggy, pytest, tox, virtualenv
+importlib-resources==1.5.0  # via -r requirements/travis.txt, virtualenv
 inflect==3.0.2            # via jinja2-pluralize
-isort==4.3.21
+isort==4.3.21             # via -r requirements/quality.txt, pylint
 jinja2-pluralize==0.3.0   # via diff-cover
-jinja2==2.10.3
-lazy-object-proxy==1.4.3
-markupsafe==1.1.1
-mccabe==0.6.1
-mock==3.0.5
-more-itertools==5.0.0
-packaging==19.2
-pathlib2==2.3.5
-pbr==5.4.4
-pip-tools==4.3.0
-pluggy==0.13.1
-py==1.8.0
-pycodestyle==2.5.0
-pydocstyle==3.0.0
-pygments==2.5.2           # via diff-cover
-pylint-celery==0.3
-pylint-django==0.11.1
-pylint-plugin-utils==0.6
-pylint==1.9.5
-pyparsing==2.4.5
-pytest-cov==2.8.1
-pytest==4.6.7
-python-slugify==4.0.0
-pytz==2019.3
-pyyaml==5.2
-requests==2.22.0
-scandir==1.10.0
-singledispatch==3.4.0.3
-six==1.13.0
-snowballstemmer==2.0.0
-stevedore==1.31.0
-text-unidecode==1.3
-toml==0.10.0
-tox-battery==0.5.1
-tox==3.14.2
-urllib3==1.25.7
-virtualenv==16.7.8
-wcwidth==0.1.7
-wrapt==1.11.2
+jinja2==2.11.2            # via -r requirements/quality.txt, diff-cover, jinja2-pluralize
+lazy-object-proxy==1.4.3  # via -r requirements/quality.txt, astroid
+markupsafe==1.1.1         # via -r requirements/quality.txt, jinja2
+mccabe==0.6.1             # via -r requirements/quality.txt, pylint
+mock==3.0.5               # via -r requirements/quality.txt
+more-itertools==8.2.0     # via -r requirements/quality.txt, pytest
+packaging==20.3           # via -r requirements/quality.txt, -r requirements/travis.txt, caniusepython3, pytest, tox
+pathlib2==2.3.5           # via -r requirements/quality.txt, pytest
+pbr==5.4.5                # via -r requirements/quality.txt, stevedore
+pip-tools==5.1.0          # via -r requirements/pip-tools.txt
+pluggy==0.13.1            # via -r requirements/quality.txt, -r requirements/travis.txt, diff-cover, pytest, tox
+py==1.8.1                 # via -r requirements/quality.txt, -r requirements/travis.txt, pytest, tox
+pycodestyle==2.5.0        # via -r requirements/quality.txt
+pydocstyle==5.0.2         # via -r requirements/quality.txt
+pygments==2.6.1           # via diff-cover
+pylint-celery==0.3        # via -r requirements/quality.txt, edx-lint
+pylint-django==2.0.11     # via -r requirements/quality.txt, edx-lint
+pylint-plugin-utils==0.6  # via -r requirements/quality.txt, pylint-celery, pylint-django
+pylint==2.4.2             # via -r requirements/quality.txt, edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
+pyparsing==2.4.7          # via -r requirements/quality.txt, -r requirements/travis.txt, packaging
+pytest-cov==2.8.1         # via -r requirements/quality.txt
+pytest==5.4.1             # via -r requirements/quality.txt, pytest-cov
+python-slugify==4.0.0     # via -r requirements/quality.txt
+pytz==2020.1              # via -r requirements/quality.txt, django
+pyyaml==5.3.1             # via -r requirements/quality.txt
+requests==2.23.0          # via -r requirements/quality.txt, -r requirements/travis.txt, caniusepython3, codecov
+six==1.14.0               # via -r requirements/pip-tools.txt, -r requirements/quality.txt, -r requirements/travis.txt, astroid, diff-cover, edx-lint, mock, packaging, pathlib2, pip-tools, stevedore, tox, virtualenv
+snowballstemmer==2.0.0    # via -r requirements/quality.txt, pydocstyle
+sqlparse==0.3.1           # via -r requirements/quality.txt, django
+stevedore==1.32.0         # via -r requirements/quality.txt
+text-unidecode==1.3       # via -r requirements/quality.txt, python-slugify
+toml==0.10.0              # via -r requirements/travis.txt, tox
+tox-battery==0.5.2        # via -r requirements/travis.txt
+tox==3.14.6               # via -r requirements/travis.txt, tox-battery
+typed-ast==1.4.1          # via -r requirements/quality.txt, astroid
+urllib3==1.25.9           # via -r requirements/quality.txt, -r requirements/travis.txt, requests
+virtualenv==20.0.18       # via -r requirements/travis.txt, tox
+wcwidth==0.1.9            # via -r requirements/quality.txt, pytest
+wrapt==1.11.2             # via -r requirements/quality.txt, astroid
+zipp==1.2.0               # via -r requirements/quality.txt, -r requirements/travis.txt, importlib-metadata, importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:
+# pip
 # setuptools

requirements/doc.txt

@@ -5,52 +5,55 @@
 #    make upgrade
 #
 alabaster==0.7.12         # via sphinx
-atomicwrites==1.3.0
-attrs==19.3.0
-babel==2.7.0              # via sphinx
-bleach==3.1.0             # via readme-renderer
-certifi==2019.11.28       # via requests
+attrs==19.3.0             # via -r requirements/test.txt, pytest
+babel==2.8.0              # via sphinx
+bleach==3.1.5             # via readme-renderer
+certifi==2020.4.5.1       # via requests
 chardet==3.0.4            # via doc8, requests
-click==7.0
-coverage==4.5.4
-django==1.11.26
-doc8==0.8.0
-docutils==0.15.2          # via doc8, readme-renderer, restructuredtext-lint, sphinx
-edx-sphinx-theme==1.5.0
-funcsigs==1.0.2
-idna==2.8                 # via requests
-imagesize==1.1.0          # via sphinx
-importlib-metadata==1.3.0
-jinja2==2.10.3
-markupsafe==1.1.1
-mock==3.0.5
-more-itertools==5.0.0
-packaging==19.2
-pathlib2==2.3.5
-pbr==5.4.4
-pluggy==0.13.1
-py==1.8.0
-pygments==2.5.2           # via readme-renderer, sphinx
-pyparsing==2.4.5          # via packaging
-pytest-cov==2.8.1
-pytest==4.6.7
-python-slugify==4.0.0
-pytz==2019.3
-pyyaml==5.2
-readme-renderer==24.0
-requests==2.22.0          # via sphinx
+click==7.1.2              # via -r requirements/test.txt
+coverage==5.1             # via -r requirements/test.txt, pytest-cov
+django==2.2.12            # via -c requirements/constraints.txt, -r requirements/test.txt
+doc8==0.8.0               # via -r requirements/doc.in
+docutils==0.16            # via doc8, readme-renderer, restructuredtext-lint, sphinx
+edx-sphinx-theme==1.5.0   # via -r requirements/doc.in
+idna==2.9                 # via requests
+imagesize==1.2.0          # via sphinx
+importlib-metadata==1.6.0  # via -r requirements/test.txt, pluggy, pytest
+jinja2==2.11.2            # via -r requirements/test.txt, sphinx
+markupsafe==1.1.1         # via -r requirements/test.txt, jinja2
+mock==3.0.5               # via -r requirements/test.txt
+more-itertools==8.2.0     # via -r requirements/test.txt, pytest
+packaging==20.3           # via -r requirements/test.txt, bleach, pytest, sphinx
+pathlib2==2.3.5           # via -r requirements/test.txt, pytest
+pbr==5.4.5                # via -r requirements/test.txt, stevedore
+pluggy==0.13.1            # via -r requirements/test.txt, pytest
+py==1.8.1                 # via -r requirements/test.txt, pytest
+pygments==2.6.1           # via readme-renderer, sphinx
+pyparsing==2.4.7          # via -r requirements/test.txt, packaging
+pytest-cov==2.8.1         # via -r requirements/test.txt
+pytest==5.4.1             # via -r requirements/test.txt, pytest-cov
+python-slugify==4.0.0     # via -r requirements/test.txt
+pytz==2020.1              # via -r requirements/test.txt, babel, django
+pyyaml==5.3.1             # via -r requirements/test.txt
+readme-renderer==26.0     # via -r requirements/doc.in
+requests==2.23.0          # via sphinx
 restructuredtext-lint==1.3.0  # via doc8
-scandir==1.10.0           # via pathlib2
-six==1.13.0
+six==1.14.0               # via -r requirements/test.txt, bleach, doc8, edx-sphinx-theme, mock, packaging, pathlib2, readme-renderer, stevedore
 snowballstemmer==2.0.0    # via sphinx
-sphinx==1.8.5
-sphinxcontrib-websupport==1.1.2  # via sphinx
-stevedore==1.31.0
-text-unidecode==1.3
-typing==3.7.4.1           # via sphinx
-urllib3==1.25.7           # via requests
-wcwidth==0.1.7
+sphinx==3.0.3             # via -r requirements/doc.in, edx-sphinx-theme
+sphinxcontrib-applehelp==1.0.2  # via sphinx
+sphinxcontrib-devhelp==1.0.2  # via sphinx
+sphinxcontrib-htmlhelp==1.0.3  # via sphinx
+sphinxcontrib-jsmath==1.0.1  # via sphinx
+sphinxcontrib-qthelp==1.0.3  # via sphinx
+sphinxcontrib-serializinghtml==1.1.4  # via sphinx
+sqlparse==0.3.1           # via -r requirements/test.txt, django
+stevedore==1.32.0         # via -r requirements/test.txt, doc8
+text-unidecode==1.3       # via -r requirements/test.txt, python-slugify
+urllib3==1.25.9           # via requests
+wcwidth==0.1.9            # via -r requirements/test.txt, pytest
 webencodings==0.5.1       # via bleach
+zipp==1.2.0               # via -r requirements/test.txt, importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

requirements/pip-tools.txt

@@ -4,6 +4,9 @@
 #
 #    make upgrade
 #
-click==7.0                # via pip-tools
-pip-tools==4.3.0
-six==1.13.0               # via pip-tools
+click==7.1.2              # via pip-tools
+pip-tools==5.1.0          # via -r requirements/pip-tools.in
+six==1.14.0               # via pip-tools
+
+# The following packages are considered to be unsafe in a requirements file:
+# pip