Merge branch 'master' of github.com:hadrien/pyramid_rest

hadrien · Feb 23, 2015 · 33c73c9 · 33c73c9
2 parents c1446a6 + d25559f
commit 33c73c9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,4 @@ velo/tests/coverage.xml
 coverage.xml
 nosetests.xml
 .coveralls.yml
+.tox
diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,7 @@
+[tox]
+envlist = py26,py27,py33
+
+[testenv]
+commands =
+    pip install -r dev-requirements.txt
+    python setup.py nosetests