[pypy-svn] pypy pytest2: (really) re-add py/bin/py.test and py/bin/_findpy.py to ease transition wrt to nightly jobs
hpk42
commits-noreply at bitbucket.org
Mon Mar 7 13:33:51 CET 2011
Author: holger krekel <holger at merlinux.eu>
Branch: pytest2
Changeset: r42456:e12baeb2c897
Date: 2011-03-07 13:33 +0100
http://bitbucket.org/pypy/pypy/changeset/e12baeb2c897/
Log: (really) re-add py/bin/py.test and py/bin/_findpy.py to ease
transition wrt to nightly jobs
diff --git a/py/bin/py.test b/py/bin/py.test
new file mode 100755
--- /dev/null
+++ b/py/bin/py.test
@@ -0,0 +1,3 @@
+#!/usr/bin/env python
+from _findpy import pytest
+pytest.main()
diff --git a/py/bin/_findpy.py b/py/bin/_findpy.py
new file mode 100644
--- /dev/null
+++ b/py/bin/_findpy.py
@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+
+#
+# find and import a version of 'py'
+#
+import sys
+import os
+from os.path import dirname as opd, exists, join, basename, abspath
+
+def searchpy(current):
+ while 1:
+ last = current
+ initpy = join(current, '__init__.py')
+ if not exists(initpy):
+ pydir = join(current, 'py')
+ # recognize py-package and ensure it is importable
+ if exists(pydir) and exists(join(pydir, '__init__.py')):
+ #for p in sys.path:
+ # if p == current:
+ # return True
+ if current != sys.path[0]: # if we are already first, then ok
+ sys.stderr.write("inserting into sys.path: %s\n" % current)
+ sys.path.insert(0, current)
+ return True
+ current = opd(current)
+ if last == current:
+ return False
+
+if not searchpy(abspath(os.curdir)):
+ if not searchpy(opd(abspath(sys.argv[0]))):
+ if not searchpy(opd(__file__)):
+ pass # let's hope it is just on sys.path
+
+import py
+import pytest
+
+if __name__ == '__main__':
+ print ("py lib is at %s" % py.__file__)
More information about the Pypy-commit
mailing list