Skip to content

Commit

Permalink
Merge pull request #9 from sot/add-license
Browse files Browse the repository at this point in the history
Add LICENSE and license comments
  • Loading branch information
taldcroft authored Sep 21, 2017
2 parents 006141d + f3178f6 commit 9eb402c
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 0 deletions.
29 changes: 29 additions & 0 deletions LICENSE.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
BSD 3-Clause License

Copyright (c) 2017, Smithsonian Astrophysical Observatory
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1 change: 1 addition & 0 deletions Ska/Shell/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
from .shell import *

__version__ = '3.3.2'
Expand Down
1 change: 1 addition & 0 deletions Ska/Shell/shell.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
"""Utilities to run subprocesses"""

import re
Expand Down
1 change: 1 addition & 0 deletions Ska/Shell/tests/test_shell.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
import os
import pytest
from six.moves import cStringIO as StringIO
Expand Down
1 change: 1 addition & 0 deletions Ska/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
import pkgutil
__path__ = pkgutil.extend_path(__path__, __name__)
1 change: 1 addition & 0 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#
# All configuration values have a default; values that are commented out
# serve to show the default.
# Licensed under a 3-clause BSD style license - see LICENSE.rst

import sys, os

Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
from setuptools import setup

from Ska.Shell import __version__
Expand Down

0 comments on commit 9eb402c

Please sign in to comment.