Use Reuse as license

Signed-off-by: Olamide Ojo <[email protected]>
fedora-infra · Feb 21, 2025 · 44ddeb2 · 44ddeb2
1 parent 9863192
commit 44ddeb2
Show file tree

Hide file tree

Showing 33 changed files with 15 additions and 383 deletions.
diff --git a/.packit.yaml b/.packit.yaml
@@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2024 Red Hat, Inc
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 # See the documentation for more information:
 # https://packit.dev/docs/configuration/
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2024 Red Hat, Inc
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 repos:
   # Generic hooks
   - repo: https://github.com/pre-commit/pre-commit-hooks

diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2024 Red Hat, Inc
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 # Read the Docs configuration file
 # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
 ---

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1,5 +1 @@
-# SPDX-FileCopyrightText: 2024 Red Hat, Inc
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 *   @fedora-infra/fedmsg-maintainers
diff --git a/LICENSE b/LICENSE
diff --git a/REUSE.toml b/REUSE.toml
@@ -2,67 +2,7 @@ version = 2
 
 # Test fixtures
 [[annotations]]
-path = ["tests/fixtures/bad_cb"]
-SPDX-FileCopyrightText = "2024 Red Hat, Inc"
-SPDX-License-Identifier = "GPL-2.0-or-later"
-
-[[annotations]]
-path = ["tests/fixtures/ca_bundle.pem.license"]
-SPDX-FileCopyrightText = "2024 Red Hat, Inc"
-SPDX-License-Identifier = "GPL-2.0-or-later"
-
-[[annotations]]
-path = ["tests/fixtures/cert.pem.license"]
-SPDX-FileCopyrightText = "2024 Red Hat, Inc"
-SPDX-License-Identifier = "GPL-2.0-or-later"
-
-[[annotations]]
-path = ["tests/fixtures/good_msg_dump.txt"]
-SPDX-FileCopyrightText = "2024 Red Hat, Inc"
-SPDX-License-Identifier = "GPL-2.0-or-later"
-
-[[annotations]]
-path = ["tests/fixtures/invalid_ca.pem.license"]
-SPDX-FileCopyrightText = "2024 Red Hat, Inc"
-SPDX-License-Identifier = "GPL-2.0-or-later"
-
-[[annotations]]
-path = ["tests/fixtures/invalid_key.pem.license"]
-SPDX-FileCopyrightText = "2024 Red Hat, Inc"
-SPDX-License-Identifier = "GPL-2.0-or-later"
-
-[[annotations]]
-path = ["tests/fixtures/invalid_msg_dump.txt"]
-SPDX-FileCopyrightText = "2024 Red Hat, Inc"
-SPDX-License-Identifier = "GPL-2.0-or-later"
-
-[[annotations]]
-path = ["tests/fixtures/key.pem.license"]
-SPDX-FileCopyrightText = "2024 Red Hat, Inc"
-SPDX-License-Identifier = "GPL-2.0-or-later"
-
-[[annotations]]
-path = ["tests/fixtures/msg_without_topic_dump.txt"]
-SPDX-FileCopyrightText = "2024 Red Hat, Inc"
-SPDX-License-Identifier = "GPL-2.0-or-later"
-
-[[annotations]]
-path = ["tests/fixtures/wrong_json_msg_dump.txt"]
-SPDX-FileCopyrightText = "2024 Red Hat, Inc"
-SPDX-License-Identifier = "GPL-2.0-or-later"
-
-[[annotations]]
-path = ["tests/fixtures/ca_bundle.pem"]
-SPDX-FileCopyrightText = "2024 Red Hat, Inc"
-SPDX-License-Identifier = "GPL-2.0-or-later"
-
-[[annotations]]
-path = ["tests/fixtures/cert.pem"]
-SPDX-FileCopyrightText = "2024 Red Hat, Inc"
-SPDX-License-Identifier = "GPL-2.0-or-later"
-
-[[annotations]]
-path = ["tests/fixtures/key.pem"]
+path = ["tests/fixtures/*"]
 SPDX-FileCopyrightText = "2024 Red Hat, Inc"
 SPDX-License-Identifier = "GPL-2.0-or-later"
 
@@ -74,67 +14,18 @@ SPDX-License-Identifier = "GPL-2.0-or-later"
 
 # configs
 [[annotations]]
-path = ["configs/cacert.pem.license"]
-SPDX-FileCopyrightText = "2024 Red Hat, Inc"
-SPDX-License-Identifier = "GPL-2.0-or-later"
-
-[[annotations]]
-path = ["configs/fedora-cert.pem.license"]
-SPDX-FileCopyrightText = "2024 Red Hat, Inc"
-SPDX-License-Identifier = "GPL-2.0-or-later"
-
-[[annotations]]
-path = ["configs/fedora-key.pem.license"]
-SPDX-FileCopyrightText = "2024 Red Hat, Inc"
-SPDX-License-Identifier = "GPL-2.0-or-later"
-
-[[annotations]]
-path = ["configs/fedora.stg-cert.pem.license"]
-SPDX-FileCopyrightText = "2024 Red Hat, Inc"
-SPDX-License-Identifier = "GPL-2.0-or-later"
-
-[[annotations]]
-path = ["configs/fedora.stg-key.pem.license"]
-SPDX-FileCopyrightText = "2024 Red Hat, Inc"
-SPDX-License-Identifier = "GPL-2.0-or-later"
-
-[[annotations]]
-path = ["configs/stg-cacert.pem.license"]
-SPDX-FileCopyrightText = "2024 Red Hat, Inc"
-SPDX-License-Identifier = "GPL-2.0-or-later"
-
-[[annotations]]
-path = ["configs/cacert.pem"]
-SPDX-FileCopyrightText = "2024 Red Hat, Inc"
-SPDX-License-Identifier = "GPL-2.0-or-later"
-
-[[annotations]]
-path = ["configs/fedora-cert.pem"]
-SPDX-FileCopyrightText = "2024 Red Hat, Inc"
-SPDX-License-Identifier = "GPL-2.0-or-later"
-
-[[annotations]]
-path = ["configs/fedora-key.pem"]
-SPDX-FileCopyrightText = "2024 Red Hat, Inc"
-SPDX-License-Identifier = "GPL-2.0-or-later"
-
-[[annotations]]
-path = ["configs/fedora.stg-cert.pem"]
-SPDX-FileCopyrightText = "2024 Red Hat, Inc"
-SPDX-License-Identifier = "GPL-2.0-or-later"
-
-[[annotations]]
-path = ["configs/fedora.stg-key.pem"]
+path = ["configs/*"]
 SPDX-FileCopyrightText = "2024 Red Hat, Inc"
 SPDX-License-Identifier = "GPL-2.0-or-later"
 
+# FMF
 [[annotations]]
-path = ["configs/stg-cacert.pem"]
+path = [".fmf/version", "packit/installation/*.fmf"]
 SPDX-FileCopyrightText = "2024 Red Hat, Inc"
 SPDX-License-Identifier = "GPL-2.0-or-later"
 
-# FMF
+# News fragments
 [[annotations]]
-path = [".fmf/version", "packit/installation/*.fmf"]
+path = ["news/*"]
 SPDX-FileCopyrightText = "2024 Red Hat, Inc"
 SPDX-License-Identifier = "GPL-2.0-or-later"
diff --git a/codecov.yml b/codecov.yml
@@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2024 Red Hat, Inc
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 coverage:
   status:
     project:

diff --git a/config.toml.example b/config.toml.example
@@ -1,5 +1,5 @@
-SPDX-FileCopyrightText: 2024 Red Hat, Inc
-SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-FileCopyrightText: 2024 Red Hat, Inc
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 # A sample configuration for fedora-messaging. This file is in the TOML format.
 amqp_url = "amqp://"

diff --git a/configs/cacert.pem.license b/configs/cacert.pem.license
diff --git a/configs/fedora-cert.pem.license b/configs/fedora-cert.pem.license
diff --git a/configs/fedora-key.pem.license b/configs/fedora-key.pem.license
diff --git a/configs/fedora.stg-cert.pem.license b/configs/fedora.stg-cert.pem.license
diff --git a/configs/fedora.stg-key.pem.license b/configs/fedora.stg-key.pem.license
diff --git a/configs/fedora.stg.toml b/configs/fedora.stg.toml
@@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2024 Red Hat, Inc
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 # A basic configuration for Fedora's staging message broker, using the example
 # callback which simply prints messages to standard output.
 #

diff --git a/configs/fedora.toml b/configs/fedora.toml
@@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2024 Red Hat, Inc
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 # A basic configuration for Fedora's message broker, using the example callback
 # which simply prints messages to standard output.
 #

diff --git a/configs/stg-cacert.pem.license b/configs/stg-cacert.pem.license
diff --git a/docs/requirements-readthedocs.txt b/docs/requirements-readthedocs.txt
@@ -1,4 +1,4 @@
-SPDX-FileCopyrightText: 2024 Red Hat, Inc
-SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-FileCopyrightText: 2024 Red Hat, Inc
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 myst-parser
diff --git a/docs/sample_schema_package/README → docs/sample_schema_package/README.md b/docs/sample_schema_package/README → docs/sample_schema_package/README.md
@@ -1,5 +1,8 @@
+<!--
 SPDX-FileCopyrightText: 2024 Red Hat, Inc
+
 SPDX-License-Identifier: GPL-2.0-or-later
+-->
 
 A sample schema package.
 

diff --git a/[email protected] b/[email protected]
@@ -1,5 +1,5 @@
-SPDX-FileCopyrightText: 2024 Red Hat, Inc
-SPDX-License-Identifier: GPL-2.0-or-later
+# SPDX-FileCopyrightText: 2024 Red Hat, Inc
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 [Unit]
 Description=Fedora Messaging consumer

diff --git a/news/187.feature.license b/news/187.feature.license
diff --git a/news/359.feature.license b/news/359.feature.license
diff --git a/news/380.feature.license b/news/380.feature.license
diff --git a/news/383.docs.md b/news/383.docs.md
@@ -1,7 +1 @@
-<!--
-SPDX-FileCopyrightText: 2024 Red Hat, Inc
-
-SPDX-License-Identifier: GPL-2.0-or-later
--->
-
 Use Reuse for the license text and license header
diff --git a/news/_template.md b/news/_template.md
@@ -1,9 +1,3 @@
-<!--
-SPDX-FileCopyrightText: 2024 Red Hat, Inc
-
-SPDX-License-Identifier: GPL-2.0-or-later
--->
-
 {% macro reference(value) -%}
    {%- if value.startswith("PR") -%}
      PR #{{ value[2:] }}

diff --git a/packit/installation/main.fmf b/packit/installation/main.fmf
@@ -1,6 +1,3 @@
-SPDX-FileCopyrightText: 2024 Red Hat, Inc
-SPDX-License-Identifier: GPL-2.0-or-later
-
 summary: Check some CLI commands
 execute:
   script:

diff --git a/poetry.lock.license b/poetry.lock.license
diff --git a/tests/fixtures/bad_conf.toml b/tests/fixtures/bad_conf.toml
@@ -1,5 +1 @@
-# SPDX-FileCopyrightText: 2024 Red Hat, Inc
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-
 publish_exchange = I forgot quotes here
diff --git a/tests/fixtures/ca_bundle.pem.license b/tests/fixtures/ca_bundle.pem.license
diff --git a/tests/fixtures/cert.pem.license b/tests/fixtures/cert.pem.license
diff --git a/tests/fixtures/invalid_ca.pem.license b/tests/fixtures/invalid_ca.pem.license
diff --git a/tests/fixtures/invalid_key.pem.license b/tests/fixtures/invalid_key.pem.license
diff --git a/tests/fixtures/key.pem.license b/tests/fixtures/key.pem.license
diff --git a/tests/fixtures/msg_without_topic_dump.txt b/tests/fixtures/msg_without_topic_dump.txt
@@ -1,2 +1 @@
-
 {"body": {"test_key1": "test_value1"}, "headers": {"fedora_messaging_schema": "base.message", "fedora_messaging_severity": 20, "sent-at": "2018-11-18T10:11:41+00:00"}, "queue": "test_queue"}
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@

		{"body": {"test_key1": "test_value1"}, "headers": {"fedora_messaging_schema": "base.message", "fedora_messaging_severity": 20, "sent-at": "2018-11-18T10:11:41+00:00"}, "queue": "test_queue"}