From 88a5857fd41b1a2f0d56fec03110158dd03898ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Armando=20Garc=C3=ADa=20Sancio?= Date: Tue, 14 Apr 2015 15:12:45 -0700 Subject: [PATCH] dcos-1039 Add Apache license to the code --- LICENSE | 13 +++++++++++++ cli/setup.py | 8 ++++---- cli/tox.ini | 4 ++-- setup.py | 8 ++++---- tox.ini | 4 ++-- 5 files changed, 25 insertions(+), 12 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..6339edc --- /dev/null +++ b/LICENSE @@ -0,0 +1,13 @@ +Copyright 2015 Mesosphere + +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. diff --git a/cli/setup.py b/cli/setup.py index ac77710..9b4cb07 100644 --- a/cli/setup.py +++ b/cli/setup.py @@ -1,7 +1,7 @@ -from setuptools import setup, find_packages from os import path import dcoscli +from setuptools import find_packages, setup here = path.abspath(path.dirname(__file__)) @@ -37,7 +37,7 @@ setup( 'Topic :: Software Development :: User Interfaces', # Pick your license as you wish (should match "license" above) - 'License :: OSI Approved :: TODO License', + 'License :: OSI Approved :: Apache Software License', # Specify the Python versions you support here. In particular, ensure # that you indicate whether you support Python 2, Python 3 or both. @@ -57,8 +57,8 @@ setup( # simple. Or you can use find_packages(). packages=find_packages(exclude=['tests', 'bin']), - # List run-time dependencies here. These will be installed by pip when your - # project is installed. For an analysis of "install_requires" vs pip's + # List run-time dependencies here. These will be installed by pip when + # your project is installed. For an analysis of "install_requires" vs pip's # requirements files see: # https://packaging.python.org/en/latest/requirements.html install_requires=[ diff --git a/cli/tox.ini b/cli/tox.ini index 8a952fe..7c3f27c 100644 --- a/cli/tox.ini +++ b/cli/tox.ini @@ -14,8 +14,8 @@ deps = .. commands = - flake8 --verbose dcoscli tests - isort --recursive --check-only --diff --verbose dcoscli tests + flake8 --verbose dcoscli tests setup.py + isort --recursive --check-only --diff --verbose dcoscli tests setup.py [testenv:py27-integration] commands = diff --git a/setup.py b/setup.py index 65e7012..58f75d3 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,8 @@ -from setuptools import setup, find_packages from codecs import open from os import path import dcos +from setuptools import find_packages, setup here = path.abspath(path.dirname(__file__)) @@ -43,7 +43,7 @@ setup( 'Topic :: Software Development :: User Interfaces', # Pick your license as you wish (should match "license" above) - 'License :: OSI Approved :: TODO License', + 'License :: OSI Approved :: Apache Software License', # Specify the Python versions you support here. In particular, ensure # that you indicate whether you support Python 2, Python 3 or both. @@ -63,8 +63,8 @@ setup( # simple. Or you can use find_packages(). packages=find_packages(exclude=['pydoc', 'tests', 'cli', 'bin']), - # List run-time dependencies here. These will be installed by pip when your - # project is installed. For an analysis of "install_requires" vs pip's + # List run-time dependencies here. These will be installed by pip when + # your project is installed. For an analysis of "install_requires" vs pip's # requirements files see: # https://packaging.python.org/en/latest/requirements.html install_requires=[ diff --git a/tox.ini b/tox.ini index 74781c1..c29eeb4 100644 --- a/tox.ini +++ b/tox.ini @@ -12,8 +12,8 @@ deps = isort commands = - flake8 --verbose dcos tests - isort --recursive --check-only --diff --verbose dcos tests + flake8 --verbose dcos tests setup.py + isort --recursive --check-only --diff --verbose dcos tests setup.py [testenv:py27-unit] commands =