Merge branch 'msabramo-pytest'

.gitignore

@@ -6,3 +6,6 @@ build/
 dist/
 .tox/
 tests/virtualenvs/equimapper/
+.coverage
+coverage.xml
+htmlcov/

pytest.ini

@@ -0,0 +1,14 @@
+[pytest]
+norecursedirs = build docs/_build *.egg .tox *.venv virtualenvs
+addopts =
+    # --verbose
+    --tb=short
+    # Turn on --capture to have brief, less noisy output
+    # You will only see output if the test fails
+    # Use --capture no if you want to see it all or have problems debugging
+    # --capture=fd
+    # --capture=no
+    # show extra test summary info as specified by chars (f)ailed, (E)error, (s)skipped, (x)failed, (X)passed.
+    -rfEsxX
+    # --junitxml=junit.xml
+    # --cov=pipdeptree --cov-report=xml --cov-report=html --cov-report=term-missing

tox.ini

@@ -7,10 +7,10 @@
 envlist = dummy, py26, py27, py32
 
 [testenv]
-commands = nosetests tests/
+commands = py.test {posargs:--cov pipdeptree --cov-report xml --cov-report html --cov-report term-missing tests/}
 deps =
-    nose
-
+    pytest
+    pytest-cov
 
 # ---------------------------------------------------------------------------
 # Dummy virtualenvs that get created and used by the tests
@@ -20,4 +20,4 @@ deps =
 
 [testenv:dummy]
 deps = -r{toxinidir}/tests/virtualenvs/dummy_requirements.txt
-commands =
+commands =