From af2048d66b75dc7c707fa0b471045ec6bc690a5c Mon Sep 17 00:00:00 2001 From: Paul Dodd Date: Mon, 20 Jun 2016 09:42:32 -0400 Subject: [PATCH] Changed to BSD 3-Clause --- LICENSE.txt | 41 ++++++++++++++++++------------- setup.py | 2 +- signac/__init__.py | 2 +- signac/__main__.py | 2 +- signac/common/__init__.py | 2 +- signac/common/config.py | 2 +- signac/common/connection.py | 2 +- signac/common/crypt.py | 2 +- signac/common/errors.py | 2 +- signac/common/host.py | 2 +- signac/common/validate.py | 2 +- signac/contrib/__init__.py | 2 +- signac/contrib/adapters.py | 2 +- signac/contrib/conversion.py | 2 +- signac/contrib/crawler.py | 2 +- signac/contrib/errors.py | 2 +- signac/contrib/filesystems.py | 2 +- signac/contrib/formats.py | 2 +- signac/contrib/formats_network.py | 2 +- signac/contrib/hashing.py | 2 +- signac/contrib/job.py | 2 +- signac/contrib/project.py | 2 +- signac/contrib/utility.py | 2 +- signac/core/__init__.py | 2 +- signac/core/jsondict.py | 2 +- signac/db/database.py | 2 +- signac/gui/gui.py | 2 +- signac/gui/models.py | 2 +- 28 files changed, 51 insertions(+), 44 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 3bd2c27eb..34d8515fd 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,22 +1,29 @@ -License for the software signac. +BSD 3-Clause License for the software signac. -Copyright (c) 2016 The Regents of the University of Michigan +Copyright (c) 2016, The Regents of the University of Michigan All rights reserved. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +2. 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. + +3. 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. diff --git a/setup.py b/setup.py index 1bcc51998..d4d13544c 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ classifiers=[ "Development Status :: 4 - Beta", "Intended Audience :: Science/Research", - "License :: OSI Approved :: MIT License", + "License :: OSI Approved :: BSD 3-Clause License", "Topic :: Scientific/Engineering :: Physics", ], diff --git a/signac/__init__.py b/signac/__init__.py index d5d96993e..abd7cfff4 100644 --- a/signac/__init__.py +++ b/signac/__init__.py @@ -1,6 +1,6 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. """The signac framework aids in the management of large and heterogeneous data spaces. diff --git a/signac/__main__.py b/signac/__main__.py index 371a9e669..2d837bba4 100644 --- a/signac/__main__.py +++ b/signac/__main__.py @@ -1,6 +1,6 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. from __future__ import print_function import os import sys diff --git a/signac/common/__init__.py b/signac/common/__init__.py index 9124a9c42..6755eaedb 100644 --- a/signac/common/__init__.py +++ b/signac/common/__init__.py @@ -1,3 +1,3 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. diff --git a/signac/common/config.py b/signac/common/config.py index c926a76ff..dd6c1149e 100644 --- a/signac/common/config.py +++ b/signac/common/config.py @@ -1,6 +1,6 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. import os import stat import logging diff --git a/signac/common/connection.py b/signac/common/connection.py index 0d2ef6708..69d5a748c 100644 --- a/signac/common/connection.py +++ b/signac/common/connection.py @@ -1,6 +1,6 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. import subprocess import logging import ssl diff --git a/signac/common/crypt.py b/signac/common/crypt.py index be5996d94..635e5f935 100644 --- a/signac/common/crypt.py +++ b/signac/common/crypt.py @@ -1,6 +1,6 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. import base64 from . import six diff --git a/signac/common/errors.py b/signac/common/errors.py index 625af323d..eb7ab5571 100644 --- a/signac/common/errors.py +++ b/signac/common/errors.py @@ -1,6 +1,6 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. class Error(Exception): diff --git a/signac/common/host.py b/signac/common/host.py index 0847040f7..b7fca524d 100644 --- a/signac/common/host.py +++ b/signac/common/host.py @@ -1,6 +1,6 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. import logging import warnings import getpass diff --git a/signac/common/validate.py b/signac/common/validate.py index ccc6aa374..6a67e36d6 100644 --- a/signac/common/validate.py +++ b/signac/common/validate.py @@ -1,6 +1,6 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. import logging from .configobj.validate import Validator diff --git a/signac/contrib/__init__.py b/signac/contrib/__init__.py index 453fd7097..b36bcf953 100644 --- a/signac/contrib/__init__.py +++ b/signac/contrib/__init__.py @@ -1,6 +1,6 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. from __future__ import absolute_import import warnings diff --git a/signac/contrib/adapters.py b/signac/contrib/adapters.py index 0c87f4040..5432a2fee 100644 --- a/signac/contrib/adapters.py +++ b/signac/contrib/adapters.py @@ -1,6 +1,6 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. from . import conversion from .formats import FileFormat diff --git a/signac/contrib/conversion.py b/signac/contrib/conversion.py index ef246c394..f5c96c1c6 100644 --- a/signac/contrib/conversion.py +++ b/signac/contrib/conversion.py @@ -1,6 +1,6 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. import logging from ..common.six import with_metaclass diff --git a/signac/contrib/crawler.py b/signac/contrib/crawler.py index 0550925fc..f0475ad54 100644 --- a/signac/contrib/crawler.py +++ b/signac/contrib/crawler.py @@ -1,6 +1,6 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. import os import re import json diff --git a/signac/contrib/errors.py b/signac/contrib/errors.py index 52d3aa7ba..fb2d0329f 100644 --- a/signac/contrib/errors.py +++ b/signac/contrib/errors.py @@ -1,6 +1,6 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. class DatabaseError(BaseException): pass diff --git a/signac/contrib/filesystems.py b/signac/contrib/filesystems.py index cec632fad..3125e5ea6 100644 --- a/signac/contrib/filesystems.py +++ b/signac/contrib/filesystems.py @@ -1,6 +1,6 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. """The file system handlers defined in this module encapsulate the I/O operations required to store and fetch data from different file systems.""" diff --git a/signac/contrib/formats.py b/signac/contrib/formats.py index 3ede73937..0611d2556 100644 --- a/signac/contrib/formats.py +++ b/signac/contrib/formats.py @@ -1,6 +1,6 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. import logging import errno diff --git a/signac/contrib/formats_network.py b/signac/contrib/formats_network.py index 69ef1d46c..9faa7d913 100644 --- a/signac/contrib/formats_network.py +++ b/signac/contrib/formats_network.py @@ -1,6 +1,6 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. import logging import inspect import collections diff --git a/signac/contrib/hashing.py b/signac/contrib/hashing.py index a1c3134a6..0bd7875a9 100644 --- a/signac/contrib/hashing.py +++ b/signac/contrib/hashing.py @@ -1,6 +1,6 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. import hashlib import json diff --git a/signac/contrib/job.py b/signac/contrib/job.py index f393064ad..9aca35833 100644 --- a/signac/contrib/job.py +++ b/signac/contrib/job.py @@ -1,6 +1,6 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. import os import errno import logging diff --git a/signac/contrib/project.py b/signac/contrib/project.py index 8df0ca685..b10aed9f1 100644 --- a/signac/contrib/project.py +++ b/signac/contrib/project.py @@ -1,6 +1,6 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. import os import re import logging diff --git a/signac/contrib/utility.py b/signac/contrib/utility.py index eec95457d..c38de688d 100644 --- a/signac/contrib/utility.py +++ b/signac/contrib/utility.py @@ -1,6 +1,6 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. import logging import sys import os diff --git a/signac/core/__init__.py b/signac/core/__init__.py index 9124a9c42..6755eaedb 100644 --- a/signac/core/__init__.py +++ b/signac/core/__init__.py @@ -1,3 +1,3 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. diff --git a/signac/core/jsondict.py b/signac/core/jsondict.py index bf62247b8..98c548bfa 100644 --- a/signac/core/jsondict.py +++ b/signac/core/jsondict.py @@ -1,6 +1,6 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. "Dict implementation with backend json file." import os import errno diff --git a/signac/db/database.py b/signac/db/database.py index 27ce46515..f2274d001 100644 --- a/signac/db/database.py +++ b/signac/db/database.py @@ -1,6 +1,6 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. from ..common import host diff --git a/signac/gui/gui.py b/signac/gui/gui.py index abfe137ce..55e4707e2 100644 --- a/signac/gui/gui.py +++ b/signac/gui/gui.py @@ -1,6 +1,6 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. #!/usr/bin/env python3 """Light-weight GUI client as part of the signac framework. diff --git a/signac/gui/models.py b/signac/gui/models.py index d518a2a39..9b569ea59 100644 --- a/signac/gui/models.py +++ b/signac/gui/models.py @@ -1,6 +1,6 @@ # Copyright (c) 2016 The Regents of the University of Michigan # All rights reserved. -# This software is licensed under the MIT License. +# This software is licensed under the BSD 3-Clause License. import collections import logging