diff --git a/CHANGELOG b/CHANGELOG index d0937e8a1..f68ef49b2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +2.7.1.dev (compared to 2.7.0) +----------------------------- + + 2.7.0 (compared to 2.6.4) ----------------------------- diff --git a/_pytest/__init__.py b/_pytest/__init__.py index 26b828a53..293991c32 100644 --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '2.7.0' +__version__ = '2.7.1.dev' diff --git a/doc/en/Makefile b/doc/en/Makefile index ee5f6d9cd..abffd92bb 100644 --- a/doc/en/Makefile +++ b/doc/en/Makefile @@ -42,7 +42,7 @@ help: clean: -rm -rf $(BUILDDIR)/* -SITETARGET=latest +SITETARGET=dev install: html # for access talk to someone with login rights to diff --git a/doc/en/conf.py b/doc/en/conf.py index 27dccec8c..c0c41edfa 100644 --- a/doc/en/conf.py +++ b/doc/en/conf.py @@ -18,7 +18,7 @@ # The full version, including alpha/beta/rc tags. # The short X.Y version. version = "2.7" -release = "2.7.0" +release = "2.7.1.dev" import sys, os diff --git a/setup.py b/setup.py index 6a8b34e9e..0a3a4b10a 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ def main(): name='pytest', description='pytest: simple powerful testing with Python', long_description=long_description, - version='2.7.0', + version='2.7.1.dev', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],