From 835f87bb0dd3c068896f52bfef98a88b16fa13a5 Mon Sep 17 00:00:00 2001 From: Prashanth Pai Date: Fri, 17 Jun 2016 14:52:53 +0530 Subject: Fix license discrepancies The repo had mixed references to both Apache BSD license and GPL licenses. This change removes references to Apache license. The license of this project is now same as that of GlusterFS. Change-Id: I39b72f59d14af304729560dd1d59fe307cd1ac1d Signed-off-by: Prashanth Pai --- .functests | 19 +++++++------------ gluster/__init__.py | 20 ++++++++------------ gluster/api.py | 17 ++++++++--------- gluster/exceptions.py | 19 +++++++------------ gluster/gfapi.py | 17 ++++++++--------- gluster/utils.py | 17 ++++++----------- setup.py | 25 +++++++++++-------------- test/__init__.py | 20 ++++++++------------ test/functional/libgfapi-python-tests.py | 17 ++++++++--------- test/unit/gluster/test_gfapi.py | 17 ++++++++--------- test/unit/gluster/test_utils.py | 18 +++++++----------- unittests.sh | 19 +++++-------------- 12 files changed, 91 insertions(+), 134 deletions(-) diff --git a/.functests b/.functests index 44739c0..1737468 100755 --- a/.functests +++ b/.functests @@ -1,19 +1,14 @@ #!/bin/bash - -# Copyright (c) 2014 Red Hat, Inc. # -# 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 +# Copyright (c) 2016 Red Hat, Inc. # -# http://www.apache.org/licenses/LICENSE-2.0 +# This file is part of libgfapi-python project which is a +# subproject of GlusterFS ( www.gluster.org) # -# 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. +# This file is licensed to you under your choice of the GNU Lesser +# General Public License, version 3 or any later version (LGPLv3 or +# later), or the GNU General Public License, version 2 (GPLv2), in all +# cases as published by the Free Software Foundation. # This program expects to be run by tox in a virtual python environment # so that it does not pollute the host development system diff --git a/gluster/__init__.py b/gluster/__init__.py index 351a4f3..fda7c92 100644 --- a/gluster/__init__.py +++ b/gluster/__init__.py @@ -1,17 +1,13 @@ -# Copyright (c) 2012-2014 Red Hat, Inc. +# Copyright (c) 2016 Red Hat, Inc. # -# 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 +# This file is part of libgfapi-python project which is a +# subproject of GlusterFS ( www.gluster.org) # -# 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. +# This file is licensed to you under your choice of the GNU Lesser +# General Public License, version 3 or any later version (LGPLv3 or +# later), or the GNU General Public License, version 2 (GPLv2), in all +# cases as published by the Free Software Foundation. + from pkgutil import extend_path __path__ = extend_path(__path__, __name__) diff --git a/gluster/api.py b/gluster/api.py index bb0d31f..e2e2966 100755 --- a/gluster/api.py +++ b/gluster/api.py @@ -1,13 +1,12 @@ -# Copyright (c) 2012-2015 Red Hat, Inc. -# This file is part of libgfapi-python project -# (http://review.gluster.org/#/q/project:libgfapi-python) -# which is a subproject of GlusterFS ( www.gluster.org) +# Copyright (c) 2016 Red Hat, Inc. # -# This file is licensed to you under your choice of the GNU Lesser -# General Public License, version 3 or any later version (LGPLv3 or -# later), or the GNU General Public License, version 2 (GPLv2), in all -# cases as published by the Free Software Foundation. - +# This file is part of libgfapi-python project which is a +# subproject of GlusterFS ( www.gluster.org) +# +# This file is licensed to you under your choice of the GNU Lesser +# General Public License, version 3 or any later version (LGPLv3 or +# later), or the GNU General Public License, version 2 (GPLv2), in all +# cases as published by the Free Software Foundation. import ctypes from ctypes.util import find_library diff --git a/gluster/exceptions.py b/gluster/exceptions.py index b95e543..05496f0 100644 --- a/gluster/exceptions.py +++ b/gluster/exceptions.py @@ -1,17 +1,12 @@ -# Copyright (c) 2012-2015 Red Hat, Inc. +# Copyright (c) 2016 Red Hat, Inc. # -# 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 +# This file is part of libgfapi-python project which is a +# subproject of GlusterFS ( www.gluster.org) # -# 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. +# This file is licensed to you under your choice of the GNU Lesser +# General Public License, version 3 or any later version (LGPLv3 or +# later), or the GNU General Public License, version 2 (GPLv2), in all +# cases as published by the Free Software Foundation. class LibgfapiException(Exception): diff --git a/gluster/gfapi.py b/gluster/gfapi.py index 3d65155..1765791 100755 --- a/gluster/gfapi.py +++ b/gluster/gfapi.py @@ -1,13 +1,12 @@ -# Copyright (c) 2012-2015 Red Hat, Inc. -# This file is part of libgfapi-python project -# (http://review.gluster.org/#/q/project:libgfapi-python) -# which is a subproject of GlusterFS ( www.gluster.org) +# Copyright (c) 2016 Red Hat, Inc. # -# This file is licensed to you under your choice of the GNU Lesser -# General Public License, version 3 or any later version (LGPLv3 or -# later), or the GNU General Public License, version 2 (GPLv2), in all -# cases as published by the Free Software Foundation. - +# This file is part of libgfapi-python project which is a +# subproject of GlusterFS ( www.gluster.org) +# +# This file is licensed to you under your choice of the GNU Lesser +# General Public License, version 3 or any later version (LGPLv3 or +# later), or the GNU General Public License, version 2 (GPLv2), in all +# cases as published by the Free Software Foundation. import ctypes import os diff --git a/gluster/utils.py b/gluster/utils.py index 833302e..bc55184 100644 --- a/gluster/utils.py +++ b/gluster/utils.py @@ -1,17 +1,12 @@ # Copyright (c) 2016 Red Hat, Inc. # -# 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 +# This file is part of libgfapi-python project which is a +# subproject of GlusterFS ( www.gluster.org) # -# 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. +# This file is licensed to you under your choice of the GNU Lesser +# General Public License, version 3 or any later version (LGPLv3 or +# later), or the GNU General Public License, version 2 (GPLv2), in all +# cases as published by the Free Software Foundation. import os import errno diff --git a/setup.py b/setup.py index 2b06ead..633cd37 100644 --- a/setup.py +++ b/setup.py @@ -1,18 +1,14 @@ #!/usr/bin/python -# Copyright (c) 2013 Red Hat, Inc. # -# 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 +# Copyright (c) 2016 Red Hat, Inc. # -# http://www.apache.org/licenses/LICENSE-2.0 +# This file is part of libgfapi-python project which is a +# subproject of GlusterFS ( www.gluster.org) # -# 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. +# This file is licensed to you under your choice of the GNU Lesser +# General Public License, version 3 or any later version (LGPLv3 or +# later), or the GNU General Public License, version 2 (GPLv2), in all +# cases as published by the Free Software Foundation. from setuptools import setup @@ -26,16 +22,17 @@ setup( name=name, version=version, description='Python bindings for GlusterFS libgfapi', - license='Apache License (2.0)', + license='GPLv2 or LGPLv3+', author='Red Hat, Inc.', - author_email='gluster-users@gluster.org', + author_email='gluster-devel@gluster.org', url='http://www.gluster.org', packages=['gluster', ], test_suite='nose.collector', classifiers=[ 'Development Status :: 5 - Production/Stable' 'Intended Audience :: Developers' - 'License :: OSI Approved :: Apache Software License' + 'License :: OSI Approved :: GNU Lesser General Public License v3 or later (LGPLv3+)' + 'License :: OSI Approved :: GNU General Public License v2 (GPLv2)' 'Operating System :: POSIX :: Linux' 'Programming Language :: Python' 'Programming Language :: Python :: 2' diff --git a/test/__init__.py b/test/__init__.py index 821f5e3..b00eb23 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -1,17 +1,13 @@ -# Copyright (c) 2012-2014 Red Hat, Inc. +# Copyright (c) 2016 Red Hat, Inc. # -# 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 +# This file is part of libgfapi-python project which is a +# subproject of GlusterFS ( www.gluster.org) # -# 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. +# This file is licensed to you under your choice of the GNU Lesser +# General Public License, version 3 or any later version (LGPLv3 or +# later), or the GNU General Public License, version 2 (GPLv2), in all +# cases as published by the Free Software Foundation. + import os import ConfigParser diff --git a/test/functional/libgfapi-python-tests.py b/test/functional/libgfapi-python-tests.py index 8c422e6..7dab995 100644 --- a/test/functional/libgfapi-python-tests.py +++ b/test/functional/libgfapi-python-tests.py @@ -1,13 +1,12 @@ -# Copyright (c) 2012-2015 Red Hat, Inc. -# This file is part of libgfapi-python project -# (http://review.gluster.org/#/q/project:libgfapi-python) -# which is a subproject of GlusterFS ( www.gluster.org) +# Copyright (c) 2016 Red Hat, Inc. # -# This file is licensed to you under your choice of the GNU Lesser -# General Public License, version 3 or any later version (LGPLv3 or -# later), or the GNU General Public License, version 2 (GPLv2), in all -# cases as published by the Free Software Foundation. - +# This file is part of libgfapi-python project which is a +# subproject of GlusterFS ( www.gluster.org) +# +# This file is licensed to you under your choice of the GNU Lesser +# General Public License, version 3 or any later version (LGPLv3 or +# later), or the GNU General Public License, version 2 (GPLv2), in all +# cases as published by the Free Software Foundation. import unittest import os diff --git a/test/unit/gluster/test_gfapi.py b/test/unit/gluster/test_gfapi.py index 86fa621..a859c2f 100644 --- a/test/unit/gluster/test_gfapi.py +++ b/test/unit/gluster/test_gfapi.py @@ -1,13 +1,12 @@ -# Copyright (c) 2012-2015 Red Hat, Inc. -# This file is part of libgfapi-python project -# (http://review.gluster.org/#/q/project:libgfapi-python) -# which is a subproject of GlusterFS ( www.gluster.org) +# Copyright (c) 2016 Red Hat, Inc. # -# This file is licensed to you under your choice of the GNU Lesser -# General Public License, version 3 or any later version (LGPLv3 or -# later), or the GNU General Public License, version 2 (GPLv2), in all -# cases as published by the Free Software Foundation. - +# This file is part of libgfapi-python project which is a +# subproject of GlusterFS ( www.gluster.org) +# +# This file is licensed to you under your choice of the GNU Lesser +# General Public License, version 3 or any later version (LGPLv3 or +# later), or the GNU General Public License, version 2 (GPLv2), in all +# cases as published by the Free Software Foundation. import unittest import gluster diff --git a/test/unit/gluster/test_utils.py b/test/unit/gluster/test_utils.py index eb7a15f..446bcd9 100644 --- a/test/unit/gluster/test_utils.py +++ b/test/unit/gluster/test_utils.py @@ -1,17 +1,13 @@ # Copyright (c) 2016 Red Hat, Inc. # -# 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 +# This file is part of libgfapi-python project which is a +# subproject of GlusterFS ( www.gluster.org) # -# 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. +# This file is licensed to you under your choice of the GNU Lesser +# General Public License, version 3 or any later version (LGPLv3 or +# later), or the GNU General Public License, version 2 (GPLv2), in all +# cases as published by the Free Software Foundation. + import unittest from gluster import utils diff --git a/unittests.sh b/unittests.sh index e5a4c8e..70e1c05 100755 --- a/unittests.sh +++ b/unittests.sh @@ -1,20 +1,11 @@ #!/bin/bash - -# Copyright (c) 2012-2014 Red Hat, Inc. -# -# 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 +# Copyright (c) 2016 Red Hat, Inc. # -# 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. - +# This file is licensed to you under your choice of the GNU Lesser +# General Public License, version 3 or any later version (LGPLv3 or +# later), or the GNU General Public License, version 2 (GPLv2), in all +# cases as published by the Free Software Foundation. cd $(dirname $0)/test/unit nosetests -v --exe --with-coverage --cover-package gluster --cover-erase --cover-html --cover-branches $@ -- cgit