chore: tox.ini cleanup

untitaker · untitaker · commit 97593a072b7d · 2018-07-20T16:33:02.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ sudo: false
 
 python:
   - "2.7"
+  - "pypy"
   - "3.4"
   - "3.5"
   - "3.6"
@@ -12,4 +13,4 @@ install:
   - pip install tox
 
 script:
-  - tox -e $(tox -l | grep $(echo $TRAVIS_PYTHON_VERSION | sed -e 's/[^0-9]//g') | tr '\n' ',')
+  - tox -e $(tox -l | grep py$(echo $TRAVIS_PYTHON_VERSION | sed -e 's/pypypy/pypy/g') | tr '\n' ',')
diff --git a/tox.ini b/tox.ini
@@ -6,43 +6,42 @@
 [tox]
 envlist =
     # core
-    py{27,34,35,36,37}
+    py{2.7,3.4,3.5,3.6,3.7}
     pypy
-    flake8
 
     # integrations
-    {py35,py36,py37}-django-dev
-    {py35,py36,py37}-django-{200}
-    {py27,py35}-django-111
-    {py27,py34,py35}-django-{18,19,110}
-    {py27,py34,py35}-django-18
-    {py27,py34}-django-17
-    py27-django-16
+    {py3.5,py3.6,py3.7}-django-dev
+    {py3.5,py3.6,py3.7}-django-{2.0}
+    {pypy,py2.7,py3.5}-django-1.11
+    {pypy,py2.7,py3.4,py35}-django-{1.8,1.9,1.10}
+    {pypy,py2.7,py3.4,py35}-django-1.8
+    {pypy,py2.7,py3.4}-django-1.7
+    {pypy,py2.7}-django-1.6
 
-    {py27,py35,py36,py37}-flask-{10,11,12,dev}
+    {pypy,py2.7,py3.5,py3.6,py3.7}-flask-{1.0,0.11,0.12,dev}
 
-    {py27,py35,py36,py37}-celery-4
-    py27-celery-3
+    {pypy,py2.7,py3.5,py3.6,py3.7}-celery-4
+    {pypy,py2.7}-celery-3
 
 
 [testenv]
 deps =
     pytest
     hypothesis
-    django-{16,17,18}: pytest-django<3.0
-    django-{19,110,110,111,200,dev}: pytest-django>=3.0,<3.3
-    django-{18,19,110}: django-tastypie==0.14
-    django-16: Django>=1.6,<1.7
-    django-17: Django>=1.7,<1.8
-    django-18: Django>=1.8,<1.9
-    django-19: Django>=1.9,<1.10
-    django-110: Django>=1.10,<1.11
-    django-111: Django>=1.11,<1.12
-    django-200: Django>=2.0,<2.1
+    django-{1.6,1.7,1.8}: pytest-django<3.0
+    django-{1.9,1.10,1.11,2.0,dev}: pytest-django>=3.0,<3.3
+    django-{1.8,1.9,1.10}: django-tastypie==0.14
+    django-1.6: Django>=1.6,<1.7
+    django-1.7: Django>=1.7,<1.8
+    django-1.8: Django>=1.8,<1.9
+    django-1.9: Django>=1.9,<1.10
+    django-1.10: Django>=1.10,<1.11
+    django-1.11: Django>=1.11,<1.12
+    django-2.0: Django>=2.0,<2.1
     django-dev: git+https://github.com/django/django.git#egg=Django
-    flask-10: Flask>=0.10,<0.11
-    flask-11: Flask>=0.11,<0.12
-    flask-12: Flask>=0.12,<0.13
+    flask-1.0: Flask>=0.10,<0.11
+    flask-0.11: Flask>=0.11,<0.12
+    flask-0.12: Flask>=0.12,<0.13
     flask-dev: git+https://github.com/pallets/flask.git#egg=flask
     celery-3: Celery>=3.1,<4.0
     celery-4: Celery>=4.0,<5.0
@@ -54,11 +53,11 @@ extras =
     flask: flask
 
 basepython =
-    py27: python2.7
-    py34: python3.4
-    py35: python3.5
-    py36: python3.6
-    py37: python3.7
+    py2.7: python2.7
+    py3.4: python3.4
+    py3.5: python3.5
+    py3.6: python3.6
+    py3.7: python3.7
     pypy: pypy
 
 commands =
