[Pywikibot-commits] [Gerrit] Revamp setup.py, bump version to 2.0b1 - change (pywikibot/core)

jenkins-bot has submitted this change and it was merged. Change subject: Revamp setup.py, bump version to 2.0b1 ...................................................................... Revamp setup.py, bump version to 2.0b1 core is no longer an alpha level project, beta is more accurate. Added various classifiers for eventual pypi classification Users can now access the version with pywikibot.__version__, which is standard Python convention. For version.py, this is added as the "release version". Change-Id: I1a58a4eceb77215d4aadb16e0708da03013e7668 --- M pywikibot/__init__.py M pywikibot/version.py M scripts/version.py M setup.py 4 files changed, 38 insertions(+), 23 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 73947ec..27c9d52 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -3,11 +3,12 @@ The initialization file for the Pywikibot framework. """ # -# (C) Pywikipedia bot team, 2008 +# (C) Pywikipedia bot team, 2008-213 # # Distributed under the terms of the MIT license. # -__version__ = '$Id$' +__version__ = '2.0b1' +__initversion__ = '$Id$' import datetime import difflib diff --git a/pywikibot/version.py b/pywikibot/version.py index 8d6de3f..b302e97 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -168,7 +168,7 @@ fn = os.path.join(_program_dir, filename) if os.path.exists(fn): for line in open(fn, 'r').readlines(): - if line.find('__version__') == 0: + if line.find('__initversion__') == 0: exec(line) break stat = os.stat(fn) diff --git a/scripts/version.py b/scripts/version.py index cd7b831..32b06df 100755 --- a/scripts/version.py +++ b/scripts/version.py @@ -11,12 +11,14 @@ __version__ = '$Id$' import sys +import pywikibot from pywikibot.version import * from pywikibot import config2 as config if __name__ == '__main__': - print 'Pywikibot %s' % getversion() - print 'Python %s' % sys.version + print 'Pywikibot: %s' % getversion() + print 'Release version: %s' % pywikibot.__version__ + print 'Python: %s' % sys.version #print 'config-settings:' #print 'site_interface =', config.site_interface #print 'API_config_expiry =', config.API_config_expiry diff --git a/setup.py b/setup.py index 4273db2..a73bc36 100644 --- a/setup.py +++ b/setup.py @@ -1,12 +1,14 @@ # -*- coding: utf-8 -*- -"""installer script for pywikibot 2.0 framework""" -# -# (C) Pywikipedia team, 2009-2012 -# +""" +Installer script for Pywikibot 2.0 framework + +(C) Pywikipedia team, 2009-2013 + +Distributed under the terms of the MIT license. + +""" __version__ = '$Id$' -# -# Distributed under the terms of the MIT license. -# + import sys from distribute_setup import use_setuptools @@ -16,19 +18,29 @@ if sys.version_info[0] != 2: raise RuntimeError("ERROR: Pywikipediabot only runs under Python 2") -if sys.version_info[1] < 6: +elif sys.version_info[1] < 6: raise RuntimeError("ERROR: Pywikipediabot only runs under Python 2.6 or higher") -else: - depend = ['httplib2>=0.6.0'] -setup(name='Pywikipediabot', - version='2.0alpha', - description='Python Wikipedia Bot Framework', - license='MIT', - packages=find_packages(), - install_requires=depend, - test_suite="tests", - ) +setup( + name='Pywikipediabot', + version='2.0b1', + description='Python Wikipedia Bot Framework', + license='MIT License', + packages=find_packages(), + install_requires=[ + 'httplib2>=0.6.0' + ], + test_suite="tests", + classifiers=[ + 'License :: OSI Approved :: MIT License', + 'Development Status :: 4 - Beta' + 'Operating System :: OS Independent', + 'Intended Audience :: Developers', + 'Environment :: Console', + 'Programming Language :: Python :: 2.6', + 'Programming Language :: Python :: 2.7' + ] +) # automatically launch generate_user_files.py -- To view, visit https://gerrit.wikimedia.org/r/81000 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1a58a4eceb77215d4aadb16e0708da03013e7668 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Legoktm &lt;legoktm.wikipedia(a)gmail.com&gt; Gerrit-Reviewer: Ladsgroup &lt;ladsgroup(a)gmail.com&gt; Gerrit-Reviewer: Merlijn van Deen &lt;valhallasw(a)arctus.nl&gt; Gerrit-Reviewer: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: jenkins-bot