Merge pull request #219 from edx/usamasadiq/bom-1548-tox-travis-update

Travis and Tox Update
openedx · Apr 30, 2020 · 966857c · 966857c
2 parents ef9c7f9 + e7c776a
commit 966857c
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 38 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,18 +2,11 @@ language: python
 
 python:
   - 3.5
+  - 3.8
 
 env:
-- TOXENV=django111
-- TOXENV=django20
-- TOXENV=django21
 - TOXENV=django22
-
-matrix:
-  include:
-  - python: 3.5
-    env: TOXENV=quality
-
+- TOXENV=quality
 
 install:
 - pip install -r requirements/travis.txt

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -13,8 +13,5 @@
 # and we want to allow edx-platform to update this separately.
 djangorestframework==3.9.4
 
-# Constraining to older version that supports django 1.11.
-django-model-utils<4.0
-
 # zipp 2.0.0 requires Python >= 3.6
 zipp==1.0.0
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -10,22 +10,22 @@ argparse==1.4.0           # via caniusepython3
 astroid==2.3.3            # via pylint, pylint-celery
 attrs==19.3.0             # via pytest
 backports.functools-lru-cache==1.6.1  # via caniusepython3
-bleach==3.1.4             # via readme-renderer
+bleach==3.1.5             # via readme-renderer
 boto==2.49.0              # via -r requirements/base.in
 caniusepython3==7.2.0     # via -r requirements/quality.in
 certifi==2020.4.5.1       # via requests
 cffi==1.14.0              # via cryptography
 chardet==3.0.4            # via pysrt, requests
 click-log==0.3.2          # via edx-lint
-click==7.1.1              # via click-log, edx-lint, pip-tools
+click==7.1.2              # via click-log, edx-lint, pip-tools
 coverage==5.1             # via -r requirements/test.in, coveralls, pytest-cov
 coveralls==2.0.0          # via -r requirements/travis.in
 cryptography==2.9.2       # via django-fernet-fields
 ddt==1.3.1                # via -r requirements/test.in
 diff-cover==2.6.1         # via -r requirements/dev.in
 distlib==0.3.0            # via caniusepython3, virtualenv
 django-fernet-fields==0.6  # via -r requirements/base.in
-django-model-utils==3.2.0  # via -c requirements/constraints.txt, -r requirements/base.in
+django-model-utils==4.0.0  # via -r requirements/base.in
 django-storages==1.9.1    # via -r requirements/base.in
 django-waffle==0.20.0     # via edx-django-utils, edx-drf-extensions
 django==2.2.12            # via -r requirements/base.in, django-fernet-fields, django-model-utils, django-storages, drf-jwt, edx-django-utils, edx-drf-extensions, rest-condition
@@ -55,10 +55,10 @@ mccabe==0.6.1             # via pylint
 mock==3.0.5               # via -r requirements/test.in
 more-itertools==8.2.0     # via pytest, zipp
 newrelic==5.12.0.140      # via edx-django-utils
-packaging==20.3           # via caniusepython3, pytest, tox
+packaging==20.3           # via bleach, caniusepython3, pytest, tox
 pathlib2==2.3.5           # via pytest
 pbr==5.4.5                # via stevedore
-pip-tools==5.0.0          # via -r requirements/dev.in
+pip-tools==5.1.0          # via -r requirements/dev.in
 pkginfo==1.5.0.1          # via twine
 pluggy==0.13.1            # via diff-cover, pytest, tox
 psutil==1.2.1             # via edx-django-utils
@@ -81,13 +81,13 @@ 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-cov, pytest-django
 python-dateutil==2.8.1    # via edx-drf-extensions
-pytz==2019.3              # via django, fs
+pytz==2020.1              # via django, fs
 readme-renderer==26.0     # via twine
 requests-toolbelt==0.9.1  # via twine
 requests==2.23.0          # via caniusepython3, coveralls, edx-drf-extensions, pyjwkest, requests-toolbelt, responses, twine
 responses==0.10.14        # via -r requirements/test.in
 rest-condition==1.0.3     # via edx-drf-extensions
-semantic-version==2.8.4   # via edx-drf-extensions
+semantic-version==2.8.5   # via edx-drf-extensions
 six==1.14.0               # via astroid, bleach, cryptography, diff-cover, django-waffle, edx-drf-extensions, edx-lint, edx-opaque-keys, fs, mock, packaging, pathlib2, pip-tools, pyjwkest, python-dateutil, readme-renderer, responses, stevedore, tox, virtualenv
 snowballstemmer==2.0.0    # via pydocstyle
 sqlparse==0.3.1           # via django

diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -10,20 +10,20 @@ argparse==1.4.0           # via caniusepython3
 astroid==2.3.3            # via pylint, pylint-celery
 attrs==19.3.0             # via pytest
 backports.functools-lru-cache==1.6.1  # via caniusepython3
-bleach==3.1.4             # via readme-renderer
+bleach==3.1.5             # via readme-renderer
 boto==2.49.0              # via -r requirements/base.in
 caniusepython3==7.2.0     # via -r requirements/quality.in
 certifi==2020.4.5.1       # via requests
 cffi==1.14.0              # via cryptography
 chardet==3.0.4            # via pysrt, requests
 click-log==0.3.2          # via edx-lint
-click==7.1.1              # via click-log, edx-lint
+click==7.1.2              # via click-log, edx-lint
 coverage==5.1             # via -r requirements/test.in, pytest-cov
 cryptography==2.9.2       # via django-fernet-fields
 ddt==1.3.1                # via -r requirements/test.in
 distlib==0.3.0            # via caniusepython3
 django-fernet-fields==0.6  # via -r requirements/base.in
-django-model-utils==3.2.0  # via -c requirements/constraints.txt, -r requirements/base.in
+django-model-utils==4.0.0  # via -r requirements/base.in
 django-storages==1.9.1    # via -r requirements/base.in
 django-waffle==0.20.0     # via edx-django-utils, edx-drf-extensions
 django==2.2.12            # via -r requirements/base.in, django-fernet-fields, django-model-utils, django-storages, drf-jwt, edx-django-utils, edx-drf-extensions, rest-condition
@@ -46,7 +46,7 @@ mccabe==0.6.1             # via pylint
 mock==3.0.5               # via -r requirements/test.in
 more-itertools==8.2.0     # via pytest
 newrelic==5.12.0.140      # via edx-django-utils
-packaging==20.3           # via caniusepython3, pytest
+packaging==20.3           # via bleach, caniusepython3, pytest
 pathlib2==2.3.5           # via pytest
 pbr==5.4.5                # via stevedore
 pkginfo==1.5.0.1          # via twine
@@ -71,13 +71,13 @@ 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-cov, pytest-django
 python-dateutil==2.8.1    # via edx-drf-extensions
-pytz==2019.3              # via django, fs
+pytz==2020.1              # via django, fs
 readme-renderer==26.0     # via twine
 requests-toolbelt==0.9.1  # via twine
 requests==2.23.0          # via caniusepython3, edx-drf-extensions, pyjwkest, requests-toolbelt, responses, twine
 responses==0.10.14        # via -r requirements/test.in
 rest-condition==1.0.3     # via edx-drf-extensions
-semantic-version==2.8.4   # via edx-drf-extensions
+semantic-version==2.8.5   # via edx-drf-extensions
 six==1.14.0               # via astroid, bleach, cryptography, django-waffle, edx-drf-extensions, edx-lint, edx-opaque-keys, fs, mock, packaging, pathlib2, pyjwkest, python-dateutil, readme-renderer, responses, stevedore
 snowballstemmer==2.0.0    # via pydocstyle
 sqlparse==0.3.1           # via django

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -15,7 +15,7 @@ coverage==5.1             # via -r requirements/test.in, pytest-cov
 cryptography==2.9.2       # via django-fernet-fields
 ddt==1.3.1                # via -r requirements/test.in
 django-fernet-fields==0.6  # via -r requirements/base.in
-django-model-utils==3.2.0  # via -c requirements/constraints.txt, -r requirements/base.in
+django-model-utils==4.0.0  # via -r requirements/base.in
 django-storages==1.9.1    # via -r requirements/base.in
 django-waffle==0.20.0     # via edx-django-utils, edx-drf-extensions
 djangorestframework==3.9.4  # via -c requirements/constraints.txt, drf-jwt, edx-drf-extensions, rest-condition
@@ -49,11 +49,11 @@ 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-cov, pytest-django
 python-dateutil==2.8.1    # via edx-drf-extensions
-pytz==2019.3              # via django, fs
+pytz==2020.1              # via django, fs
 requests==2.23.0          # via edx-drf-extensions, pyjwkest, responses
 responses==0.10.14        # via -r requirements/test.in
 rest-condition==1.0.3     # via edx-drf-extensions
-semantic-version==2.8.4   # via edx-drf-extensions
+semantic-version==2.8.5   # via edx-drf-extensions
 six==1.14.0               # via cryptography, django-waffle, edx-drf-extensions, edx-opaque-keys, fs, mock, packaging, pathlib2, pyjwkest, python-dateutil, responses, stevedore
 sqlparse==0.3.1           # via django
 stevedore==1.32.0         # via edx-opaque-keys

diff --git a/setup.py b/setup.py
@@ -46,7 +46,7 @@ def load_requirements(*requirements_paths):
     return list(requirements)
 
 
-VERSION = '1.3.2'
+VERSION = '1.3.3'
 
 if sys.argv[-1] == 'tag':
     print("Tagging the version on github:")
@@ -69,14 +69,10 @@ def load_requirements(*requirements_paths):
         'License :: OSI Approved :: GNU Affero General Public License v3',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.8',
         'Framework :: Django',
-        'Framework :: Django :: 1.11',
-        'Framework :: Django :: 2.0',
-        'Framework :: Django :: 2.1',
         'Framework :: Django :: 2.2',
     ],
     packages=PACKAGES,

diff --git a/tox.ini b/tox.ini
@@ -1,12 +1,10 @@
 [tox]
-envlist = py{35}-django{111,20,21,22}
+envlist = py35-django22, py38-django{22,30}
 
 [testenv]
 deps =
-    django111: Django>=1.11,<2
-    django20: Django>=2.0,<2.1
-    django21: Django>=2.1,<2.2
     django22: Django>=2.2,<2.3
+    django30: Django>=3.0,<3.1
     -r{toxinidir}/requirements/test.txt
 commands =
     python -Wd -m pytest {posargs}