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 <ezomori.nozomu@gmail.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Neal Gompa <ngompa@datto.com>
Closes #8243

diff --git a/configure.ac b/configure.ac
index cf0e1bf5863f602b547c378442210797b37ce4d6..7a84c249a117ba47c1b30bfb517f66bd76ea6306 100644 (file)
--- 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 36290661f75a049eb7f2454e03575d0f50551813..1549bf237932b051ec00052e290f76234de8e751 100644 (file)
--- 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 (file)
index 6a88e4b..0000000
--- 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 3ff6c04c698e22a2250442c7032bb091d0cd83ea..bd8ffc728fa65d96d2a63c05ea46e8715c5f8d1f 100644 (file)
--- 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",