1 Return-Path: <michael.hudson@canonical.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 4A287431FD0
\r
6 for <notmuch@notmuchmail.org>; Tue, 23 Aug 2011 18:03:18 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id 1GpejLVZsskp for <notmuch@notmuchmail.org>;
\r
16 Tue, 23 Aug 2011 18:03:17 -0700 (PDT)
\r
17 X-Greylist: delayed 1057 seconds by postgrey-1.32 at olra;
\r
18 Tue, 23 Aug 2011 18:03:17 PDT
\r
19 Received: from youngberry.canonical.com (youngberry.canonical.com
\r
21 by olra.theworths.org (Postfix) with ESMTP id 6A962431FB6
\r
22 for <notmuch@notmuchmail.org>; Tue, 23 Aug 2011 18:03:17 -0700 (PDT)
\r
23 Received: from [120.136.5.22] (helo=angrist)
\r
24 by youngberry.canonical.com with esmtpsa
\r
25 (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71)
\r
26 (envelope-from <michael.hudson@canonical.com>) id 1Qw1b8-00063i-PY
\r
27 for notmuch@notmuchmail.org; Wed, 24 Aug 2011 00:45:39 +0000
\r
28 Received: by angrist (Postfix, from userid 1000)
\r
29 id C6190200F21; Wed, 24 Aug 2011 12:45:34 +1200 (NZST)
\r
30 From: Michael Hudson-Doyle <michael.hudson@canonical.com>
\r
31 To: notmuch@notmuchmail.org
\r
32 Subject: [PATCH] Do not import notmuch in setup.py (again).
\r
33 User-Agent: Notmuch/0.7 (http://notmuchmail.org) Emacs/23.1.50.1
\r
34 (x86_64-pc-linux-gnu)
\r
35 Date: Wed, 24 Aug 2011 12:45:34 +1200
\r
36 Message-ID: <87d3fvvdqp.fsf@canonical.com>
\r
38 Content-Type: text/plain; charset=us-ascii
\r
39 X-BeenThere: notmuch@notmuchmail.org
\r
40 X-Mailman-Version: 2.1.13
\r
42 List-Id: "Use and development of the notmuch mail system."
\r
43 <notmuch.notmuchmail.org>
\r
44 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
46 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
47 List-Post: <mailto:notmuch@notmuchmail.org>
\r
48 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
49 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
50 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
51 X-List-Received-Date: Wed, 24 Aug 2011 01:03:18 -0000
\r
53 Revert part of 8826f. As explained in c39b492c, importing notmuch in setup.py
\r
54 breaks make -f debian/rules clean in an environment that does not have notmuch
\r
57 This is my first time using git format-patch, please be gentle :-)
\r
59 bindings/python/setup.py | 20 +++++++++++++++-----
\r
60 1 files changed, 15 insertions(+), 5 deletions(-)
\r
62 diff --git a/bindings/python/setup.py b/bindings/python/setup.py
\r
63 index 19b6558..671b0d3 100644
\r
64 --- a/bindings/python/setup.py
\r
65 +++ b/bindings/python/setup.py
\r
71 from distutils.core import setup
\r
72 -dirname = os.path.dirname(os.path.abspath(__file__)) # Package's main folder
\r
73 -sys.path.insert(0, dirname)
\r
77 + file = open('notmuch/__init__.py')
\r
80 + if re.match('__VERSION__\s*=\s*',line) != None:
\r
81 + version = line.split('=', 1)[1]
\r
82 + return eval(version, {}, {})
\r
85 + raise IOError('Unexpected end-of-file')
\r
87 +__VERSION__=get_version()
\r
89 setup(name='notmuch',
\r
90 - version=notmuch.__VERSION__,
\r
91 + version=__VERSION__,
\r
92 description='Python binding of the notmuch mail search and indexing library.',
\r
93 author='Sebastian Spaeth',
\r
94 author_email='Sebastian@SSpaeth.de',
\r
95 url='http://notmuchmail.org/',
\r
96 - download_url='http://notmuchmail.org/releases/notmuch-'+ notmuch.__VERSION__+'.tar.gz',
\r
97 + download_url='http://notmuchmail.org/releases/notmuch-'+ __VERSION__+'.tar.gz',
\r
98 packages=['notmuch'],
\r
99 keywords = ["library", "email"],
\r
100 long_description="""Overview
\r