Skip to content

Commit

Permalink
Fix license discrepancies
Browse files Browse the repository at this point in the history
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 <ppai@redhat.com>
  • Loading branch information
prashanthpai committed Jun 17, 2016
1 parent 0724254 commit 835f87b
Show file tree
Hide file tree
Showing 12 changed files with 91 additions and 134 deletions.
19 changes: 7 additions & 12 deletions .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
Expand Down
20 changes: 8 additions & 12 deletions 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__)

Expand Down
17 changes: 8 additions & 9 deletions 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
Expand Down
19 changes: 7 additions & 12 deletions 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):
Expand Down
17 changes: 8 additions & 9 deletions 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
Expand Down
17 changes: 6 additions & 11 deletions 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
Expand Down
25 changes: 11 additions & 14 deletions 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

Expand All @@ -26,16 +22,17 @@
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'
Expand Down
20 changes: 8 additions & 12 deletions 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

Expand Down
17 changes: 8 additions & 9 deletions 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
Expand Down
17 changes: 8 additions & 9 deletions 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
Expand Down
18 changes: 7 additions & 11 deletions 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
Expand Down
19 changes: 5 additions & 14 deletions 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 $@
Expand Down

0 comments on commit 835f87b

Please sign in to comment.