diff --git a/py/__init__.py b/py/__init__.py index 33ccfd066..f829d3425 100644 --- a/py/__init__.py +++ b/py/__init__.py @@ -7,9 +7,9 @@ and classes. The initpkg-dictionary below specifies name->value mappings where value can be another namespace dictionary or an import path. -(c) Holger Krekel and others, 2009 +(c) Holger Krekel and others, 2004-2010 """ -version = "1.1.1post1" +version = "1.2.0a1" __version__ = version = version or "1.1.x" import py.apipkg diff --git a/setup.py b/setup.py index e8a6092f5..20dadcd55 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ For questions please check out http://pylib.org/contact.html .. _`py.path`: http://pylib.org/path.html .. _`py.code`: http://pylib.org/code.html -(c) Holger Krekel and others, 2009 +(c) Holger Krekel and others, 2004-2010 """ trunk = None def main(): @@ -28,7 +28,7 @@ def main(): name='py', description='py.test and pylib: rapid testing and development utils.', long_description = long_description, - version= trunk or '1.1.1post1', + version= trunk or '1.2.0a1', url='http://pylib.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],