we don't really need nose

bundlewrap · Mar 2, 2015 · e8bcd37 · e8bcd37
1 parent 503d01c
commit e8bcd37
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 15 deletions.
diff --git a/tests/.coveragerc → .coveragerc b/tests/.coveragerc → .coveragerc
@@ -1,3 +1,7 @@
+[run]
+branch = True
+source = bundlewrap
+
 [report]
 exclude_lines =
     pragma: no cover

diff --git a/fabfile.py b/fabfile.py
@@ -72,18 +72,12 @@ def run_pylint(ignore_warnings=True):
 
 
 def run_tests(coverage=True):
-    sys.path.append(PROJECT_PATH + "/src")
     os.environ['BWCOLORS'] = "0"
-    with lcd(PROJECT_PATH + "/tests"):
-        if coverage:
-            local(
-                "nosetests "
-                "--with-cov --cov bundlewrap --cov-config .coveragerc 2>&1"
-            )
-            local("coverage combine")
-            local("mv .coverage ..")
-        else:
-            local("nosetests")
+    if coverage:
+        local("coverage run setup.py test")
+        local("coverage combine")
+    else:
+        local("nosetests")
 
 
 def submit_coverage():

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -4,8 +4,6 @@ distribute
 Fabric
 Mako
 mock
-nose
-nose-cov
 passlib
 requests
 Sphinx

diff --git a/requirements-tests.txt b/requirements-tests.txt
@@ -5,7 +5,5 @@ Fabric>=1.5.0
 Jinja2
 Mako
 mock
-nose
-nose-cov
 passlib
 requests>=1.0.0
diff --git a/setup.py b/setup.py
@@ -21,6 +21,7 @@
     url="http://bundlewrap.org",
     package_dir={'': "src"},
     packages=find_packages("src"),
+    test_suite="tests",
     entry_points={
         'console_scripts': [
             "bw=bundlewrap.cmdline:main",