unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: David Bremner <david@tethera.net>
To: Floris Bruynooghe <flub@devork.be>,
	David Bremner <david@tethera.net>,
	notmuch@notmuchmail.org
Subject: [PATCH] bindings/python-cffi: copy version file into bindings dir
Date: Mon, 29 Jun 2020 21:22:47 -0300	[thread overview]
Message-ID: <20200630002247.560613-1-david@tethera.net> (raw)
In-Reply-To: <87wo3py49f.fsf@powell.devork.be>

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

  reply	other threads:[~2020-06-30 12:30 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20200625110045.208558-1-david@tethera.net>
2020-06-25 11:00 ` [PATCH 1/2] Revert "python-cffi: read version from notmuch version file" David Bremner
2020-06-25 11:00 ` [PATCH 2/2] bindings/python-cffi: update version from global version David Bremner
2020-06-25 13:34   ` David Bremner
2020-06-29 21:02     ` Floris Bruynooghe
2020-06-30  0:22       ` David Bremner [this message]
2020-07-03 11:37         ` [PATCH] bindings/python-cffi: copy version file into bindings dir David Bremner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200630002247.560613-1-david@tethera.net \
    --to=david@tethera.net \
    --cc=flub@devork.be \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).