remove extensions in igor

Author: nedbat

Makefile

@@ -16,8 +16,8 @@ help:					## Show this help.
 	@awk -F ':.*##' '/^[^: ]+:.*##/{printf "  \033[1m%-20s\033[m %s\n",$$1,$$2} /^##@/{printf "\n%s\n",substr($$0,5)}' $(MAKEFILE_LIST)
 
 _clean_platform:
-	@rm -f *.so */*.so
-	@rm -f *.pyd */*.pyd
+	@rm -f *.so */*.so */*.so.hidden
+	@rm -f *.pyd */*.pyd */*.pyd.hidden
 	@rm -rf __pycache__ */__pycache__ */*/__pycache__ */*/*/__pycache__ */*/*/*/__pycache__ */*/*/*/*/__pycache__
 	@rm -f *.pyc */*.pyc */*/*.pyc */*/*/*.pyc */*/*/*/*.pyc */*/*/*/*/*.pyc
 	@rm -f *.pyo */*.pyo */*/*.pyo */*/*/*.pyo */*/*/*/*.pyo */*/*/*/*/*.pyo

igor.py

@@ -52,8 +52,11 @@ def do_show_env():
         print(f"  {env} = {os.environ[env]!r}")
 
 
-def do_remove_extension(*args):
-    """Remove the compiled C extension, no matter what its name."""
+def hide_extension(core, *args):
+    """Hide the compiled C extension, no matter what its name."""
+
+    if core == "ctrace":
+        return
 
     so_patterns = """
         tracer.so
@@ -94,7 +97,11 @@ def do_remove_extension(*args):
                 if VERBOSITY > 1:
                     print(f"Removing {os.path.abspath(filename)}")
                 try:
-                    os.remove(filename)
+                    hidden_name = filename + ".hidden"
+                    if os.path.exists(hidden_name):
+                        os.remove(hidden_name)
+                    os.rename(filename, hidden_name)
+                    return hidden_name
                 except OSError as exc:
                     if VERBOSITY > 1:
                         print(f"Couldn't remove {os.path.abspath(filename)}: {exc}")
@@ -157,11 +164,16 @@ def make_env_id(core):
 
 def run_tests(core, *runner_args):
     """The actual running of tests."""
+    hidden = hide_extension(core)
     if "COVERAGE_TESTING" not in os.environ:
         os.environ["COVERAGE_TESTING"] = "True"
     print_banner(label_for_core(core))
 
-    return pytest.main(list(runner_args))
+    try:
+        return pytest.main(list(runner_args))
+    finally:
+        if hidden:
+            os.remove(hidden)
 
 
 def run_tests_with_coverage(core, *runner_args):
@@ -210,6 +222,8 @@ def run_tests_with_coverage(core, *runner_args):
                 if getattr(mod, "__file__", "??").startswith(covdir):
                     covmods[name] = mod
                     del sys.modules[name]
+        hidden = hide_extension(core)
+        # print("igor: re-importing coverage")
         import coverage  # pylint: disable=reimported
 
         sys.modules.update(covmods)
@@ -220,6 +234,8 @@ def run_tests_with_coverage(core, *runner_args):
     finally:
         cov.stop()
         os.remove(pth_path)
+        if hidden:
+            os.remove(hidden)
 
     cov.save()
     return status

tox.ini

@@ -42,17 +42,15 @@ commands =
     # Create tests/zipmods.zip
     python igor.py zip_mods
 
-    # Remove the C extension so that we can test the PyTracer
-    python igor.py remove_extension
-
-    # Test with the PyTracer
-    python igor.py test_with_core pytrace {posargs}
-
     # Build the C extension and test with the CTracer
     python setup.py --quiet build_ext --inplace
     python -m pip install {env:COVERAGE_PIP_ARGS} -q -e .
     python igor.py test_with_core ctrace {posargs}
 
+    # Test with the PyTracer
+    python igor.py test_with_core pytrace {posargs}
+
+    # Test with sys.monitoring
     py3{12-15}{,t},anypy: python igor.py test_with_core sysmon {posargs}
 
 [testenv:anypy]