From 85ce3f4fd114cf3c7a77feb07b397d43b90d11c7 Mon Sep 17 00:00:00 2001 From: loli10K Date: Sun, 18 Mar 2018 09:34:45 +0100 Subject: Adopt pyzfs from ClusterHQ This commit introduces several changes: * Update LICENSE and project information * Give a good PEP8 talk to existing Python source code * Add RPM/DEB packaging for pyzfs * Fix some outstanding issues with the existing pyzfs code caused by changes in the ABI since the last time the code was updated * Integrate pyzfs Python unittest with the ZFS Test Suite * Add missing libzfs_core functions: lzc_change_key, lzc_channel_program, lzc_channel_program_nosync, lzc_load_key, lzc_receive_one, lzc_receive_resumable, lzc_receive_with_cmdprops, lzc_receive_with_header, lzc_reopen, lzc_send_resume, lzc_sync, lzc_unload_key, lzc_remap Note: this commit slightly changes zfs_ioc_unload_key() ABI. This allow to differentiate the case where we tried to unload a key on a non-existing dataset (ENOENT) from the situation where a dataset has no key loaded: this is consistent with the "change" case where trying to zfs_ioc_change_key() from a dataset with no key results in EACCES. Reviewed-by: Brian Behlendorf Signed-off-by: loli10K Closes #7230 --- contrib/pyzfs/setup.py | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'contrib/pyzfs/setup.py') diff --git a/contrib/pyzfs/setup.py b/contrib/pyzfs/setup.py index f86f3c1bd..3baa25c1b 100644 --- a/contrib/pyzfs/setup.py +++ b/contrib/pyzfs/setup.py @@ -1,10 +1,24 @@ -# Copyright 2015 ClusterHQ. See LICENSE file for details. +# +# 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 setuptools import setup, find_packages setup( name="pyzfs", - version="0.2.3", + version="1.0.0", description="Wrapper for libzfs_core", author="ClusterHQ", author_email="support@clusterhq.com", @@ -33,6 +47,7 @@ setup( setup_requires=[ "cffi", ], + python_requires='>=2.7,<3', zip_safe=False, test_suite="libzfs_core.test", ) -- cgit v1.2.3