fix --version test, set version to 1.0.x rather than 1.0.1 for now, regen setup.py/MANIFEST

--HG--
branch : 1.0.x

MANIFEST

@@ -37,6 +37,7 @@ doc/test/plugin/index.txt
 doc/test/plugin/keyword.txt
 doc/test/plugin/links.txt
 doc/test/plugin/monkeypatch.txt
+doc/test/plugin/nose.txt
 doc/test/plugin/oejskit.txt
 doc/test/plugin/pastebin.txt
 doc/test/plugin/pdb.txt
@@ -345,6 +346,7 @@ py/test/plugin/pytest_figleaf.py
 py/test/plugin/pytest_hooklog.py
 py/test/plugin/pytest_keyword.py
 py/test/plugin/pytest_monkeypatch.py
+py/test/plugin/pytest_nose.py
 py/test/plugin/pytest_pastebin.py
 py/test/plugin/pytest_pdb.py
 py/test/plugin/pytest_pylint.py
@@ -358,6 +360,7 @@ py/test/plugin/pytest_tmpdir.py
 py/test/plugin/pytest_unittest.py
 py/test/plugin/pytest_xfail.py
 py/test/plugin/test_pytest_capture.py
+py/test/plugin/test_pytest_nose.py
 py/test/plugin/test_pytest_runner.py
 py/test/plugin/test_pytest_runner_xunit.py
 py/test/plugin/test_pytest_terminal.py

py/__init__.py

@@ -20,7 +20,7 @@ For questions please check out http://pylib.org/contact.html
 from initpkg import initpkg
 trunk = None
 
-version = trunk or "1.0.1"
+version = trunk or "1.0.x"
 
 initpkg(__name__,
     description = "py.test and pylib: advanced testing tool and networking lib", 

py/test/testing/acceptance_test.py

@@ -1,7 +1,5 @@
 import py
 
-EXPECTTIMEOUT=10.0
-
 class TestGeneralUsage:
     def test_version(self, testdir):
         assert py.version == py.__version__ 
@@ -9,7 +7,7 @@ class TestGeneralUsage:
         assert result.ret == 0
         p = py.path.local(py.__file__).dirpath()
         assert result.stderr.fnmatch_lines([
-            '*py.test*%s*, imported from: %s*' % (py.version, p)
+            '*py.test*%s*imported from*%s*' % (py.version, p)
         ])
     def test_config_error(self, testdir):
         testdir.makeconftest("""

setup.py

@@ -31,7 +31,7 @@ def main():
         name='py',
         description='py.test and pylib: advanced testing tool and networking lib',
         long_description = long_description, 
-        version= trunk or '1.0.1', 
+        version= trunk or '1.0.x', 
         url='http://pylib.org', 
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],