Merge pull request AltSchool#302 from AltSchool/update-tox-052020

Update tox testing

Author: suavesav

.circleci/config.yml

@@ -54,7 +54,7 @@ jobs:
           command: ENABLE_INTEGRATION_TESTS=True py.test tests/integration
       - run:
           name: Run Tox Tests
-          command: tox --parallel=4
+          command: tox --parallel=4 -q
 
 workflows:
   version: 2

.circleci/python-versions.txt

@@ -1 +1 @@
-2.7.16 3.5.7 3.6.9 3.7.4
+2.7.17 3.5.8 3.6.9 3.7.5 3.8.0

requirements.txt

@@ -8,5 +8,5 @@ pytest-sugar==0.9.0
 pytest==3.2.5  # last supported version python 2
 psycopg2==2.7.3.2
 tox-pyenv==1.1.0
-tox==3.13.2
+tox==3.14.6
 djay==0.0.8

setup.py

@@ -18,5 +18,18 @@
     packages=find_packages(),
     scripts=SCRIPTS,
     url=URL,
-    version=VERSION
+    version=VERSION,
+    classifiers=[
+        'Framework :: Django',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: BSD License',
+        '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.6',
+        'Programming Language :: Python :: 3.7',
+        'Topic :: Software Development :: Libraries :: Python Modules',
+    ],
 )

tox.ini

@@ -4,36 +4,47 @@ addopts=--tb=short
 [tox]
 envlist =
        py27-lint,
-       {py27,py35,py36}-django111-drf{34,35,36,37,39},
-       {py35}-django{20,21,22}-drf{37,38,39,310},
-       {py36,py37}-django{20,21,22}-drf{38,39,310},
+       py37-lint,
+       {py27,py35,py36,py37}-django111-drf{37,38,39},
+       {py35}-django{20,21,22}-drf{37,38,39,310,311},
+       {py36,py37}-django{20,21,22}-drf{38,39,310,311},
 
 [testenv]
 commands = ./runtests.py --fast {posargs} --coverage -rw
 setenv =
        PYTHONDONTWRITEBYTECODE=1
 deps =
-        django111: Django==1.11.7
+        django111: Django==1.11.29
         django20: Django==2.0.13
-        django21: Django==2.1.10
-        django22: Django==2.2.3
-        drf34: djangorestframework==3.4.7
-        drf35: djangorestframework==3.5.4
-        drf36: djangorestframework==3.6.2
+        django21: Django==2.1.15
+        django22: Django==2.2.12
         drf37: djangorestframework==3.7.7
         drf38: djangorestframework==3.8.2
         drf39: djangorestframework==3.9.4
-        drf310: djangorestframework==3.10.2
+        drf310: djangorestframework==3.10.3
+        drf311: djangorestframework==3.11.0
         -rrequirements.test.txt
 
 [testenv:py27-lint]
 commands = ./runtests.py --lintonly
 deps =
         -rrequirements.txt
 
-[testenv:py27-drf37-benchmarks]
+[testenv:py37-lint]
+commands = ./runtests.py --lintonly
+deps =
+        -rrequirements.txt
+
+[testenv:py27-drf39-benchmarks]
+commands = ./runtests.py --benchmarks
+deps =
+        Django==1.11.29
+        djangorestframework==3.9.4
+        -rrequirements.benchmark.txt
+
+[testenv:py37-drf311-benchmarks]
 commands = ./runtests.py --benchmarks
 deps =
-        Django==1.11.2
-        djangorestframework==3.7.7
+        Django==2.2.12
+        djangorestframework==3.11.0
         -rrequirements.benchmark.txt