Merge 5dc2380 into 2b3f8b5

.travis.yml

@@ -1,13 +1,23 @@
 language: python
 
-python: 3.5
-env:
-    - TOXENV=py27
-    - TOXENV=py33
-    - TOXENV=py34
-    - TOXENV=py35
-    - TOXENV=pep8
-    - TOXENV=coverage
+python: 3.8
+
+cache: pip
+
+matrix:
+    include:
+        - python: "3.6"
+          env: TOXENV=py36
+        - python: "3.7"
+          env: TOXENV=py37
+        - python: "3.8"
+          env: TOXENV=py38
+        - python: "3.8"
+          env: TOXENV=pep8
+        - python: "3.8"
+          env: TOXENV=coverage
+before_install:
+    - pip install --upgrade pip setuptools
 install:
     - pip install tox
     - if [ "$TOXENV" = 'coverage' ]; then pip install coveralls; fi
@@ -23,4 +33,4 @@ deploy:
     distributions: "sdist bdist_wheel"
     on:
         tags: true
-        condition: $TOXENV = py35
+        condition: $TOXENV = py37

setup.py

@@ -45,13 +45,16 @@ def get_long_description():
             'coverage',
             'pytest',
             'webtest',
-            'pyscss'
+            'pyscss',
+            'tox'
         ],
     ),
     classifiers=[
         'Intended Audience :: Developers',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'License :: OSI Approved :: BSD License',
     ]

tox.ini

@@ -1,21 +1,22 @@
 [tox]
-envlist = py27,py33,py34,py35,pep8,coverage
+envlist = py36,py37,py38,pep8,coverage
 
 [testenv]
 deps = -e{toxinidir}[test]
 
-commands = py.test -v {posargs}
+commands = pytest -v {posargs}
 
 [testenv:pep8]
-basepython = python3.5
+basepython = python3.8
 deps = flake8
+       pep8
 commands = flake8 more setup.py
 
 [testenv:coverage]
-basepython = python3.5
+basepython = python3.8
 deps = {[testenv]deps}
 commands =
-    coverage run --source more.webassets -m py.test {posargs}
+    coverage run --source more.webassets -m pytest {posargs}
     coverage report -m
 
 [pytest]