[PATCH] Do not import notmuch in setup.py (again).

Michael Hudson-Doyle michael.hudson at canonical.com
Tue Aug 23 17:45:34 PDT 2011


Revert part of 8826f.  As explained in c39b492c, importing notmuch in setup.py
breaks make -f debian/rules clean in an environment that does not have notmuch
installed already.
---
This is my first time using git format-patch, please be gentle :-)

 bindings/python/setup.py |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/bindings/python/setup.py b/bindings/python/setup.py
index 19b6558..671b0d3 100644
--- a/bindings/python/setup.py
+++ b/bindings/python/setup.py
@@ -2,19 +2,29 @@
 
 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 at 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
-- 
1.7.4.1



More information about the notmuch mailing list