BOM-1580 : Update test matrix (#78)

.travis.yml

@@ -2,15 +2,14 @@ language: python
 dist: xenial  # required for Python >= 3.7 (travis-ci/travis-ci#9069)
 python:
     - 3.5
+    - 3.8
 env:
-    - TOXENV=django111
-    - TOXENV=django20
-    - TOXENV=django21
     - TOXENV=django22
+    - TOXENV=quality
+
 matrix:
-  include:
-    - python: 3.5
-      env: TOXENV=quality
+  allow_failures:
+    - python: 3.8
 
 services:
   - xvfb

requirements/dev.txt

@@ -19,7 +19,7 @@ edx-lint==1.4.1           # via -r requirements/test.txt
 filelock==3.0.12          # via -r requirements/travis.txt, tox, virtualenv
 fs==2.4.11                # via -r requirements/test.txt, xblock
 importlib-metadata==1.6.0  # via -r requirements/test.txt, -r requirements/travis.txt, importlib-resources, pluggy, pytest, tox, virtualenv
-importlib-resources==1.4.0  # via -r requirements/travis.txt, virtualenv
+importlib-resources==1.5.0  # via -r requirements/travis.txt, virtualenv
 isort==4.3.21             # via -r requirements/test.txt, pylint
 lazy-object-proxy==1.4.3  # via -r requirements/test.txt, astroid
 lxml==4.5.0               # via -r requirements/test.txt, xblock

requirements/travis.txt

@@ -8,7 +8,7 @@ appdirs==1.4.3            # via virtualenv
 distlib==0.3.0            # via virtualenv
 filelock==3.0.12          # via tox, virtualenv
 importlib-metadata==1.6.0  # via importlib-resources, pluggy, tox, virtualenv
-importlib-resources==1.4.0  # via 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

setup.py

@@ -88,9 +88,6 @@ def is_requirement(line):
     package_data=package_data("xblockutils", ["public", "templates", "templatetags"]),
     url='https://github.com/edx/xblock-utils',
     classifiers=[
-        'Framework :: Django :: 1.11',
-        'Framework :: Django :: 2.0',
-        'Framework :: Django :: 2.1',
         'Framework :: Django :: 2.2',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py35-django{111,20,21,22}
+envlist = py35-django22,py38-django{22,30}
 
 # The ordering of deps and commands here is weird due to the way we install xblock-sdk and associated dependencies.
 # Installing test/base.txt inside deps fails, and installing the env-specific Django versions inside deps
@@ -18,10 +18,8 @@ deps =
     {[base]deps}
 commands =
     {[base]commands}
-    django111: pip install Django>=1.11,<2.0
-    django20: pip install Django>=2.0,<2.1
-    django21: pip install Django>=2.1,<2.2
     django22: pip install Django>=2.2,<2.3
+    django30: pip install Django>=3.0,<3.1
     python -Wd -m pytest {posargs}
 
 [testenv:quality]