From 57628d1d2e54b60c27ff5bcf60c6d17beeffc22c Mon Sep 17 00:00:00 2001 From: Kaliko Jack Date: Tue, 8 Feb 2022 16:24:17 +0100 Subject: [PATCH] Swith to SPDX for license headers --- .gitignore | 2 ++ CHANGES.txt | 1 + doc/source/commands.rst | 3 +++ doc/source/conf.py | 2 ++ doc/source/contribute.rst | 3 +++ doc/source/doc.rst | 3 +++ doc/source/index.rst | 3 +++ doc/source/use.rst | 3 +++ musicpd.py | 27 ++++++++------------------- setup.cfg | 2 ++ setup.py | 2 ++ test.py | 4 +++- 12 files changed, 35 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 54134f0..3ca37ef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2012-2022 kaliko +# SPDX-License-Identifier: GPL-3.0-or-later # python __pycache__ *.pyc. diff --git a/CHANGES.txt b/CHANGES.txt index b07388d..4b0648d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -6,6 +6,7 @@ Changes in 0.8.0 * Need python 3.6 minimum (modernize code) * Add context management for MPDClient instance (Thanks Wonko der Verständige) +* Switch to SPDX for license header Changes in 0.7.0 ---------------- diff --git a/doc/source/commands.rst b/doc/source/commands.rst index 0d02402..eca6a3a 100644 --- a/doc/source/commands.rst +++ b/doc/source/commands.rst @@ -1,3 +1,6 @@ +.. SPDX-FileCopyrightText: 2018-2021 kaliko +.. SPDX-License-Identifier: GPL-3.0-or-later + .. _commands: Available commands diff --git a/doc/source/conf.py b/doc/source/conf.py index 6839ce5..886811f 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -1,4 +1,6 @@ # coding: utf-8 +# SPDX-FileCopyrightText: 2018-2021 kaliko +# SPDX-License-Identifier: GPL-3.0-or-later # # Python MPD Module documentation build configuration file, created by # sphinx-quickstart on Mon Mar 12 14:37:32 2018. diff --git a/doc/source/contribute.rst b/doc/source/contribute.rst index 26ac918..dd1c5c1 100644 --- a/doc/source/contribute.rst +++ b/doc/source/contribute.rst @@ -1,3 +1,6 @@ +.. SPDX-FileCopyrightText: 2018-2021 kaliko +.. SPDX-License-Identifier: GPL-3.0-or-later + Contributing ============= diff --git a/doc/source/doc.rst b/doc/source/doc.rst index 6731e6b..eed237d 100644 --- a/doc/source/doc.rst +++ b/doc/source/doc.rst @@ -1,3 +1,6 @@ +.. SPDX-FileCopyrightText: 2018-2021 kaliko +.. SPDX-License-Identifier: GPL-3.0-or-later + musicpd namespace ================= diff --git a/doc/source/index.rst b/doc/source/index.rst index 76871d1..df5e6cd 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -1,3 +1,6 @@ +.. SPDX-FileCopyrightText: 2018-2021 kaliko +.. SPDX-License-Identifier: GPL-3.0-or-later + .. include:: ../../README.rst Installation diff --git a/doc/source/use.rst b/doc/source/use.rst index b89db3b..8e9fe47 100644 --- a/doc/source/use.rst +++ b/doc/source/use.rst @@ -1,3 +1,6 @@ +.. SPDX-FileCopyrightText: 2018-2021 kaliko +.. SPDX-License-Identifier: GPL-3.0-or-later + Using the client library ========================= diff --git a/musicpd.py b/musicpd.py index 9603edc..b44518b 100644 --- a/musicpd.py +++ b/musicpd.py @@ -1,22 +1,11 @@ -# python-musicpd: Python MPD client library -# Copyright (C) 2012-2021 kaliko -# Copyright (C) 2021 Wonko der Verständige -# Copyright (C) 2019 Naglis Jonaitis -# Copyright (C) 2019 Bart Van Loon -# Copyright (C) 2008-2010 J. Alexander Treuman -# -# python-musicpd is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# python-musicpd 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with python-musicpd. If not, see . +# SPDX-FileCopyrightText: 2012-2022 kaliko +# SPDX-FileCopyrightText: 2021 Wonko der Verständige +# SPDX-FileCopyrightText: 2019 Naglis Jonaitis +# SPDX-FileCopyrightText: 2019 Bart Van Loon +# SPDX-FileCopyrightText: 2008-2010 J. Alexander Treuman +# SPDX-License-Identifier: GPL-3.0-or-later +"""python-musicpd: Python Music Player Daemon client library""" + import socket import os diff --git a/setup.cfg b/setup.cfg index 76d5632..5bbd5c4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2012-2021 kaliko +# SPDX-License-Identifier: GPL-3.0-or-later [sdist] formats = gztar,zip diff --git a/setup.py b/setup.py index e2e8805..84eaff9 100755 --- a/setup.py +++ b/setup.py @@ -1,5 +1,7 @@ #! /usr/bin/env python3 # coding: utf-8 +# SPDX-FileCopyrightText: 2012-2021 kaliko +# SPDX-License-Identifier: GPL-3.0-or-later from setuptools import setup diff --git a/test.py b/test.py index c911a57..5215917 100755 --- a/test.py +++ b/test.py @@ -1,5 +1,7 @@ #!/usr/bin/env python3 -# -*- coding: utf-8 -*- +# coding: utf-8 +# SPDX-FileCopyrightText: 2012-2021 kaliko +# SPDX-License-Identifier: GPL-3.0-or-later # pylint: disable=missing-docstring """ Test suite highly borrowed^Wsteal from python-mpd2 [0] project. -- 2.39.5