remove old py copy, add current pytest and py lib snapshots (from pytest-2.0.1dev and py-1.4.1dev)

and some initial tweeks to conftest.py

1 files changed, 13 insertions, 0 deletions

diff --git a/pytest.py b/pytest.py
new file mode 100644
index 0000000000..fe55b153fd
--- /dev/null
+++ b/pytest.py
@@ -0,0 +1,13 @@
+"""
+unit and functional testing with Python.
+"""
+__version__ = '2.0.1.dev9'
+__all__ = ['main']
+
+from _pytest.core import main, UsageError, _preloadplugins
+from _pytest import core as cmdline
+
+if __name__ == '__main__': # if run as a script or by 'python -m pytest'
+    raise SystemExit(main())
+else:
+    _preloadplugins() # to populate pytest.* namespace so help(pytest) works