summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2014-05-16 17:55:22 +0200
committerSebastian Thiel <byronimo@gmail.com>2014-05-16 17:55:22 +0200
commit8a60e9ed4724aafd9d0e51012599ea5d1672cabc (patch)
treeed4c14736a5cdec82ea6568372741698e7dd3030
parent85442e9f29af5fc702b0c66ae1658963ddc42b6f (diff)
parentafcf97e6cd6584c97ccfe3de57bdc58df0ba9f8a (diff)
downloadsmmap-8a60e9ed4724aafd9d0e51012599ea5d1672cabc.tar.gz
Merge pull request #8 from msabramo/tox
Add tox.ini; make .travis.yml use it
-rw-r--r--.gitignore1
-rw-r--r--.travis.yml16
-rw-r--r--tox.ini11
3 files changed, 21 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index 6cfb58d..11852be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ build/
coverage
dist/
MANIFEST
+.tox
diff --git a/.travis.yml b/.travis.yml
index d8640a0..91f4328 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,10 @@
language: python
-python:
- - "2.6"
- - "2.7"
- - "3.3"
- # - "pypy" - no getrefcount
-
-script: nosetests
+env:
+ - TOXENV=py26
+ - TOXENV=py27
+ - TOXENV=py33
+ - TOXENV=py34
+install:
+ - pip install tox
+script:
+ - tox
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..80190d0
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,11 @@
+# Tox (http://tox.testrun.org/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+envlist = py26, py27, py33, py34
+
+[testenv]
+commands = nosetests
+deps = nose