From 281bcefb52fde0e8a714c65bff54b1a5a839b0e9 Mon Sep 17 00:00:00 2001 From: Nicolas Sebrecht Date: Mon, 22 Feb 2016 12:14:49 +0100 Subject: [PATCH] versioning: avoid confusing pip by spliting out __version__ with __revision__ Python tools are not used to a __revision__. Signed-off-by: Nicolas Sebrecht --- offlineimap/__init__.py | 6 ++---- offlineimap/init.py | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/offlineimap/__init__.py b/offlineimap/__init__.py index 3e5ed4d..af4c569 100644 --- a/offlineimap/__init__.py +++ b/offlineimap/__init__.py @@ -1,15 +1,13 @@ __all__ = ['OfflineImap'] __productname__ = 'OfflineIMAP' -__version__ = "6.7.0" -__revision__ = "-rc1" # Expecting "-rcN" or "" for stable releases. -__bigversion__ = __version__ + __revision__ +__version__ = "6.7.0-rc1" # Expecting "-rcN" or "" for stable releases. __copyright__ = "Copyright 2002-2015 John Goerzen & contributors" __author__ = "John Goerzen" __author_email__= "offlineimap-project@lists.alioth.debian.org" __description__ = "Disconnected Universal IMAP Mail Synchronization/Reader Support" __license__ = "Licensed under the GNU GPL v2 or any later version (with an OpenSSL exception)" -__bigcopyright__ = """%(__productname__)s %(__bigversion__)s +__bigcopyright__ = """%(__productname__)s %(__version__)s %(__license__)s""" % locals() __homepage__ = "http://www.offlineimap.org" diff --git a/offlineimap/init.py b/offlineimap/init.py index 58b6880..7ed3b6b 100644 --- a/offlineimap/init.py +++ b/offlineimap/init.py @@ -54,7 +54,7 @@ class OfflineImap: return self.__sync(options) def __parse_cmd_options(self): - parser = OptionParser(version=offlineimap.__bigversion__, + parser = OptionParser(version=offlineimap.__version__, description="%s.\n\n%s" % (offlineimap.__copyright__, offlineimap.__license__))