From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 2E++LQYw+14RdAAA0tVLHw (envelope-from ) for ; Tue, 30 Jun 2020 12:28:54 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 8HN8KQYw+15/eQAAbx9fmQ (envelope-from ) for ; Tue, 30 Jun 2020 12:28:54 +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 2E1CA9408FC for ; Tue, 30 Jun 2020 12:28:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 2ACE96DE0F88; Tue, 30 Jun 2020 05:28:51 -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 kwjCfVjo-FGB; Tue, 30 Jun 2020 05:28:50 -0700 (PDT) Received: from arlo.cworth.org (localhost [IPv6:::1]) by arlo.cworth.org (Postfix) with ESMTP id F1F596DE0AC7; Tue, 30 Jun 2020 05:28:49 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 49A7B6DE0AC7 for ; Tue, 30 Jun 2020 05:28:48 -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 WJ7C9-ExFpKL for ; Tue, 30 Jun 2020 05:28:47 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTP id 1FEC86DE0A89 for ; Tue, 30 Jun 2020 05:28:47 -0700 (PDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id CBD086141D; Tue, 30 Jun 2020 08:28:46 -0400 (EDT) Received: (nullmailer pid 2271895 invoked by uid 1000); Tue, 30 Jun 2020 12:28:45 -0000 Resent-To: notmuch@notmuchmail.org Resent-From: David Bremner Resent-Date: Tue, 30 Jun 2020 09:28:45 -0300 Resent-Message-ID: <87ftacka9u.fsf@tethera.net> Received: by fethera.tethera.net (Postfix, from userid 1001) id 93FD4613B5; Thu, 25 Jun 2020 07:01:07 -0400 (EDT) Received: (nullmailer pid 208659 invoked by uid 1000); Thu, 25 Jun 2020 11:00:51 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH 2/2] bindings/python-cffi: update version from global version. Date: Thu, 25 Jun 2020 08:00:45 -0300 Message-Id: <20200625110045.208558-3-david@tethera.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200625110045.208558-1-david@tethera.net> References: <20200625110045.208558-1-david@tethera.net> 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.99 X-TUID: gYnwnsi9Fihm Copy machinery from the older python bindings --- Makefile.global | 1 + Makefile.local | 2 +- bindings/python-cffi/notmuch2/version.py | 3 +++ bindings/python-cffi/setup.py | 9 ++++++++- bindings/python/setup.py | 2 +- 5 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 bindings/python-cffi/notmuch2/version.py diff --git a/Makefile.global b/Makefile.global index 0aee5876..26d9491f 100644 --- a/Makefile.global +++ b/Makefile.global @@ -47,6 +47,7 @@ SHA256_FILE=$(TAR_FILE).sha256.asc DETACHED_SIG_FILE=$(TAR_FILE).asc PV_FILE=bindings/python/notmuch/version.py +PV_FILE2=bindings/python-cffi/notmuch2/version.py # Smash together user's values with our extra values STD_CFLAGS := -std=gnu99 diff --git a/Makefile.local b/Makefile.local index 586cdf75..4b9dd0be 100644 --- a/Makefile.local +++ b/Makefile.local @@ -53,7 +53,7 @@ dist: $(TAR_FILE) update-versions: sed -i -e "s/^__VERSION__[[:blank:]]*=.*$$/__VERSION__ = \'${VERSION}\'/" \ -e "s/^SOVERSION[[:blank:]]*=.*$$/SOVERSION = \'${LIBNOTMUCH_VERSION_MAJOR}\'/" \ - ${PV_FILE} + ${PV_FILE} ${PV_FILE2} # 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/notmuch2/version.py b/bindings/python-cffi/notmuch2/version.py new file mode 100644 index 00000000..a5447027 --- /dev/null +++ b/bindings/python-cffi/notmuch2/version.py @@ -0,0 +1,3 @@ +# this file should be kept in sync with ../../../version +__VERSION__ = '0.30~rc2' +SOVERSION = '5' diff --git a/bindings/python-cffi/setup.py b/bindings/python-cffi/setup.py index 37918e3d..03649649 100644 --- a/bindings/python-cffi/setup.py +++ b/bindings/python-cffi/setup.py @@ -1,9 +1,16 @@ import setuptools +import os +# get the notmuch version number without importing the notmuch module +version_file = os.path.join(os.path.dirname(__file__), + 'notmuch2', 'version.py') +exec(compile(open(version_file).read(), version_file, 'exec')) +assert '__VERSION__' in globals(), \ + 'Failed to read the notmuch binding version number' setuptools.setup( name='notmuch2', - version='0.1', + version=__VERSION__, description='Pythonic bindings for the notmuch mail database using CFFI', author='Floris Bruynooghe', author_email='flub@devork.be', diff --git a/bindings/python/setup.py b/bindings/python/setup.py index d986f0c6..d4c5c844 100644 --- a/bindings/python/setup.py +++ b/bindings/python/setup.py @@ -24,7 +24,7 @@ from distutils.core import setup # get the notmuch version number without importing the notmuch module version_file = os.path.join(os.path.dirname(__file__), - 'notmuch', 'version.py') + 'notmuch2', 'version.py') exec(compile(open(version_file).read(), version_file, 'exec')) assert '__VERSION__' in globals(), \ 'Failed to read the notmuch binding version number' -- 2.27.0