use tox from travis, taken from Flask repo

enable python 3.5 in tox include blinker tests ignore intellij config and tox cache
jos666 · Dec 3, 2015 · a6a8c9f · a6a8c9f
1 parent f5d367e
commit a6a8c9f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,5 @@ dist/
 docs/_build
 .tox/
 *.egg
+.idea/
+.cache/
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,5 @@
-language: python
-
 sudo: false
+language: python
 
 python:
   - "2.6"
@@ -11,10 +10,10 @@ python:
   - "3.5"
 
 install:
-  - pip install --editable .
-  - pip install blinker
+  - pip install tox
 
-script: make test
+script:
+  - tox -e py
 
 notifications:
   email: false

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,8 @@
 [tox]
-envlist = py26, py27, pypy, py33, py34
+envlist = py26, py27, pypy, py33, py34, py35
 
 [testenv]
 commands = python test_sqlalchemy.py
+
+deps =
+    blinker
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,3 +6,5 @@ dist/ @@
     docs/_build
     .tox/
     *.egg
+    .idea/
+    .cache/