Skip to content

Commit

Permalink
Merge pull request #164 from jleverenz/_tox
Browse files Browse the repository at this point in the history
Fix & update tox support, see #163
  • Loading branch information
mrbean-bremen authored Mar 9, 2017
2 parents 9ce1138 + ffc1863 commit 586fefc
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
*.pyc
*.egg-info/
.tox/

# Eclipse
.settings
Expand All @@ -8,3 +9,6 @@

# PyCharm
.idea/

# pytest
.cache/
8 changes: 6 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
[tox]
envlist=py26,py27,py32,py33,pypy
envlist=py26,py27,py33,py34,py35,py36,py37,pypy

[testenv]
deps = -rrequirements.txt
passenv = HOME USERPROFILE
commands=
python all_tests.py
py.test pytest_plugin_test.py

[testenv:py26]
deps=unittest2
deps=
-rrequirements.txt
unittest2

0 comments on commit 586fefc

Please sign in to comment.