remove py/bin/py.test script because we neccessarily have pytest.py at root level anyway.

the root pytest.py is now a modified version of the file from the pytest distribution
because I want to disable warnings for people who have installed py.test indepedently
from PyPy. Also fix up the docs a bit more to hint / move towards this possibility.

also fix the docs to point to "pytest.py" instead of "pypy/test_all.py" which
should die at some point.

2 files changed, 0 insertions, 55 deletions

diff --git a/py/bin/_findpy.py b/py/bin/_findpy.py
deleted file mode 100644
index c0c64581e0..0000000000
--- a/py/bin/_findpy.py
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/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
-
-if __name__ == '__main__': 
-    print ("py lib is at %s" % py.__file__)
diff --git a/py/bin/py.test b/py/bin/py.test
deleted file mode 100755
index ba0e05dcd6..0000000000
--- a/py/bin/py.test
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env python
-
-# XXX integrate into pypy/test_all.py
-# somewhat PYPY specific hack:
-# let's make sure setuptools does show a warning when our inlined 'py'
-# version shadows a properly installed one.
-import warnings
-warnings.filterwarnings("ignore", 
-    "Module py was already imported", category=UserWarning)
-warnings.filterwarnings("ignore", 
-    "Module _pytest was already imported",
-    category=UserWarning)
-warnings.filterwarnings("ignore", 
-    "Module pytest was already imported",
-    category=UserWarning)
-from _findpy import py
-import pytest
-pytest.main()