Merge pull request #176 from ionrock/ionrock/fix-master-tests

ionrock · web-flow · commit a8a7f44f3630 · 2018-01-26T18:20:04.000-06:00
Ionrock/fix master tests
diff --git a/.travis.yml b/.travis.yml
@@ -2,11 +2,11 @@ language: python
 sudo: false
 
 python:
-  - 2.6
   - 2.7
   - 3.4
   - 3.5
   - 3.6
+  # - 3.7
 
 install: pip install tox-travis
 
diff --git a/Makefile b/Makefile
@@ -36,7 +36,7 @@ clean-test:
 	rm -fr htmlcov/
 
 test-all:
-	tox
+	$(VENV)/bin/tox
 
 test:
 	$(VENV)/bin/py.test
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py34, py35, py36
+envlist = py27, py34, py35, py36, py37
 
 [testenv]
 deps = pytest
