From a1eb2b1c8b4664aa2fee4f07a92d3130b879318b Mon Sep 17 00:00:00 2001 From: Arjan Molenaar Date: Sat, 3 Feb 2024 16:47:15 +0100 Subject: [PATCH] Use REUSE compliant licensing --- .github/workflows/build.yml | 2 ++ .reuse/dep5 | 12 ++++++++++++ COPYRIGHT.txt | 4 ---- LICENSE.txt | 28 ---------------------------- LICENSES/BSD-3-Clause.txt | 11 +++++++++++ README.md | 4 ++++ docs/conf.py | 3 +-- 7 files changed, 30 insertions(+), 34 deletions(-) create mode 100644 .reuse/dep5 delete mode 100644 COPYRIGHT.txt delete mode 100644 LICENSE.txt create mode 100644 LICENSES/BSD-3-Clause.txt diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e127cc4..6013832 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,6 +49,8 @@ jobs: python-version: ${{ env.python-version }} - name: Lint with Pre-commit uses: pre-commit/action@646c83fcd040023954eafda54b4db0192ce70507 # v3.0.0 + - name: Check REUSE compliance + run: pip install reuse && python -m reuse lint - name: Check Poetry lock file integrity run: | python${{ env.python-version }} -m pip install --constraint=.github/constraints.txt poetry diff --git a/.reuse/dep5 b/.reuse/dep5 new file mode 100644 index 0000000..1e8ba22 --- /dev/null +++ b/.reuse/dep5 @@ -0,0 +1,12 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Generic +Upstream-Contact: Generic Library contributors +Source: https://github.com/gaphor/generic + +Files: * +Copyright: 2010 Andrey Popp, 2019 Arjan Molenaar & Dan Yeaw +License: BSD-3-Clause + +Files: generic/registry.py +Copyright: 2009-2010 Christopher Michael Rossi, 2019 Arjan Molenaar & Dan Yeaw +License: BSD-3-Clause \ No newline at end of file diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt deleted file mode 100644 index 68e7845..0000000 --- a/COPYRIGHT.txt +++ /dev/null @@ -1,4 +0,0 @@ -Copyright (c) 2010 Andrey Popp, All Rights Reserved - -Registry implementation and tests for it (generic.registry). - Copyright (c) 2009-2010 Christopher Michael Rossi, All Rights Reserved diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index 191f9e4..0000000 --- a/LICENSE.txt +++ /dev/null @@ -1,28 +0,0 @@ -BSD 3-Clause License - -Copyright (c) 2010, Generic Library contributors - -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. diff --git a/LICENSES/BSD-3-Clause.txt b/LICENSES/BSD-3-Clause.txt new file mode 100644 index 0000000..d22865f --- /dev/null +++ b/LICENSES/BSD-3-Clause.txt @@ -0,0 +1,11 @@ +Copyright (c) 2010 Andrey Popp, 2019 Arjan Molenaar & Dan Yeaw. + +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. diff --git a/README.md b/README.md index b3b5b3b..153fde4 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,10 @@ excellent readthedocs.org project. Development takes place on # Changes +## 1.1.3 + +- Dependency updates + ## 1.1.2 - Replace print statements with logging diff --git a/docs/conf.py b/docs/conf.py index 6e8bd65..b1002bd 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -12,7 +12,6 @@ import importlib.metadata import sys -from datetime import date from pathlib import Path project_dir = Path(__file__).resolve().parent.parent @@ -45,7 +44,7 @@ master_doc = "index" # General information about the project. project = "generic" -copyright = f"2011, Andrey Popp, 2019-{date.today().year}, Arjan Molenaar and Dan Yeaw" +copyright = "2011, Andrey Popp, 2019, Arjan Molenaar and Dan Yeaw" # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the