p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trying to tweak setup and py version attributes to not cause merging conflicts 

--HG--
branch : 1.0.x
This commit is contained in:
holger krekel 2009-07-14 21:36:51 +02:00
parent 142d53acfc
commit 64a5075545
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
py/__init__.py
View File

@ -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",

3
setup.py
View File

@ -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'],