From 64a50755454faa292225a3438392a00e9562a7fa Mon Sep 17 00:00:00 2001 From: holger krekel Date: Tue, 14 Jul 2009 21:36:51 +0200 Subject: [PATCH] trying to tweak setup and py version attributes to not cause merging conflicts --HG-- branch : 1.0.x --- py/__init__.py | 3 ++- setup.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/py/__init__.py b/py/__init__.py index f63c95ad4..6d6bdaffb 100644 --- a/py/__init__.py +++ b/py/__init__.py @@ -18,8 +18,9 @@ For questions please check out http://pylib.org/contact.html """ from initpkg import initpkg +trunk = None -version = "1.0.0b8" +version = trunk or "1.0.0b8" initpkg(__name__, description = "py.test and pylib: advanced testing tool and networking lib", diff --git a/setup.py b/setup.py index 726a4ea47..749c22969 100644 --- a/setup.py +++ b/setup.py @@ -25,12 +25,13 @@ For questions please check out http://pylib.org/contact.html """ +trunk = None def main(): setup( name='py', description='py.test and pylib: advanced testing tool and networking lib', long_description = long_description, - version='1.0.0b8', + version= trunk or '1.0.0b8', url='http://pylib.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],