Use Reuse for the license #422

olamidepeterojo · 2024-12-12T14:34:27Z

Fixes #383

abompard · 2024-12-17T09:56:20Z

fedora_messaging/__init__.py

-# 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.
+/*


This is C/Javascript-style comments. In Python comments start with a #.

My apologies, i will amend it.

abompard · 2024-12-17T09:59:00Z

fedora_messaging/__init__.py

+/*
+ * SPDX-FileCopyrightText: 2024 Red Hat, Inc
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later


The license is actually GPL-2.0-or-later.

okay, although someone asked what version of GPL you preferred and you said GPL-3.0-or-later, that's why i made use of it .
so which do you prefer i make use of?

Let's not change the license from what it was before, even though I would prefer GPL-3.0-or-later, the code is currently under GPL-2.0-or-later.

Alright, I'll update it to GPL-2.0-or-later.

abompard

This PR is lacking the Reuse check itself. You can for example use this block in .pre-commit-config.yml :

  - repo: https://github.com/fsfe/reuse-tool
    rev: v5.0.2
    hooks:
      - id: reuse

abompard · 2024-12-19T13:35:45Z

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


This is still changing the license. By the way, if you start using the SPDX-License-Identifier tag, you can drop this block of text.

abompard

Some more comments, mostly related to using a REUSE.toml file.

abompard · 2025-01-02T14:56:27Z

tox.ini

@@ -1,3 +1,8 @@
+; SPDX-FileCopyrightText: 2024 2024 Red Hat, Inc
+; SPDX-FileCopyrightText: 2024 Red Hat, Inc


Those two lines seem redundant.

abompard · 2025-01-02T14:57:47Z

tests/integration/test_cli.py

@@ -1,19 +1,8 @@
-# This file is part of fedora_messaging.
 # Copyright (C) 2019 Red Hat, Inc.


You can drop this line as well.

abompard · 2025-01-02T15:04:46Z

tests/fixtures/wrong_json_msg_dump.txt

@@ -1 +1,4 @@
+SPDX-FileCopyrightText: 2024 Red Hat, Inc
+SPDX-License-Identifier: GPL-2.0-or-later


This does not make sense for a test fixture, I would add the fixtures to a block in a REUSE.toml file, using a wildcard, such as:

# Test fixtures [[annotations]] path = ["tests/fixtures/*"] SPDX-FileCopyrightText = "2024 Red Hat, Inc" SPDX-License-Identifier = "GPL-2.0-or-later"

This applies to all the files in this directory.

abompard · 2025-01-02T15:05:30Z

pyproject.toml

 [tool.poetry]
 name = "fedora_messaging"
 version = "3.6.0"
 description = "A set of tools for using Fedora's messaging infrastructure"
 authors = [
    "Fedora Infrastructure <[email protected]>"
 ]
-license = "GPLv2+"
+license = "GPLv3+"


Please don't change the license.

abompard · 2025-01-02T15:07:53Z

pyproject.toml

@@ -1,11 +1,15 @@
+# SPDX-FileCopyrightText: 2024 Red Hat, Inc
+#
+# SPDX-License-Identifier: GPL-2.0-or-later


It does not make much sense in the case of this file, because we're talking about project configuration here.
I would add these files to a block in a REUSE.toml file, such as:

# Project configuration [[annotations]] path = ["pyproject.toml", "poetry.lock", "codecov.yml", ".*.yml", ".*.yaml", "CODEOWNERS"] SPDX-FileCopyrightText = "2024 Red Hat, Inc" SPDX-License-Identifier = "GPL-2.0-or-later"

abompard · 2025-01-02T15:11:05Z

fedora_messaging/twisted/consumer.py

@@ -1,20 +1,7 @@
-# This file is part of fedora_messaging.
 # Copyright (C) 2019 Red Hat, Inc.


This can be dropped as well.

abompard · 2025-01-02T15:12:36Z

docs/schema-packages.txt

+SPDX-FileCopyrightText: 2024 Red Hat, Inc
+SPDX-License-Identifier: GPL-2.0-or-later


Please add the hash sign at the beginning of those lines to mark them as comments.

abompard · 2025-01-02T15:14:11Z

devel/run-liccheck.sh

@@ -1,9 +1,6 @@
-#!/bin/bash


Please leave this line in place.

abompard · 2025-01-02T15:15:43Z

configs/cacert.pem.license

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2024 Red Hat, Inc


All the files in configs can also be covered by a block in a REUSE.toml file, such as:

# configs [[annotations]] path = ["configs/*"] SPDX-FileCopyrightText = "2024 Red Hat, Inc" SPDX-License-Identifier = "GPL-2.0-or-later"

abompard · 2025-01-02T15:20:17Z

.fmf/version

@@ -1 +1,4 @@
+SPDX-FileCopyrightText: 2024 Red Hat, Inc


The FMF config files can be covered by a block in a REUSE.toml file, such as:

# FMF [[annotations]] path = [".fmf/version", "packit/installation/*.fmf"] SPDX-FileCopyrightText = "2024 Red Hat, Inc" SPDX-License-Identifier = "GPL-2.0-or-later"

olamidepeterojo · 2025-01-07T22:52:36Z

hello, i've made the changes as requested but when i run reuse lint it fails saying the following files listed below do not have license

configs\cacert.pem
configs\fedora-cert.pem
configs\fedora-key.pem
configs\fedora.stg-cert.pem
configs\fedora.stg-key.pem
configs\stg-cacert.pem
tests\fixtures\ca_bundle.pem
tests\fixtures\cert.pem
tests\fixtures\key.pem

abompard · 2025-01-08T13:02:14Z

Yes, you can use a REUSE.toml file to cover those files, as indicated in the comments. I don't see it, maybe you forgot to add it to the repo with git add?

olamidepeterojo · 2025-01-08T19:20:22Z

I'm surprised as well. i thought i did cause usually i git add .

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

…aging into license

abompard requested changes Dec 17, 2024

View reviewed changes

olamidepeterojo force-pushed the license branch from fc26af7 to 6849d35 Compare December 18, 2024 11:57

olamidepeterojo requested a review from abompard December 18, 2024 11:58

abompard requested changes Dec 19, 2024

View reviewed changes

olamidepeterojo force-pushed the license branch 2 times, most recently from b5a591a to ec2069c Compare December 21, 2024 15:56

olamidepeterojo requested a review from abompard December 21, 2024 15:57

abompard requested changes Jan 2, 2025

View reviewed changes

olamidepeterojo added 2 commits January 8, 2025 20:31

Use Reuse for license

9476de6

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

Merge branch 'develop' of https://github.com/fedora-infra/fedora-mess…

f295e35

…aging into license

olamidepeterojo force-pushed the license branch from ec2069c to f295e35 Compare January 8, 2025 19:42

olamidepeterojo requested a review from abompard January 8, 2025 19:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use Reuse for the license #422

Use Reuse for the license #422

olamidepeterojo commented Dec 12, 2024

abompard Dec 17, 2024

olamidepeterojo Dec 17, 2024

abompard Dec 17, 2024

olamidepeterojo Dec 17, 2024 •

edited

Loading

abompard Dec 18, 2024

olamidepeterojo Dec 18, 2024

abompard left a comment

abompard Dec 19, 2024

abompard left a comment

abompard Jan 2, 2025

abompard Jan 2, 2025

abompard Jan 2, 2025

abompard Jan 2, 2025

abompard Jan 2, 2025

abompard Jan 2, 2025

abompard Jan 2, 2025

abompard Jan 2, 2025

abompard Jan 2, 2025

abompard Jan 2, 2025

olamidepeterojo commented Jan 7, 2025

abompard commented Jan 8, 2025

olamidepeterojo commented Jan 8, 2025

		@@ -1,3 +1,8 @@
		; SPDX-FileCopyrightText: 2024 2024 Red Hat, Inc
		; SPDX-FileCopyrightText: 2024 Red Hat, Inc

		@@ -1,19 +1,8 @@
		# This file is part of fedora_messaging.
		# Copyright (C) 2019 Red Hat, Inc.

		@@ -1 +1,4 @@
		SPDX-FileCopyrightText: 2024 Red Hat, Inc
		SPDX-License-Identifier: GPL-2.0-or-later

		@@ -1,20 +1,7 @@
		# This file is part of fedora_messaging.
		# Copyright (C) 2019 Red Hat, Inc.

Use Reuse for the license #422

Are you sure you want to change the base?

Use Reuse for the license #422

Conversation

olamidepeterojo commented Dec 12, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

olamidepeterojo Dec 17, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

abompard left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

abompard left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

olamidepeterojo commented Jan 7, 2025

abompard commented Jan 8, 2025

olamidepeterojo commented Jan 8, 2025

olamidepeterojo Dec 17, 2024 •

edited

Loading