From c981ead40e818f3bbb0512e825bba6c12b277582 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Thu, 27 Aug 2009 11:50:17 +0200 Subject: [PATCH] switching release branch back to 1.0.x versioning --HG-- branch : 1.0.x --- py/__init__.py | 4 +++- setup.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/py/__init__.py b/py/__init__.py index 7aef04784..e86903cc4 100644 --- a/py/__init__.py +++ b/py/__init__.py @@ -20,7 +20,9 @@ For questions please check out http://pylib.org/contact.html from initpkg import initpkg trunk = None -version = trunk or "1.0.2" +version = trunk or "1.0.x" + +del trunk initpkg(__name__, description = "py.test and pylib: advanced testing tool and networking lib", diff --git a/setup.py b/setup.py index 32e48dcd4..4d89fadce 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ def main(): name='py', description='py.test and pylib: advanced testing tool and networking lib', long_description = long_description, - version= trunk or '1.0.2', + version= trunk or '1.0.x', url='http://pylib.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],