Switch to using py.test

laramaktub · Nov 9, 2014 · 8d85918 · 8d85918
1 parent 0464ff2
commit 8d85918
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 66 deletions.
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -106,7 +106,7 @@ Now you can make your changes locally.
 5. When you're done making changes, check that your changes pass the tests and flake8::
 
     $ flake8 cookiecutter tests
-    $ python setup.py test
+    $ py.test
     $ tox
 
 6. Commit your changes and push your branch to GitHub::
@@ -117,7 +117,7 @@ Now you can make your changes locally.
 
 7. Check that the test coverage hasn't dropped::
 
-    coverage run --source cookiecutter setup.py test
+    coverage run --source cookiecutter -m py.test
     coverage report -m
     coverage html
 

diff --git a/Makefile b/Makefile
@@ -27,14 +27,14 @@ lint:
 	flake8 cookiecutter tests
 
 test:
-	python setup.py test
+	py.test
 
 test-all:
 	tox
 
 
 coverage:
-	coverage run --source cookiecutter setup.py test
+	coverage run --source cookiecutter -m py.test
 	coverage report -m
 	coverage html
 	open htmlcov/index.html

diff --git a/requirements/base_test.txt b/requirements/base_test.txt
diff --git a/requirements/test_26.txt b/requirements/test_26.txt
diff --git a/requirements/test_27.txt b/requirements/test_27.txt
diff --git a/requirements/test_33.txt b/requirements/test_33.txt
diff --git a/requirements/test_34.txt b/requirements/test_34.txt
diff --git a/tox.ini b/tox.ini
@@ -1,28 +1,24 @@
 [tox]
-envlist = py26, py27, py33, py34, pypy, flake8
+envlist = py26, py27, py33, py34, pypy
+
+[testenv]
+commands = py.test tests {posargs}
+deps = pytest
 
 [testenv:py26]
-deps = -r{toxinidir}/requirements/test_26.txt
-commands = coverage run --source cookiecutter setup.py test
+deps =
+    {[testenv]deps}
+    mock
+    unittest2
+    ordereddict
+    simplejson>2.1
 
 [testenv:py27]
-deps = -r{toxinidir}/requirements/test_27.txt
-commands = coverage run --source cookiecutter setup.py test
+deps =
+    {[testenv]deps}
+    mock
 
 [testenv:pypy]
-deps = -r{toxinidir}/requirements/test_27.txt
-commands = coverage run --source cookiecutter setup.py test
-
-[testenv:py33]
-deps = -r{toxinidir}/requirements/test_33.txt
-commands = coverage run --source cookiecutter setup.py test
-
-[testenv:py34]
-deps = -r{toxinidir}/requirements/test_34.txt
-commands = coverage run --source cookiecutter setup.py test
-
-[testenv:flake8]
 deps =
-    flake8
-commands =
-    flake8 cookiecutter
+    {[testenv]deps}
+    mock
diff --git a/tox_pytest.ini b/tox_pytest.ini