Merge pull request #72 from kobinpy/update-tox

Remove tox-travis
kobinpy · Apr 15, 2017 · b5b946d · b5b946d
2 parents fb7eb11 + cc79de7
commit b5b946d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,18 @@
 sudo: false
 language: python
-python:
-- '3.6'
-- nightly
 matrix:
-  allow_failures:
+  include:
+  - python: 3.6
+    env: TOXENV=py36
+  - python: 3.6
+    env: TOXENV=flake8
+  - python: 3.6
+    env: TOXENV=mypy
+  - python: 3.6
+    env: TOXENV=doctest
   - python: nightly
-install: pip install -q tox-travis -r ./requirements/test.txt
+    env: TOXENV=py37
+install: pip install -q tox -r ./requirements/test.txt
 script: tox
 after_success:
 - coverage run setup.py test

diff --git a/tox.ini b/tox.ini
@@ -6,23 +6,18 @@ envlist =
     mypy
     doctest
 
-[tox:travis]
-3.6=py36,flake8,mypy,doctest
-nightly=py37
-
 [testenv]
 basepython = python3.6
-setenv=PYTHONPATH = {toxinidir}:{toxinidir}
 deps = -rrequirements/test.txt
 commands = python setup.py test
 
+[testenv:py37]
+basepython = python3.7
+
 [testenv:doctest]
 deps = pytest
 commands = pytest --doctest-module -v kobin
 
-[testenv:py37]
-basepython = python3.7
-
 [testenv:flake8]
 deps = flake8
 commands = flake8