From 73f104445bda7e3475d914935c24210857d56c46 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Wed, 24 Aug 2011 08:54:58 +0200 Subject: [PATCH] Revert "python: Simplify setup.py" This reverts commit 8826fc2d7b4e59afdd8cea06891a0c43245340c5. It seems that importing the module in setup.py is controversial at best, as it will fail for users that don't have all dependencies installed. This was the case in e.g. the Ubuntu autobuilder, so building notmuch failed. The plan is to create an autogenerated setup.py that can be used for version information. Signed-off-by: Sebastian Spaeth --- bindings/python/setup.py | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/bindings/python/setup.py b/bindings/python/setup.py index 19b65584..1497bc43 100644 --- a/bindings/python/setup.py +++ b/bindings/python/setup.py @@ -2,19 +2,28 @@ import os import re -import sys from distutils.core import setup -dirname = os.path.dirname(os.path.abspath(__file__)) # Package's main folder -sys.path.insert(0, dirname) -import notmuch + +def get_version(): + file = open('notmuch/__init__.py') + try: + for line in file: + if re.match('__VERSION__\s*=\s*',line) != None: + version = line.split('=', 1)[1] + return eval(version, {}, {}) + finally: + file.close() + raise IOError('Unexpected end-of-file') + +__VERSION__=get_version() setup(name='notmuch', - version=notmuch.__VERSION__, + version=__VERSION__, description='Python binding of the notmuch mail search and indexing library.', author='Sebastian Spaeth', author_email='Sebastian@SSpaeth.de', url='http://notmuchmail.org/', - download_url='http://notmuchmail.org/releases/notmuch-'+ notmuch.__VERSION__+'.tar.gz', + download_url='http://notmuchmail.org/releases/notmuch-'+__VERSION__+'.tar.gz', packages=['notmuch'], keywords = ["library", "email"], long_description="""Overview @@ -44,11 +53,12 @@ left of cnotmuch then. Requirements ------------ -You need to have notmuch installed (or rather libnotmuch.so.1). Also, -notmuch makes use of the ctypes library, and has only been tested with -python >= 2.5. It will not work on earlier python versions. +You need to have notmuch installed (or rather libnotmuch.so.1). The +release version 0.3 should work fine. Also, notmuch makes use of the +ctypes library, and has only been tested with python 2.5. It will not +work on earlier python versions. """, - classifiers=['Development Status :: 3 - Alpha', + classifiers=['Development Status :: 2 - Pre-Alpha', 'Intended Audience :: Developers', 'License :: OSI Approved :: GNU General Public License (GPL)', 'Programming Language :: Python :: 2',