From 9ef798b771b9b40968e207ad2a02092717dd628e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Neal=20Gompa=20=28=E3=83=8B=E3=83=BC=E3=83=AB=E3=83=BB?= =?UTF-8?q?=E3=82=B4=E3=83=B3=E3=83=91=29?= Date: Tue, 8 Jan 2019 18:56:42 -0500 Subject: [PATCH] Use ZFS version for pyzfs & drop unused reqs file Now that 'pyzfs' is part of the ZFS codebase, it should be versioned the same as the rest of the source tree. This eliminates confusion on what version of the bindings are being used, especially for dependent Python projects that may use the Python dist metadata to identify compatible versions of pyzfs to work from. In addition, a trivial change to drop the unused requirements.txt file is included, simply because it's unused and a leftover from before it was imported into the ZFS codebase and wired into the autotools build scripts. Reviewed-by: loli10K Reviewed-by: Brian Behlendorf Signed-off-by: Neal Gompa Closes #8243 --- configure.ac | 1 + contrib/pyzfs/Makefile.am | 2 +- contrib/pyzfs/requirements.txt | 1 - contrib/pyzfs/{setup.py => setup.py.in} | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 contrib/pyzfs/requirements.txt rename contrib/pyzfs/{setup.py => setup.py.in} (98%) diff --git a/configure.ac b/configure.ac index cf0e1bf586..7a84c249a1 100644 --- a/configure.ac +++ b/configure.ac @@ -131,6 +131,7 @@ AC_CONFIG_FILES([ contrib/initramfs/scripts/Makefile contrib/initramfs/scripts/local-top/Makefile contrib/pyzfs/Makefile + contrib/pyzfs/setup.py module/Makefile module/avl/Makefile module/nvpair/Makefile diff --git a/contrib/pyzfs/Makefile.am b/contrib/pyzfs/Makefile.am index 36290661f7..1549bf2379 100644 --- a/contrib/pyzfs/Makefile.am +++ b/contrib/pyzfs/Makefile.am @@ -1,4 +1,4 @@ -EXTRA_DIST = libzfs_core setup.py README LICENSE docs +EXTRA_DIST = libzfs_core setup.py.in README LICENSE docs if PYZFS_ENABLED all: diff --git a/contrib/pyzfs/requirements.txt b/contrib/pyzfs/requirements.txt deleted file mode 100644 index 6a88e4b7c8..0000000000 --- a/contrib/pyzfs/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -cffi diff --git a/contrib/pyzfs/setup.py b/contrib/pyzfs/setup.py.in similarity index 98% rename from contrib/pyzfs/setup.py rename to contrib/pyzfs/setup.py.in index 3ff6c04c69..bd8ffc728f 100644 --- a/contrib/pyzfs/setup.py +++ b/contrib/pyzfs/setup.py.in @@ -19,7 +19,7 @@ from setuptools import setup, find_packages setup( name="pyzfs", - version="1.0.0", + version="@VERSION@", description="Wrapper for libzfs_core", author="ClusterHQ", author_email="support@clusterhq.com",