diff options
| -rw-r--r-- | .hgignore | 1 | ||||
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | coverage/collector.py | 1 | ||||
| -rw-r--r-- | igor.py | 7 | ||||
| -rw-r--r-- | tox.ini | 21 |
5 files changed, 15 insertions, 20 deletions
@@ -9,6 +9,7 @@ syntax: glob *.bak .coverage .coverage.* +.metacov.* *.swp # Stuff generated by editors. @@ -3,9 +3,6 @@ default: @echo "* No default action *" -TEST_ZIP = tests/zipmods.zip -TEST_EGG = tests/eggsrc/dist/covtestegg1-0.0.0-py*.egg - clean: -rm -f *.pyd */*.pyd -rm -f *.so */*.so @@ -19,7 +16,7 @@ clean: -rm -f coverage/*,cover -rm -f MANIFEST -rm -f .coverage .coverage.* coverage.xml .metacov* - -rm -f $(TEST_ZIP) + -rm -f tests/zipmods.zip -rm -rf tests/eggsrc/build tests/eggsrc/dist tests/eggsrc/*.egg-info -rm -f setuptools-*.egg distribute-*.egg distribute-*.tar.gz -rm -rf doc/_build diff --git a/coverage/collector.py b/coverage/collector.py index 8ff4db2c..85c8dc90 100644 --- a/coverage/collector.py +++ b/coverage/collector.py @@ -116,7 +116,6 @@ class Collector(object): # trace function. self._trace_class = CTracer or PyTracer - def __repr__(self): return "<Collector at 0x%x>" % id(self) @@ -66,9 +66,11 @@ def run_tests_with_coverage(tracer, *nose_args): os.environ['COVERAGE_HOME'] = os.getcwd() # Create the .pth file that will let us measure coverage in sub-processes. + # The .pth file seems to have to be alphabetically after easy-install.pth + # or the sys.path entries aren't created right? import nose pth_dir = os.path.dirname(os.path.dirname(nose.__file__)) - pth_path = os.path.join(pth_dir, "covcov.pth") + pth_path = os.path.join(pth_dir, "zzz_metacov.pth") with open(pth_path, "w") as pth_file: pth_file.write("import coverage; coverage.process_startup()\n") @@ -223,7 +225,8 @@ def print_banner(label): pypy_version = sys.pypy_version_info # pylint: disable=E1101 version += " (pypy %s)" % ".".join(str(v) for v in pypy_version) - print('=== %s %s %s (%s) ===' % (impl, version, label, sys.executable)) + which_python = os.path.relpath(sys.executable) + print('=== %s %s %s (%s) ===' % (impl, version, label, which_python)) def do_help(): @@ -22,10 +22,13 @@ commands = {envpython} setup.py --quiet build_ext --inplace {envpython} igor.py test_with_tracer c {posargs} -[testenv:py26] deps = nose mock + +[testenv:py26] +deps = + {[testenv]deps} unittest2 gevent eventlet @@ -33,35 +36,27 @@ deps = [testenv:py27] deps = - nose - mock + {[testenv]deps} gevent eventlet greenlet [testenv:py32] deps = - nose - mock + {[testenv]deps} greenlet [testenv:py33] deps = - nose - mock + {[testenv]deps} greenlet [testenv:py34] deps = - nose - mock + {[testenv]deps} greenlet [testenv:pypy] # PyPy has no C extensions setenv = COVERAGE_NO_EXTENSION=1 -deps = - nose - mock - |