Use py.test as the test runner

Signed-off-by: Daniel Nephin <dnephin@gmail.com>

requirements-dev.txt

@@ -1,5 +1,4 @@
 coverage==3.7.1
-flake8==2.3.0
+mock>=1.0.1
-mock >= 1.0.1
+pytest==2.7.2
-nose==1.3.4
+pytest-cov==2.1.0
-pep8==1.6.1

setup.py

@@ -41,13 +41,10 @@ install_requires = [
 
 
 tests_require = [
-    'nose',
+    'pytest',
-    'flake8',
 ]
 
 
-if sys.version_info < (2, 7):
-    tests_require.append('unittest2')
 if sys.version_info[:1] < (3,):
     tests_require.append('mock >= 1.0.1')
 

tox.ini

@@ -8,10 +8,14 @@ passenv =
 setenv =
     HOME=/tmp
 deps =
-    -rrequirements.txt
+    -rrequirements-dev.txt
 commands =
-    nosetests -v --with-coverage --cover-branches --cover-package=compose --cover-erase --cover-html-dir=coverage-html --cover-html {posargs}
+    py.test -v \
-    flake8 compose tests setup.py
+        --cov=compose \
+        --cov-report html \
+        --cov-report term \
+        --cov-config=tox.ini \
+        {posargs}
 
 [testenv:pre-commit]
 skip_install = True
@@ -21,16 +25,16 @@ commands =
     pre-commit install
     pre-commit run --all-files
 
-[testenv:py27]
+# Coverage configuration
-deps =
+[run]
-    {[testenv]deps}
+branch = True
-    -rrequirements-dev.txt
 
-[testenv:py34]
+[report]
-deps =
+show_missing = true
-    {[testenv]deps}
+
-    flake8
+[html]
-    nose
+directory = coverage-html
+# end coverage configuration
 
 [flake8]
 # Allow really long lines for now