From 9ef798b771b9b40968e207ad2a02092717dd628e Mon Sep 17 00:00:00 2001 From: "Neal Gompa (ニール・ゴンパ)" Date: Tue, 8 Jan 2019 18:56:42 -0500 Subject: 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 | 61 ------------------------------------------ contrib/pyzfs/setup.py.in | 61 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 63 insertions(+), 63 deletions(-) delete mode 100644 contrib/pyzfs/requirements.txt delete mode 100644 contrib/pyzfs/setup.py create mode 100644 contrib/pyzfs/setup.py.in 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 deleted file mode 100644 index 3ff6c04c6..000000000 --- a/contrib/pyzfs/setup.py +++ /dev/null @@ -1,61 +0,0 @@ -# -# Copyright 2015 ClusterHQ -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -from __future__ import absolute_import, division, print_function - -from setuptools import setup, find_packages - -setup( - name="pyzfs", - version="1.0.0", - description="Wrapper for libzfs_core", - author="ClusterHQ", - author_email="support@clusterhq.com", - url="http://pyzfs.readthedocs.org", - license="Apache License, Version 2.0", - classifiers=[ - "Development Status :: 4 - Beta", - "Intended Audience :: Developers", - "License :: OSI Approved :: Apache Software License", - "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.7", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.4", - "Programming Language :: Python :: 3.5", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", - "Topic :: System :: Filesystems", - "Topic :: Software Development :: Libraries", - ], - keywords=[ - "ZFS", - "OpenZFS", - "libzfs_core", - ], - - packages=find_packages(), - include_package_data=True, - install_requires=[ - "cffi", - ], - setup_requires=[ - "cffi", - ], - python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,<4', - zip_safe=False, - test_suite="libzfs_core.test", -) - -# vim: softtabstop=4 tabstop=4 expandtab shiftwidth=4 diff --git a/contrib/pyzfs/setup.py.in b/contrib/pyzfs/setup.py.in new file mode 100644 index 000000000..bd8ffc728 --- /dev/null +++ b/contrib/pyzfs/setup.py.in @@ -0,0 +1,61 @@ +# +# Copyright 2015 ClusterHQ +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +from __future__ import absolute_import, division, print_function + +from setuptools import setup, find_packages + +setup( + name="pyzfs", + version="@VERSION@", + description="Wrapper for libzfs_core", + author="ClusterHQ", + author_email="support@clusterhq.com", + url="http://pyzfs.readthedocs.org", + license="Apache License, Version 2.0", + classifiers=[ + "Development Status :: 4 - Beta", + "Intended Audience :: Developers", + "License :: OSI Approved :: Apache Software License", + "Programming Language :: Python :: 2", + "Programming Language :: Python :: 2.7", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.4", + "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Topic :: System :: Filesystems", + "Topic :: Software Development :: Libraries", + ], + keywords=[ + "ZFS", + "OpenZFS", + "libzfs_core", + ], + + packages=find_packages(), + include_package_data=True, + install_requires=[ + "cffi", + ], + setup_requires=[ + "cffi", + ], + python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,<4', + zip_safe=False, + test_suite="libzfs_core.test", +) + +# vim: softtabstop=4 tabstop=4 expandtab shiftwidth=4 -- cgit v1.2.3