From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id OMhCMHYw+16vewAA0tVLHw (envelope-from ) for ; Tue, 30 Jun 2020 12:30:46 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id IM4wLHYw+16WGgAAB5/wlQ (envelope-from ) for ; Tue, 30 Jun 2020 12:30:46 +0000 Received: from arlo.cworth.org (arlo.cworth.org [50.126.95.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 52620940666 for ; Tue, 30 Jun 2020 12:30:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 47CEA6DE13C2; Tue, 30 Jun 2020 05:30:44 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZblqoU54ukGD; Tue, 30 Jun 2020 05:30:43 -0700 (PDT) Received: from arlo.cworth.org (localhost [IPv6:::1]) by arlo.cworth.org (Postfix) with ESMTP id BA61F6DE0F76; Tue, 30 Jun 2020 05:30:41 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id AD0D26DE0F76 for ; Tue, 30 Jun 2020 05:30:39 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id t7Q801k50EmV for ; Tue, 30 Jun 2020 05:30:37 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTP id A68E36DE0F16 for ; Tue, 30 Jun 2020 05:30:37 -0700 (PDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id 5E3526141D; Tue, 30 Jun 2020 08:30:37 -0400 (EDT) Received: (nullmailer pid 2274047 invoked by uid 1000); Tue, 30 Jun 2020 12:30:36 -0000 Resent-To: notmuch@notmuchmail.org Resent-From: David Bremner Resent-Date: Tue, 30 Jun 2020 09:30:36 -0300 Resent-Message-ID: <877dvoka6r.fsf@tethera.net> Received: by fethera.tethera.net (Postfix, from userid 1001) id A9C78613B6; Mon, 29 Jun 2020 20:23:11 -0400 (EDT) Received: (nullmailer pid 560659 invoked by uid 1000); Tue, 30 Jun 2020 00:22:54 -0000 From: David Bremner To: Floris Bruynooghe , David Bremner , notmuch@notmuchmail.org Subject: [PATCH] bindings/python-cffi: copy version file into bindings dir Date: Mon, 29 Jun 2020 21:22:47 -0300 Message-Id: <20200630002247.560613-1-david@tethera.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <87wo3py49f.fsf@powell.devork.be> References: <87wo3py49f.fsf@powell.devork.be> MIME-Version: 1.0 X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: notmuch-bounces@notmuchmail.org Sender: "notmuch" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 50.126.95.6 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Spam-Score: -0.01 X-TUID: W4B+v5xiwEHg Attempt to avoid breaking "pip install ." As far as I can tell, we need to have a copy (not just a relative symlink) of the version file. --- Makefile.local | 1 + bindings/python-cffi/setup.py | 8 +------- bindings/python-cffi/version | 1 + 3 files changed, 3 insertions(+), 7 deletions(-) create mode 100644 bindings/python-cffi/version diff --git a/Makefile.local b/Makefile.local index 586cdf75..314238ef 100644 --- a/Makefile.local +++ b/Makefile.local @@ -54,6 +54,7 @@ update-versions: sed -i -e "s/^__VERSION__[[:blank:]]*=.*$$/__VERSION__ = \'${VERSION}\'/" \ -e "s/^SOVERSION[[:blank:]]*=.*$$/SOVERSION = \'${LIBNOTMUCH_VERSION_MAJOR}\'/" \ ${PV_FILE} + cp version bindings/python-cffi # We invoke make recursively only to force ordering of our phony # targets in the case of parallel invocation of make (-j). diff --git a/bindings/python-cffi/setup.py b/bindings/python-cffi/setup.py index 1effcfc6..b0060835 100644 --- a/bindings/python-cffi/setup.py +++ b/bindings/python-cffi/setup.py @@ -1,14 +1,8 @@ -import pathlib - import setuptools - -THIS_FILE = pathlib.Path(__file__).absolute() -PROJECT_ROOT = THIS_FILE.parent.parent.parent -with open(PROJECT_ROOT.joinpath('version')) as fp: +with open('version') as fp: VERSION = fp.read().strip() - setuptools.setup( name='notmuch2', version=VERSION, diff --git a/bindings/python-cffi/version b/bindings/python-cffi/version new file mode 100644 index 00000000..71971d9b --- /dev/null +++ b/bindings/python-cffi/version @@ -0,0 +1 @@ +0.30~rc2 -- 2.27.0