diff --git a/CHANGELOG b/CHANGELOG index bcb0ac7d1..07024fd5b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +Changes between 2.1.0 and 2.1.1.DEV +---------------------------------------------- + +- XXX + Changes between 2.0.3 and 2.1.0.DEV ---------------------------------------------- diff --git a/_pytest/__init__.py b/_pytest/__init__.py index 05d547c21..c6fa1adc5 100644 --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '2.1.0' +__version__ = '2.1.1.dev1' diff --git a/doc/assert.txt b/doc/assert.txt index 9c53d3bee..827bfac85 100644 --- a/doc/assert.txt +++ b/doc/assert.txt @@ -240,6 +240,8 @@ easy to rewrite the assertion and avoid any trouble:: All assert introspection can be turned off by passing ``--assert=plain``. +For further information, Benjamin Peterson wrote up `Behind the scenes of py.test's new assertion rewriting `_. + .. versionadded:: 2.1 Add assert rewriting as an alternate introspection technique. diff --git a/doc/talks.txt b/doc/talks.txt index 293a28489..33e791fa3 100644 --- a/doc/talks.txt +++ b/doc/talks.txt @@ -28,6 +28,11 @@ test parametrization: - `parametrizing tests, generalized`_ (blog post) - `putting test-hooks into local or global plugins`_ (blog post) +assertion introspection + +- `(07/2011) Behind the scenes of py.test's new assertion rewriting + `_ + distributed testing: - `simultaneously test your code on all platforms`_ (blog entry) diff --git a/setup.py b/setup.py index 6aad48ff2..1a2e3e6f2 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ def main(): name='pytest', description='py.test: simple powerful testing with Python', long_description = long_description, - version='2.1.0', + version='2.1.1.dev1', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], @@ -70,4 +70,4 @@ def make_entry_points(): return {'console_scripts': l} if __name__ == '__main__': - main() + main() \ No newline at end of file