bumping version to a dev version, run tests by using python PyPI by default

CHANGELOG

@@ -1,4 +1,9 @@
-Changes between 1.3.4 and 2.0.0dev0
+Changes between 2.0.0 and 2.0.1.dev1
+----------------------------------------------
+
+- refinements to terminal output
+
+Changes between 1.3.4 and 2.0.0
 ----------------------------------------------
 
 - pytest-2.0 is now its own package and depends on pylib-2.0

_pytest/terminal.py

@@ -136,6 +136,9 @@ class TerminalReporter:
             self._tw.line()
             self.currentfspath = None
 
+    def write(self, content, **markup):
+        self._tw.write(content, **markup)
+
     def write_line(self, line, **markup):
         line = str(line)
         self.ensure_newline()
@@ -215,7 +218,7 @@ class TerminalReporter:
 
     def pytest_collection(self):
         if not self.hasmarkup:
-            self.write_line("collecting ...", bold=True)
+            self.write("collecting ... ", bold=True)
 
     def pytest_collectreport(self, report):
         if report.failed:

doc/Makefile

@@ -40,7 +40,7 @@ clean:
 	-rm -rf $(BUILDDIR)/*
 
 install: clean html
-	rsync -avz _build/html/ code:www-pytest/2.0.0
+	rsync -avz _build/html/ code:www-pytest/
 
 html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html

doc/conf.py

@@ -49,7 +49,7 @@ copyright = u'2010, holger krekel et aliter'
 # built documents.
 #
 # The short X.Y version.
-version = '2.0.0'
+version = '2.0'
 # The full version, including alpha/beta/rc tags.
 import py, pytest
 assert py.path.local().relto(py.path.local(pytest.__file__).dirpath().dirpath())

pytest.py

@@ -1,7 +1,7 @@
 """
 unit and functional testing with Python.
 """
-__version__ = '2.0.0'
+__version__ = '2.0.1.dev1'
 __all__ = ['main']
 
 from _pytest.core import main, UsageError, _preloadplugins

setup.py

@@ -22,14 +22,14 @@ def main():
         name='pytest',
         description='py.test: simple powerful testing with Python',
         long_description = long_description,
-        version='2.0.0',
+        version='2.0.1.dev1',
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
         author='holger krekel, Guido Wesdorp, Carl Friedrich Bolz, Armin Rigo, Maciej Fijalkowski & others',
         author_email='holger at merlinux.eu',
         entry_points= make_entry_points(),
-        install_requires=['py>=1.4.0a2'],
+        install_requires=['py>=1.4.0'],
         classifiers=['Development Status :: 5 - Production/Stable',
                      'Intended Audience :: Developers',
                      'License :: OSI Approved :: MIT License',
@@ -67,4 +67,4 @@ def make_entry_points():
     return {'console_scripts': l}
 
 if __name__ == '__main__':
-    main()
+    main()

tox.ini

@@ -2,20 +2,20 @@
 distshare={homedir}/.tox/distshare
 envlist=py26,py27,py31,py32,py27-xdist,py25,py24
 indexserver=
-    default = http://pypi.testrun.org
-    pypi = http://pypi.python.org/simple
+    default = http://pypi.python.org/simple
+    testrun = http://pypi.testrun.org
 
 [testenv]
 changedir=testing
 commands= py.test -rfsxX --junitxml={envlogdir}/junit-{envname}.xml []
 deps=
-    :pypi:pexpect
-    :pypi:nose
+    pexpect
+    nose
 
 [testenv:genscript]
 changedir=.
 commands= py.test --genscript=pytest1
-deps=py>=1.4.0a2
+deps=py>=1.4.0
 
 [testenv:py27-xdist]
 changedir=.
@@ -28,7 +28,7 @@ commands=
 [testenv:trial]
 changedir=.
 basepython=python2.6
-deps=:pypi:twisted
+deps=twisted
 commands=
   py.test -rsxf \
         --junitxml={envlogdir}/junit-{envname}.xml [testing/test_unittest.py]
@@ -41,14 +41,14 @@ deps=
 [testenv:doc]
 basepython=python
 changedir=doc
-deps=:pypi:sphinx
+deps=sphinx
      pytest
 
 commands=
     make html
 
 [testenv:py31]
-deps=py>=1.4.0a2
+deps=py>=1.4.0
 
 [testenv:py31-xdist]
 deps=pytest-xdist
@@ -57,7 +57,7 @@ commands=
         --junitxml={envlogdir}/junit-{envname}.xml []
 
 [testenv:py32]
-deps=py>=1.4.0a2
+deps=py>=1.4.0
 
 [testenv:pypy]
 basepython=pypy-c