Insert correct copyright and licenses

Update copyright and licenses to note that code is HP proprietary and
has not been approved by the OSRB. Add comments noting where code has
been included from other projects and include the appropriate license
terms in the file header.

Change-Id: I2ce8c2d48e6f73d18d95fa073e5f962805121d1a
This commit is contained in:
Darragh Bailey
2013-07-04 05:34:20 +01:00
parent 57bf4a6f5e
commit c9523f7a83
10 changed files with 66 additions and 66 deletions

17
debian/copyright vendored
View File

@@ -1,7 +1,18 @@
Format: http://dep.debian.net/deps/dep5 Format: http://dep.debian.net/deps/dep5
Source: https://gerrit.hpcloud.net/p/automation/hpgit.git Source: https://gerrit.hpcloud.net/p/automation/hpgit.git
Files: * Files: *
Copyright: 2012 Hewlett-Packard Copyright: 2012 Hewlett-Packard Development Company, L.P.
License: Other/Proprietary
Confidential computer software. Valid license from HP required for
possession, use or copying. Consistent with FAR 12.211 and 12.212,
Commercial Computer Software, Computer Software Documentation, and
Technical Data for Commercial Items are licensed to the U.S. Government
under vendor's standard commercial license.
Files: ghp/subcommand.py ghp/version.py ghp/commands/__init__.py
Copyright: 2011, 2012 OpenStack LLC.
License: Apache-2 License: Apache-2
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@@ -17,3 +28,7 @@ License: Apache-2
. .
On Debian-based systems the full text of the Apache version 2.0 license On Debian-based systems the full text of the Apache version 2.0 license
can be found in `/usr/share/common-licenses/Apache-2.0'. can be found in `/usr/share/common-licenses/Apache-2.0'.
Comment:
In the case of ghp/version.py and ghp/commands/__init__.py only part of
the files are copyright, and as such are marked inline as being taken
from another project.

View File

@@ -0,0 +1,9 @@
#
# Copyright (c) 2012, 2013 Hewlett-Packard Development Company, L.P.
#
# Confidential computer software. Valid license from HP required for
# possession, use or copying. Consistent with FAR 12.211 and 12.212,
# Commercial Computer Software, Computer Software Documentation, and
# Technical Data for Commercial Items are licensed to the U.S. Government
# under vendor's standard commercial license.
#

View File

@@ -1,3 +1,5 @@
#
# Copyright (c) 2011 OpenStack LLC.
# Copyright (c) 2013 Hewlett-Packard # Copyright (c) 2013 Hewlett-Packard
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,6 +26,7 @@ def get_subcommands(subparsers):
return subcommands return subcommands
# partially taken from python-keystoneclient
def _find_actions(subparsers, module_path): def _find_actions(subparsers, module_path):
subcommands = {} subcommands = {}
for mod in (p[:-len('.py')] for p in os.listdir(module_path) if p.endswith('.py')): for mod in (p[:-len('.py')] for p in os.listdir(module_path) if p.endswith('.py')):

View File

@@ -1,18 +1,12 @@
# #
# Copyright (c) 2012 Hewlett-Packard # Copyright (c) 2012, 2013 Hewlett-Packard Development Company, L.P.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Confidential computer software. Valid license from HP required for
# you may not use this file except in compliance with the License. # possession, use or copying. Consistent with FAR 12.211 and 12.212,
# You may obtain a copy of the License at # Commercial Computer Software, Computer Software Documentation, and
# Technical Data for Commercial Items are licensed to the U.S. Government
# under vendor's standard commercial license.
# #
# 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 ghp.errors import HpgitError from ghp.errors import HpgitError
from ghp.log import LogDedentMixin from ghp.log import LogDedentMixin

View File

@@ -1,18 +1,12 @@
# #
# Copyright (c) 2013 Hewlett-Packard # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Confidential computer software. Valid license from HP required for
# you may not use this file except in compliance with the License. # possession, use or copying. Consistent with FAR 12.211 and 12.212,
# You may obtain a copy of the License at # Commercial Computer Software, Computer Software Documentation, and
# Technical Data for Commercial Items are licensed to the U.S. Government
# under vendor's standard commercial license.
# #
# 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.
"""Hpgit base error exception""" """Hpgit base error exception"""

View File

@@ -1,19 +1,12 @@
#!/usr/bin/env python
# #
# Copyright (c) 2013 Hewlett-Packard # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Confidential computer software. Valid license from HP required for
# you may not use this file except in compliance with the License. # possession, use or copying. Consistent with FAR 12.211 and 12.212,
# You may obtain a copy of the License at # Commercial Computer Software, Computer Software Documentation, and
# Technical Data for Commercial Items are licensed to the U.S. Government
# under vendor's standard commercial license.
# #
# 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.
""" """
Custom logging for HP git tool Custom logging for HP git tool

View File

@@ -1,19 +1,13 @@
#!/usr/bin/env python #!/usr/bin/env python
# #
# Copyright (c) 2013 Hewlett-Packard # Copyright (c) 2012, 2013 Hewlett-Packard Development Company, L.P.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Confidential computer software. Valid license from HP required for
# you may not use this file except in compliance with the License. # possession, use or copying. Consistent with FAR 12.211 and 12.212,
# You may obtain a copy of the License at # Commercial Computer Software, Computer Software Documentation, and
# Technical Data for Commercial Items are licensed to the U.S. Government
# under vendor's standard commercial license.
# #
# 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.
""" """
Command-line tool for the HP Cloud workflow Command-line tool for the HP Cloud workflow

View File

@@ -15,6 +15,7 @@
# limitations under the License. # limitations under the License.
# following function taken from python-keystoneclient - keystoneclient/utils.py
# Decorator for cli-args # Decorator for cli-args
def arg(*args, **kwargs): def arg(*args, **kwargs):
def _decorator(func): def _decorator(func):

View File

@@ -1,5 +1,6 @@
# #
# Copyright (c) 2012 Hewlett-Packard # Copyright (c) 2011, 2012 OpenStack LLC.
# Copyright (c) 2012, 2013 Hewlett-Packard Development Company, L.P.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@@ -22,6 +23,7 @@ import subprocess
VERBOSE = os.environ.get('VERBOSE', False) VERBOSE = os.environ.get('VERBOSE', False)
# following function is taken from git-review
def run_command(cmd, status=False, env={}): def run_command(cmd, status=False, env={}):
if VERBOSE: if VERBOSE:
print(datetime.datetime.now(), "Running:", cmd) print(datetime.datetime.now(), "Running:", cmd)

View File

@@ -1,19 +1,13 @@
#!/usr/bin/env python #!/usr/bin/env python
# #
# Copyright (c) 2012 Hewlett-Packard # Copyright (c) 2012, 2013 Hewlett-Packard Development Company, L.P.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Confidential computer software. Valid license from HP required for
# you may not use this file except in compliance with the License. # possession, use or copying. Consistent with FAR 12.211 and 12.212,
# You may obtain a copy of the License at # Commercial Computer Software, Computer Software Documentation, and
# Technical Data for Commercial Items are licensed to the U.S. Government
# under vendor's standard commercial license.
# #
# 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.
import os import os
@@ -21,7 +15,8 @@ from setuptools import setup, find_packages
from ghp import version from ghp import version
# taken from setuptools example. # following function is taken from setuptools example.
# https://pypi.python.org/pypi/an_example_pypi_project (BSD)
def read(fname): def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read() return open(os.path.join(os.path.dirname(__file__), fname)).read()
@@ -31,7 +26,7 @@ setup(
author="Darragh Bailey", author="Darragh Bailey",
author_email="dbailey@hp.com", author_email="dbailey@hp.com",
description=("Tool supporting HPCloud git workflows."), description=("Tool supporting HPCloud git workflows."),
license="Apache License (2.0)", license="Proprietary",
keywords="git hpcloud workflow", keywords="git hpcloud workflow",
url="https://wiki.hpcloud.net/display/auto/hpgit", url="https://wiki.hpcloud.net/display/auto/hpgit",
scripts=['git-hp'], scripts=['git-hp'],
@@ -40,6 +35,6 @@ setup(
classifiers=[ classifiers=[
"Development Status :: 2 - Pre-Alpha", "Development Status :: 2 - Pre-Alpha",
"Topic :: Utilities", "Topic :: Utilities",
"License :: OSI Approved :: Apache License", "License :: Other/Proprietary License",
], ],
) )