Skip to content

Commit

Permalink
Use ZFS version for pyzfs & drop unused reqs file
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Conan-Kudo authored and behlendorf committed Jan 8, 2019
1 parent 0f5f238 commit 9ef798b
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 3 deletions.
1 change: 1 addition & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion contrib/pyzfs/Makefile.am
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
1 change: 0 additions & 1 deletion contrib/pyzfs/requirements.txt

This file was deleted.

2 changes: 1 addition & 1 deletion contrib/pyzfs/setup.py → contrib/pyzfs/setup.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

setup(
name="pyzfs",
version="1.0.0",
version="@VERSION@",
description="Wrapper for libzfs_core",
author="ClusterHQ",
author_email="[email protected]",
Expand Down

0 comments on commit 9ef798b

Please sign in to comment.