diff options
| author | Neal Gompa (ニール・ゴンパ) <[email protected]> | 2019-01-08 18:56:42 -0500 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-01-08 15:56:42 -0800 |
| commit | 9ef798b771b9b40968e207ad2a02092717dd628e (patch) | |
| tree | 93149047a21142a164292e0db1f58bb2077d6a56 | |
| parent | 0f5f23869a64ec12b1744ee3df25816c712667d2 (diff) | |
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 <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Neal Gompa <[email protected]>
Closes #8243
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | contrib/pyzfs/Makefile.am | 2 | ||||
| -rw-r--r-- | contrib/pyzfs/requirements.txt | 1 | ||||
| -rw-r--r-- | contrib/pyzfs/setup.py.in (renamed from contrib/pyzfs/setup.py) | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index cf0e1bf58..7a84c249a 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 36290661f..1549bf237 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 6a88e4b7c..000000000 --- a/contrib/pyzfs/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -cffi diff --git a/contrib/pyzfs/setup.py b/contrib/pyzfs/setup.py.in index 3ff6c04c6..bd8ffc728 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="[email protected]", |