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 _______________________________________________ notmuch mailing list notmuch@notmuchmail.org https://notmuchmail.org/mailman/listinfo/notmuch