# HG changeset patch # User Franz Glasner # Date 1612989483 -3600 # Node ID eed16a1ec8f31a4947a2afa5591abae49bfc9559 # Parent cff23c821665f2d4fb2c0aa6d8671e7fcfaae475 Use SPDX license identifiers (either full or short) all over the package diff -r cff23c821665 -r eed16a1ec8f3 LICENSE.txt --- a/LICENSE.txt Wed Feb 10 21:17:26 2021 +0100 +++ b/LICENSE.txt Wed Feb 10 21:38:03 2021 +0100 @@ -28,3 +28,5 @@ 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. + +# BSD 3-Clause "New" or "Revised" License diff -r cff23c821665 -r eed16a1ec8f3 README.txt --- a/README.txt Wed Feb 10 21:17:26 2021 +0100 +++ b/README.txt Wed Feb 10 21:38:03 2021 +0100 @@ -7,7 +7,7 @@ :Date: |VCSJustDate| :Copyright: (c) 2015–2021, Franz Glasner. All rights reserved. -:License: 3-clause BSD License. +:License: BSD 3-Clause "New" or "Revised" License. See :ref:`LICENSE.txt ` for more details. :Revision: |VCSHGrevision| :Repository: |VCSHGpath| diff -r cff23c821665 -r eed16a1ec8f3 configmix/__init__.py --- a/configmix/__init__.py Wed Feb 10 21:17:26 2021 +0100 +++ b/configmix/__init__.py Wed Feb 10 21:38:03 2021 +0100 @@ -4,7 +4,7 @@ :Author: Franz Glasner :Copyright: (c) 2015–2021, Franz Glasner. All rights reserved. -:License: 3-clause BSD License. +:License: BSD 3-Clause "New" or "Revised" License. See LICENSE.txt for details. :ID: @(#) $Header$ diff -r cff23c821665 -r eed16a1ec8f3 configmix/compat.py --- a/configmix/compat.py Wed Feb 10 21:17:26 2021 +0100 +++ b/configmix/compat.py Wed Feb 10 21:38:03 2021 +0100 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # :- # :Copyright: (c) 2015-2020, Franz Glasner. All rights reserved. -# :License: 3-clause BSD. See LICENSE.txt for details. +# :License: BSD-3-Clause. See LICENSE.txt for details. # :- """Some minimal compatibility shim between Python2 and Python3 diff -r cff23c821665 -r eed16a1ec8f3 configmix/config.py --- a/configmix/config.py Wed Feb 10 21:17:26 2021 +0100 +++ b/configmix/config.py Wed Feb 10 21:38:03 2021 +0100 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # :- # :Copyright: (c) 2015-2020, Franz Glasner. All rights reserved. -# :License: 3-clause BSD. See LICENSE.txt for details. +# :License: BSD-3-Clause. See LICENSE.txt for details. # :- """The unified configuration dictionary with attribute support or variable substitution. diff -r cff23c821665 -r eed16a1ec8f3 configmix/extras/__init__.py --- a/configmix/extras/__init__.py Wed Feb 10 21:17:26 2021 +0100 +++ b/configmix/extras/__init__.py Wed Feb 10 21:38:03 2021 +0100 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # :- # :Copyright: (c) 2015-2020, Franz Glasner. All rights reserved. -# :License: 3-clause BSD. See LICENSE.txt for details. +# :License: BSD-3-Clause. See LICENSE.txt for details. # :- """Sub-package for some extras implementations. diff -r cff23c821665 -r eed16a1ec8f3 configmix/extras/aws.py --- a/configmix/extras/aws.py Wed Feb 10 21:17:26 2021 +0100 +++ b/configmix/extras/aws.py Wed Feb 10 21:38:03 2021 +0100 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # :- # :Copyright: (c) 2015-2020, Franz Glasner. All rights reserved. -# :License: 3-clause BSD. See LICENSE.txt for details. +# :License: BSD-3-Clause. See LICENSE.txt for details. # :- """AWS namespace implementation. diff -r cff23c821665 -r eed16a1ec8f3 configmix/ini.py --- a/configmix/ini.py Wed Feb 10 21:17:26 2021 +0100 +++ b/configmix/ini.py Wed Feb 10 21:38:03 2021 +0100 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # :- # :Copyright: (c) 2015-2020, Franz Glasner. All rights reserved. -# :License: 3-clause BSD. See LICENSE.txt for details. +# :License: BSD-3-Clause. See LICENSE.txt for details. # :- """Read INI-style configuration files. diff -r cff23c821665 -r eed16a1ec8f3 configmix/json.py --- a/configmix/json.py Wed Feb 10 21:17:26 2021 +0100 +++ b/configmix/json.py Wed Feb 10 21:38:03 2021 +0100 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # :- # :Copyright: (c) 2018-2020, Franz Glasner. All rights reserved. -# :License: 3-clause BSD. See LICENSE.txt for details. +# :License: BSD-3-Clause. See LICENSE.txt for details. # :- """Read JSON-style configuration files. diff -r cff23c821665 -r eed16a1ec8f3 configmix/py.py --- a/configmix/py.py Wed Feb 10 21:17:26 2021 +0100 +++ b/configmix/py.py Wed Feb 10 21:38:03 2021 +0100 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # :- # :Copyright: (c) 2015-2020, Franz Glasner. All rights reserved. -# :License: 3-clause BSD. See LICENSE.txt for details. +# :License: BSD-3-Clause. See LICENSE.txt for details. # :- """Read configuration settings from Python files. diff -r cff23c821665 -r eed16a1ec8f3 configmix/toml.py --- a/configmix/toml.py Wed Feb 10 21:17:26 2021 +0100 +++ b/configmix/toml.py Wed Feb 10 21:38:03 2021 +0100 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # :- # :Copyright: (c) 2015-2020, Franz Glasner. All rights reserved. -# :License: 3-clause BSD. See LICENSE.txt for details. +# :License: BSD-3-Clause. See LICENSE.txt for details. # :- """Read TOML style configuration files. diff -r cff23c821665 -r eed16a1ec8f3 configmix/variables.py --- a/configmix/variables.py Wed Feb 10 21:17:26 2021 +0100 +++ b/configmix/variables.py Wed Feb 10 21:38:03 2021 +0100 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # :- # :Copyright: (c) 2015-2020, Franz Glasner. All rights reserved. -# :License: 3-clause BSD. See LICENSE.txt for details. +# :License: BSD-3-Clause. See LICENSE.txt for details. # :- """Variable interpolation: implementation of namespaces and filters diff -r cff23c821665 -r eed16a1ec8f3 configmix/yaml.py --- a/configmix/yaml.py Wed Feb 10 21:17:26 2021 +0100 +++ b/configmix/yaml.py Wed Feb 10 21:38:03 2021 +0100 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # :- # :Copyright: (c) 2015-2021, Franz Glasner. All rights reserved. -# :License: 3-clause BSD. See LICENSE.txt for details. +# :License: BSD-3-Clause. See LICENSE.txt for details. # :- """Simple wrapper for :mod:`yaml` to support all-unicode strings when loading configuration files. diff -r cff23c821665 -r eed16a1ec8f3 setup.py --- a/setup.py Wed Feb 10 21:17:26 2021 +0100 +++ b/setup.py Wed Feb 10 21:38:03 2021 +0100 @@ -47,7 +47,7 @@ name="ConfigMix", version=version, author="Franz Glasner", - license="BSD 3-Clause License", + license='BSD 3-Clause "New" or "Revised" License', url="https://pypi.dom66.de/simple/configmix/", description="Library for extended configuration files", long_description=long_description,