Use Reuse for the license

Signed-off-by: Olamide Ojo <[email protected]>

docs/sample_schema_package/mailman_messages/__init__.py

@@ -2,7 +2,7 @@
 #
 # 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,

docs/sample_schema_package/mailman_messages/messages.py

@@ -2,7 +2,7 @@
 #
 # 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,

docs/sample_schema_package/mailman_messages/tests/__init__.py

@@ -2,7 +2,7 @@
 #
 # 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,

docs/sample_schema_package/mailman_messages/tests/test_messages.py

@@ -2,7 +2,7 @@
 #
 # 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,

docs/sample_schema_package/setup.py

@@ -4,7 +4,7 @@
 #
 # 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,

fedora_messaging/__init__.py

@@ -1,19 +1,8 @@
-# This file is part of fedora_messaging.
-# Copyright (C) 2018 Red Hat, Inc.
-#
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+/*
+ * SPDX-FileCopyrightText: 2024 Red Hat, Inc
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 
 import importlib.metadata
 

fedora_messaging/cli.py

@@ -1,19 +1,8 @@
-# This file is part of fedora_messaging.
-# Copyright (C) 2018 Red Hat, Inc.
-#
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+/*
+ * SPDX-FileCopyrightText: 2024 Red Hat, Inc
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 """
 The ``fedora-messaging`` `Click`_ CLI.
 

fedora_messaging/config.py

@@ -1,19 +1,8 @@
-# This file is part of fedora_messaging.
-# Copyright (C) 2018 Red Hat, Inc.
-#
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+/*
+ * SPDX-FileCopyrightText: 2024 Red Hat, Inc
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 """
 fedora-messaging can be configured with the
 ``/etc/fedora-messaging/config.toml`` file or by setting the

fedora_messaging/example.py

@@ -1,19 +1,8 @@
-# This file is part of fedora_messaging.
-# Copyright (C) 2018 Red Hat, Inc.
-#
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+/*
+ * SPDX-FileCopyrightText: 2024 Red Hat, Inc
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 """Example consumers that can be used when starting out with the library to test."""
 
 

fedora_messaging/schema_utils.py

@@ -2,7 +2,7 @@
 #
 # 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,

fedora_messaging/signals.py

@@ -1,19 +1,8 @@
-# This file is part of fedora_messaging.
-# Copyright (C) 2018 Red Hat, Inc.
-#
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+/*
+ * SPDX-FileCopyrightText: 2024 Red Hat, Inc
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 """
 Signals sent by fedora_messaging APIs using :class:`blinker.base.Signal` signals.
 """

fedora_messaging/testing.py

@@ -1,19 +1,8 @@
-# This file is part of fedora_messaging.
-# Copyright (C) 2018 Red Hat, Inc.
-#
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+/*
+ * SPDX-FileCopyrightText: 2024 Red Hat, Inc
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 """
 Once you've written code to publish or consume messages, you'll probably want
 to test it. The :mod:`fedora_messaging.testing` module has utilities for common

fedora_messaging/twisted/consumer.py

@@ -3,7 +3,7 @@
 #
 # 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,

fedora_messaging/twisted/factory.py

@@ -1,19 +1,8 @@
-# This file is part of fedora_messaging.
-# Copyright (C) 2018 Red Hat, Inc.
-#
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+/*
+ * SPDX-FileCopyrightText: 2024 Red Hat, Inc
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 """
 A Twisted Factory for creating and configuring instances of the
 :class:`.FedoraMessagingProtocolV2`.

fedora_messaging/twisted/monitor.py

@@ -1,19 +1,8 @@
-# This file is part of fedora_messaging.
-# Copyright (C) 2018 Red Hat, Inc.
-#
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+/*
+ * SPDX-FileCopyrightText: 2024 Red Hat, Inc
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 
 """
 A Twisted HTTP service to monitor a Fedora Messaging Service.

fedora_messaging/twisted/protocol.py

@@ -1,19 +1,8 @@
-# This file is part of fedora_messaging.
-# Copyright (C) 2018 Red Hat, Inc.
-#
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+/*
+ * SPDX-FileCopyrightText: 2024 Red Hat, Inc
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 """
 The core Twisted interface, a protocol represent a specific connection to the
 AMQP broker.

fedora_messaging/twisted/service.py

@@ -1,19 +1,8 @@
-# This file is part of fedora_messaging.
-# Copyright (C) 2018 Red Hat, Inc.
-#
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+/*
+ * SPDX-FileCopyrightText: 2024 Red Hat, Inc
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 """
 Twisted Service to start and stop the Fedora Messaging Twisted Factory.
 

fedora_messaging/twisted/stats.py

@@ -1,19 +1,8 @@
-# This file is part of fedora_messaging.
-# Copyright (C) 2018 Red Hat, Inc.
-#
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+/*
+ * SPDX-FileCopyrightText: 2024 Red Hat, Inc
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 
 """
 Datastructures to store consumer and producer statistics.

news/383.docs.md

@@ -0,0 +1 @@
+Use Reuse for the license text and license header

pyproject.toml

@@ -5,7 +5,7 @@ description = "A set of tools for using Fedora's messaging infrastructure"
 authors = [
     "Fedora Infrastructure <[email protected]>"
 ]
-license = "GPLv2+"
+license = "GPLv3+"
 readme = "README.rst"
 repository = "https://github.com/fedora-infra/fedora-messaging"
 maintainers = ["Fedora Infrastructure Team"]

tests/conftest.py

@@ -1,19 +1,8 @@
-# This file is part of fedora_messaging.
-# Copyright (C) 2018 Red Hat, Inc.
-#
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+/*
+ * SPDX-FileCopyrightText: 2024 Red Hat, Inc
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 
 import os
 

tests/integration/test_cli.py

@@ -3,7 +3,7 @@
 #
 # 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,