Mercurial > hgrepos > Python > apps > py-cutils
changeset 356:893adaf534d6
Make licenses statements more conformant to REUSE software specifications (FSFE)
| author | Franz Glasner <fzglas.hg@dom66.de> |
|---|---|
| date | Wed, 02 Apr 2025 13:27:43 +0200 |
| parents | f1ec825ec135 |
| children | 7f797d71bd5e |
| files | LICENSE.txt LICENSES/BSD-3-Clause.txt LICENSES/MIT.txt MANIFEST.in README.txt cutils/crcmod/REUSE.toml setup.cfg |
| diffstat | 7 files changed, 59 insertions(+), 57 deletions(-) [+] |
line wrap: on
line diff
--- a/LICENSE.txt Tue Apr 01 20:59:53 2025 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ -BSD 3-Clause "New" or "Revised" License (BSD-3-Clause) -====================================================== - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -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. - - -Licenses for incorporated software -================================== - -crcmod/crcmod2 -- vendored in cutils.crcmod -- MIT License ----------------------------------------------------------- - -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: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -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. -----------------------------------------------------------------------------
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/LICENSES/BSD-3-Clause.txt Wed Apr 02 13:27:43 2025 +0200 @@ -0,0 +1,11 @@ +Copyright (c) <year> <owner>. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +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.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/LICENSES/MIT.txt Wed Apr 02 13:27:43 2025 +0200 @@ -0,0 +1,18 @@ +MIT License + +Copyright (c) <year> <copyright holders> + +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: + +The above copyright notice and this permission notice shall be included in all copies or substantial +portions of the Software. + +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.
--- a/MANIFEST.in Tue Apr 01 20:59:53 2025 +0200 +++ b/MANIFEST.in Wed Apr 02 13:27:43 2025 +0200 @@ -1,4 +1,5 @@ include .hg* *.txt *.py +graft LICENSES graft docs prune docs/_build graft tests
--- a/README.txt Tue Apr 01 20:59:53 2025 +0200 +++ b/README.txt Wed Apr 02 13:27:43 2025 +0200 @@ -24,3 +24,12 @@ - :command:`py-treesum` to compute hash trees for directories. - :command:`py-genpwd` to generate passwords of a given length and from within different character repertoires. + + +Licenses for Incorporated Software +================================== + +crcmod/crcmod2 + MIT License + + vendored in cutils.crcmod
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cutils/crcmod/REUSE.toml Wed Apr 02 13:27:43 2025 +0200 @@ -0,0 +1,17 @@ +# -*- coding: utf-8 -*- +# :- +# SPDX-FileCopyrightText: Copyright (c) 2025 Franz Glasner +# SPDX-License-Identifier: MIT +# :- + +version = 1 + +[[annotations]] +path = ["**.py"] +SPDX-FileCopyrightText = [ + "Copyright (c) 2009 Raymond L. Buvel", + "Copyright (c) 2010 Craig McQueen", + "Copyright (c) 2025 Franz Glasner", + +] +SPDX-License-Identifier = "MIT"
--- a/setup.cfg Tue Apr 01 20:59:53 2025 +0200 +++ b/setup.cfg Wed Apr 02 13:27:43 2025 +0200 @@ -18,7 +18,9 @@ license = BSD 3-Clause "New" or "Revised" License url = https://pypi.dom66.de/simple/py-cutils/ download_url = https://pypi.dom66.de/simple/py-cutils/ -license_files = LICENSE.txt +license_files = + LICENSES/BSD-3-Clause.txt + LICENSES/MIT.txt long_description = file: README.txt long_description_content_type = text/x-rst platforms = any