use tox and pytest runner, update test envs

pallets · Apr 10, 2016 · 5a952ce · 5a952ce
1 parent 32ee389
commit 5a952ce
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ build
 .tox
 docs/_build
 *.egg-info
+.idea/
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,16 @@
+sudo: false
 language: python
 python:
   - "2.6"
   - "2.7"
+  - "pypy"
   - "3.3"
-
+  - "3.4"
+  - "3.5"
 install:
-  - "python setup.py install"
-
-script: make test
-
+  - "pip install tox"
+script:
+  - "tox -e py"
 notifications:
   email: false
   irc:

diff --git a/setup.py b/setup.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 try:
     from setuptools import setup
 except ImportError:

diff --git a/tests.py b/tests.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 import time
 import pickle
 import hashlib

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,8 @@
 [tox]
-envlist = py26, py27, pypy, py33
+envlist = py26,py27,pypy,py33,py34,py35
 
 [testenv]
-commands = python tests.py
+commands = py.test tests.py {posargs}
+
+deps =
+    pytest