summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2011-02-07 11:54:08 +0100
committerholger krekel <holger@merlinux.eu>2011-02-07 11:54:08 +0100
commit2bd0c98801006b9975502e13a17f11585df8481c (patch)
tree1d086a9aaae474e304b71f7263c16e9776050565
parent5a5a618dcb15fd92c521047bcb03b2b85add8b82 (diff)
downloadpytest-2bd0c98801006b9975502e13a17f11585df8481c.tar.gz
up version, commit 2.0.1 annoucnement as sent out
-rw-r--r--doc/Makefile2
-rw-r--r--doc/announce/release-2.0.1.txt15
-rw-r--r--pytest.py2
-rw-r--r--setup.py4
4 files changed, 9 insertions, 14 deletions
diff --git a/doc/Makefile b/doc/Makefile
index 3469e9959..20b6aedd0 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -40,7 +40,7 @@ clean:
-rm -rf $(BUILDDIR)/*
install: clean html
- rsync -avz _build/html/ code:www-pytest/
+ rsync -avz _build/html/ code:www-pytest/2.0.2dev
html:
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
diff --git a/doc/announce/release-2.0.1.txt b/doc/announce/release-2.0.1.txt
index 895c3026a..2d406c73f 100644
--- a/doc/announce/release-2.0.1.txt
+++ b/doc/announce/release-2.0.1.txt
@@ -1,19 +1,15 @@
py.test 2.0.1: bug fixes
===========================================================================
-Welcome to pytest-2.0.1, a maintenance and bug fix release. For detailed
-changes see below. pytest is a mature testing tool for Python,
-supporting CPython 2.4-3.2, Jython and latest PyPy interpreters. See
-docs here implementation. See docs with examples here:
+Welcome to pytest-2.0.1, a maintenance and bug fix release of pytest,
+a mature testing tool for Python, supporting CPython 2.4-3.2, Jython
+and latest PyPy interpreters. See extensive docs with tested examples here:
http://pytest.org/
-A note on packaging: pytest used to part of the "py" distribution up
-until version py-1.3.4 but this has changed now: pytest-2.0.X only
-contains py.test related code and is expected to be backward-compatible
-to existing test code. If you want to install pytest, just type one of::
+If you want to install or upgrade pytest, just type one of::
- pip install -U pytest
+ pip install -U pytest # or
easy_install -U pytest
Many thanks to all issue reporters and people asking questions or
@@ -23,7 +19,6 @@ for their great coding contributions and many others for feedback and help.
best,
holger krekel
-
Changes between 2.0.0 and 2.0.1
----------------------------------------------
diff --git a/pytest.py b/pytest.py
index 23108c1ae..ebc989c11 100644
--- a/pytest.py
+++ b/pytest.py
@@ -1,7 +1,7 @@
"""
unit and functional testing with Python.
"""
-__version__ = '2.0.1'
+__version__ = '2.0.2.dev0'
__all__ = ['main']
from _pytest.core import main, UsageError, _preloadplugins
diff --git a/setup.py b/setup.py
index d55129358..2fd956ccd 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ def main():
name='pytest',
description='py.test: simple powerful testing with Python',
long_description = long_description,
- version='2.0.1',
+ version='2.0.2.dev0',
url='http://pytest.org',
license='MIT license',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
@@ -67,4 +67,4 @@ def make_entry_points():
return {'console_scripts': l}
if __name__ == '__main__':
- main()
+ main() \ No newline at end of file