From 05c9482759a7c0262862d4a8baa9fa09693e4c09 Mon Sep 17 00:00:00 2001 From: Daniel Folkinshteyn Date: Fri, 20 Aug 2010 10:31:05 -0400 Subject: [PATCH] Consolidate the version string to reside in one central place to ease change making. --- sandbox/release.py | 2 +- scripts/supybot | 3 ++- setup.py | 3 ++- src/conf.py | 2 +- src/version.py | 3 +++ 5 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 src/version.py diff --git a/sandbox/release.py b/sandbox/release.py index 0538e6c30..d07eee0b9 100644 --- a/sandbox/release.py +++ b/sandbox/release.py @@ -90,7 +90,7 @@ if __name__ == '__main__': error('Invalid third line in ChangeLog.') print 'Updating version in version files.' - versionFiles = ('src/conf.py', 'scripts/supybot', 'setup.py') + versionFiles = ('src/version.py') for fn in versionFiles: sh = 'perl -pi -e "s/^version\s*=.*/version = \'%s\'/" %s' % (v, fn) system(sh, 'Error changing version in %s' % fn) diff --git a/scripts/supybot b/scripts/supybot index f5eeedc9c..5d4a9872b 100644 --- a/scripts/supybot +++ b/scripts/supybot @@ -66,6 +66,8 @@ import supybot.utils as utils import supybot.registry as registry import supybot.questions as questions +from supybot.version import version + def main(): import supybot.conf as conf import supybot.world as world @@ -126,7 +128,6 @@ def main(): log.info('Total CPU time taken: %s seconds.', user+system) log.info('No more Irc objects, exiting.') -version = '0.83.4.1+git+fr3' if __name__ == '__main__': parser = optparse.OptionParser(usage='Usage: %prog [options] configFile', version='Supybot %s' % version) diff --git a/setup.py b/setup.py index 3eb528dec..1fe6cd332 100644 --- a/setup.py +++ b/setup.py @@ -47,6 +47,8 @@ import glob import shutil import os.path +from src.version import version + plugins = [s for s in os.listdir('plugins') if os.path.exists(os.path.join('plugins', s, 'plugin.py'))] @@ -124,7 +126,6 @@ for plugin in plugins: if os.path.exists(locale_path): package_data.update({locale_name: ['locale/'+s for s in os.listdir(locale_path)]}) -version = '0.83.4.1+git+fr3' setup( # Metadata name='supybot', diff --git a/src/conf.py b/src/conf.py index 257d372cc..a60328f23 100644 --- a/src/conf.py +++ b/src/conf.py @@ -42,7 +42,7 @@ _ = PluginInternationalization() ### # version: This should be pretty obvious. ### -version = '0.83.4.1+git+fr3' +from supybot.version import version ### # *** The following variables are affected by command-line options. They are diff --git a/src/version.py b/src/version.py new file mode 100644 index 000000000..021bfc216 --- /dev/null +++ b/src/version.py @@ -0,0 +1,3 @@ +"""stick the various versioning attributes in here, so we only have to change +them once.""" +version = '0.83.4.1+limnoria'