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

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

[Michael Hudson-Doyle]

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@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

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

[Sebastian Spaeth]

[-- Attachment #1: Type: text/plain, Size: 791 bytes --]

On Wed, 24 Aug 2011 12:45:34 +1200, Michael Hudson-Doyle <michael.hudson@canonical.com> wrote:
> 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.

Ahh, sorry, I must have missed that patch (or forgotten about it). I
solved this now by having the version number in version.py (which
contains nothing else, so David Bremner can easily overwrite it with
makefile magic :-)).

@David, feel free to automagically modify (or overwrite)
bindings/python/notmuch/version.py.

We read in version.py using execfile() and verify that getting the
version number actually worked.

Sorry, I did not apply your patch as I had fixed this before even seeing
your patch.

Sebastian

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

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

[Michael Hudson-Doyle]

rOn Wed, 24 Aug 2011 09:20:51 +0200, Sebastian Spaeth <Sebastian@SSpaeth.de> wrote:
> On Wed, 24 Aug 2011 12:45:34 +1200, Michael Hudson-Doyle <michael.hudson@canonical.com> wrote:
> > 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.
> 
> Ahh, sorry, I must have missed that patch (or forgotten about it). I
> solved this now by having the version number in version.py (which
> contains nothing else, so David Bremner can easily overwrite it with
> makefile magic :-)).

Ah cool.

> @David, feel free to automagically modify (or overwrite)
> bindings/python/notmuch/version.py.
> 
> We read in version.py using execfile() and verify that getting the
> version number actually worked.
> 
> Sorry, I did not apply your patch as I had fixed this before even seeing
> your patch.

No worries.  5dc189c seems to be building fine so far...

Cheers,
mwh

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

[David Bremner]

 On Wed, 24 Aug 2011 09:20:51 +0200, Sebastian Spaeth wrote
 > Ahh, sorry, I must have missed that patch (or forgotten about it). I
 > solved this now by having the version number in version.py (which
 > contains nothing else, so David Bremner can easily overwrite it with
 > makefile magic :-)).

I pushed a test to be run during the release process, to see that the
versions of the lib and the python bindings match. I decided against
automagically overwriting the file (for now), since I'd prefer the
committed version.py match the tarball, and I'm not super happy with
auto-commiting things.

d

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

[Sebastian Spaeth]

[-- Attachment #1: Type: text/plain, Size: 853 bytes --]

On Mon, 05 Sep 2011 09:04:54 -0300, David Bremner <david@tethera.net> wrote:
>  On Wed, 24 Aug 2011 09:20:51 +0200, Sebastian Spaeth wrote
>  > Ahh, sorry, I must have missed that patch (or forgotten about it). I
>  > solved this now by having the version number in version.py (which
>  > contains nothing else, so David Bremner can easily overwrite it with
>  > makefile magic :-)).
> 
> I pushed a test to be run during the release process, to see that the
> versions of the lib and the python bindings match. I decided against
> automagically overwriting the file (for now), since I'd prefer the
> committed version.py match the tarball, and I'm not super happy with
> auto-commiting things.

Sounds fair enough. You've got hereby got a blanket permission to fudge
the version number as needed for the release process ;-)

Sebastian

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]