From c96247f3613546b64fa6e9b02fe4cf406d7d7112 Mon Sep 17 00:00:00 2001 From: Cody Logan Date: Wed, 2 Oct 2019 15:37:53 -0700 Subject: Amend copyright notices and license statements --- README.md | 2 +- setup.py | 17 +++++++++++++++-- test/test_wikiget.py | 17 +++++++++++++++-- wikiget/version.py | 4 ---- wikiget/wikiget.py | 19 ++++++++++++++++--- 5 files changed, 47 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 2230524..51afc9e 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ executable script. Unit tests can be run with `python setup.py test`. ## License -Copyright (C) 2018-2019 Cody Logan +Copyright (C) 2018, 2019 Cody Logan This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/setup.py b/setup.py index 5a8ae3a..a936906 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,19 @@ -# wikiget - simple CLI tool for downloading files from Wikimedia sites. -# Copyright (C) 2018-2019 Cody Logan; licensed GPLv3+ +# wikiget - CLI tool for downloading files from Wikimedia sites +# Copyright (C) 2018, 2019 Cody Logan # SPDX-License-Identifier: GPL-3.0-or-later +# +# Wikiget is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Wikiget is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Wikiget. If not, see . """Python setuptools metadata and dependencies.""" diff --git a/test/test_wikiget.py b/test/test_wikiget.py index 373fa25..8aaaec8 100644 --- a/test/test_wikiget.py +++ b/test/test_wikiget.py @@ -1,7 +1,20 @@ # -*- coding: utf-8 -*- -# wikiget - simple CLI tool for downloading files from Wikimedia sites. -# Copyright (C) 2018-2019 Cody Logan; licensed GPLv3+ +# wikiget - CLI tool for downloading files from Wikimedia sites +# Copyright (C) 2018, 2019 Cody Logan # SPDX-License-Identifier: GPL-3.0-or-later +# +# Wikiget is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Wikiget is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Wikiget. If not, see . """Defines test functions to run with pytest.""" diff --git a/wikiget/version.py b/wikiget/version.py index 5b1bb55..456318a 100644 --- a/wikiget/version.py +++ b/wikiget/version.py @@ -1,7 +1,3 @@ -# wikiget - simple CLI tool for downloading files from Wikimedia sites. -# Copyright (C) 2018-2019 Cody Logan; licensed GPLv3+ -# SPDX-License-Identifier: GPL-3.0-or-later - """Sets the program version in setup.py and on the command line.""" __version__ = "0.2.0" diff --git a/wikiget/wikiget.py b/wikiget/wikiget.py index 04d6f3e..8d58ec0 100644 --- a/wikiget/wikiget.py +++ b/wikiget/wikiget.py @@ -1,6 +1,19 @@ -# wikiget - simple CLI tool for downloading files from Wikimedia sites. -# Copyright (C) 2018-2019 Cody Logan; licensed GPLv3+ +# wikiget - CLI tool for downloading files from Wikimedia sites +# Copyright (C) 2018, 2019 Cody Logan # SPDX-License-Identifier: GPL-3.0-or-later +# +# Wikiget is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Wikiget is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Wikiget. If not, see . """Main wikiget functions.""" @@ -43,7 +56,7 @@ def main(): using the file name or description page URL """, epilog=""" - Copyright (C) 2018-2019 Cody Logan. License GPLv3+: GNU GPL + Copyright (C) 2018, 2019 Cody Logan. License GPLv3+: GNU GPL version 3 or later . This is free software; you are free to change and redistribute it under certain conditions. There is NO WARRANTY, to the -- cgit v1.2.3