Rooba
/
pipdeptree
mirror of https://github.com/tox-dev/pipdeptree.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflict

This commit is contained in:
Vineet 2014-06-14 23:49:42 +05:30
parent 0385bf8638 82db07051a
commit e3e55ca48a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tox.ini
View File

@ -4,7 +4,7 @@
# and then run "tox" from this directory. # and then run "tox" from this directory.
[tox] [tox]
envlist = dummy, py26, py27, py32 envlist = dummy, py26, py27, py32, py33, py34
[testenv] [testenv]
commands = py.test {posargs:--cov pipdeptree --cov-report xml --cov-report html --cov-report term-missing tests/} commands = py.test {posargs:--cov pipdeptree --cov-report xml --cov-report html --cov-report term-missing tests/}
@ -20,4 +20,4 @@ deps =
[testenv:dummy] [testenv:dummy]
deps = -r{toxinidir}/tests/virtualenvs/dummy_requirements.txt deps = -r{toxinidir}/tests/virtualenvs/dummy_requirements.txt
commands = commands =