Author: Ronan Lamy <[email protected]>
Branch:
Changeset: r88375:59c79103d5b0
Date: 2016-11-15 00:19 +0000
http://bitbucket.org/pypy/pypy/changeset/59c79103d5b0/
Log: Move 2 scripts used only by PyPy to pypy/tool/
diff --git a/lib-python/conftest.py b/lib-python/conftest.py
--- a/lib-python/conftest.py
+++ b/lib-python/conftest.py
@@ -17,7 +17,7 @@
from pypy.conftest import option as pypy_option
from pypy.tool.pytest import appsupport
-from pypy.tool.pytest.confpath import pypydir, rpythondir, testdir,
testresultdir
+from pypy.tool.pytest.confpath import pypydir, testdir, testresultdir
from rpython.config.parse import parse_info
pytest_plugins = "resultlog",
@@ -561,7 +561,7 @@
watchdog_name = 'watchdog_nt.py'
else:
watchdog_name = 'watchdog.py'
- watchdog_script = rpythondir.join('tool', watchdog_name)
+ watchdog_script = pypydir.join('tool', watchdog_name)
regr_script = pypydir.join('tool', 'pytest',
'run-script', 'regrverbose.py')
diff --git a/rpython/tool/watchdog.py b/pypy/tool/watchdog.py
rename from rpython/tool/watchdog.py
rename to pypy/tool/watchdog.py
diff --git a/rpython/tool/watchdog_nt.py b/pypy/tool/watchdog_nt.py
rename from rpython/tool/watchdog_nt.py
rename to pypy/tool/watchdog_nt.py
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
