public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/reuse] epel10: Update to version 5.1.1 (rhbz#2393143)
@ 2026-08-19 12:50
0 siblings, 0 replies; only message in thread
From: @ 2026-08-19 12:50 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/reuse
Branch : epel10
Commit : ecec756551fcf32a88a0d237392f8e9b5d96e6ad
Author : Jan Staněk <jstanek@redhat.com>
Date : 2025-10-07T15:01:27+02:00
Stats : +6/-157 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/reuse/c/ecec756551fcf32a88a0d237392f8e9b5d96e6ad?branch=epel10
Log:
Update to version 5.1.1 (rhbz#2393143)
---
diff --git a/0001-Use-importlib-mode-for-pytest.patch b/0001-Use-importlib-mode-for-pytest.patch
deleted file mode 100644
index 464a503..0000000
--- a/0001-Use-importlib-mode-for-pytest.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From 64e46322c876c0114ebe537dd8fa87915c63fa74 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jstanek@redhat.com>
-Date: Mon, 8 Jul 2024 14:04:01 +0200
-Subject: [PATCH] Use importlib mode for pytest
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jan Staněk <jstanek@redhat.com>
-Signed-off-by: rpm-build <rpm-build>
----
- pyproject.toml | 2 +-
- tests/test_cli_lint.py | 3 ++-
- tests/test_covered_files.py | 4 ++--
- tests/test_global_licensing.py | 3 ++-
- tests/test_lint.py | 4 ++--
- tests/test_project.py | 3 ++-
- tests/test_report.py | 4 ++--
- 7 files changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index eb4c41f..cd96777 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -148,7 +148,7 @@ use_parentheses = true
- line_length = 80
-
- [tool.pytest.ini_options]
--addopts = "--doctest-modules"
-+addopts = "--doctest-modules --import-mode=importlib"
-
- [tool.mypy]
- files = [
-diff --git a/tests/test_cli_lint.py b/tests/test_cli_lint.py
-index b29dcb7..d9064cc 100644
---- a/tests/test_cli_lint.py
-+++ b/tests/test_cli_lint.py
-@@ -18,12 +18,13 @@ import shutil
- from inspect import cleandoc
-
- from click.testing import CliRunner
--from conftest import RESOURCES_DIRECTORY
-
- from reuse._util import cleandoc_nl
- from reuse.cli.main import main
- from reuse.report import LINT_VERSION
-
-+from .conftest import RESOURCES_DIRECTORY
-+
-
- class TestLint:
- """Tests for lint."""
-diff --git a/tests/test_covered_files.py b/tests/test_covered_files.py
-index 67ef7ce..b70ccdf 100644
---- a/tests/test_covered_files.py
-+++ b/tests/test_covered_files.py
-@@ -10,11 +10,11 @@
- import os
- from pathlib import Path
-
--from conftest import git, hg, pijul, posix
--
- from reuse.covered_files import iter_files
- from reuse.vcs import VCSStrategyGit, VCSStrategyHg, VCSStrategyPijul
-
-+from .conftest import git, hg, pijul, posix
-+
-
- class TestIterFiles:
- """Test the iter_files function."""
-diff --git a/tests/test_global_licensing.py b/tests/test_global_licensing.py
-index 1b73853..b95b8cf 100644
---- a/tests/test_global_licensing.py
-+++ b/tests/test_global_licensing.py
-@@ -9,7 +9,6 @@ from inspect import cleandoc
- from pathlib import Path
-
- import pytest
--from conftest import RESOURCES_DIRECTORY, posix
- from debian.copyright import Copyright
- from license_expression import LicenseSymbol
-
-@@ -28,6 +27,8 @@ from reuse.global_licensing import (
- )
- from reuse.vcs import VCSStrategyGit
-
-+from .conftest import RESOURCES_DIRECTORY, posix
-+
- # REUSE-IgnoreStart
-
- # pylint: disable=redefined-outer-name,too-many-lines
-diff --git a/tests/test_lint.py b/tests/test_lint.py
-index e680b82..f3d6d26 100644
---- a/tests/test_lint.py
-+++ b/tests/test_lint.py
-@@ -9,12 +9,12 @@
- import re
- import shutil
-
--from conftest import cpython, posix
--
- from reuse.lint import format_lines, format_plain
- from reuse.project import Project
- from reuse.report import ProjectReport
-
-+from .conftest import cpython, posix
-+
- # REUSE-IgnoreStart
-
-
-diff --git a/tests/test_project.py b/tests/test_project.py
-index 51381e6..3e3ba15 100644
---- a/tests/test_project.py
-+++ b/tests/test_project.py
-@@ -17,7 +17,6 @@ from pathlib import Path
- from unittest import mock
-
- import pytest
--from conftest import RESOURCES_DIRECTORY
- from license_expression import LicenseSymbol
-
- from reuse import _LICENSING, ReuseInfo, SourceType
-@@ -29,6 +28,8 @@ from reuse.exceptions import (
- from reuse.global_licensing import ReuseDep5, ReuseTOML
- from reuse.project import Project
-
-+from .conftest import RESOURCES_DIRECTORY
-+
- # REUSE-IgnoreStart
-
-
-diff --git a/tests/test_report.py b/tests/test_report.py
-index 3afc9d9..4dbef89 100644
---- a/tests/test_report.py
-+++ b/tests/test_report.py
-@@ -13,12 +13,12 @@ import warnings
- from inspect import cleandoc
- from textwrap import dedent
-
--from conftest import cpython, posix
--
- from reuse import SourceType
- from reuse.project import Project
- from reuse.report import FileReport, ProjectReport, ProjectSubsetReport
-
-+from .conftest import cpython, posix
-+
- # REUSE-IgnoreStart
-
-
---
-2.49.0
-
diff --git a/reuse.spec b/reuse.spec
index 7c7337e..2c32149 100644
--- a/reuse.spec
+++ b/reuse.spec
@@ -1,5 +1,5 @@
Name: reuse
-Version: 5.0.2
+Version: 5.1.1
Release: %autorelease
Summary: A tool for compliance with the REUSE recommendations
# The CC0-1.0 licence applies to json data files, not code.
@@ -8,7 +8,6 @@ License: Apache-2.0 AND CC0-1.0 AND CC-BY-SA-4.0 AND GPL-3.0-or-later
Url: https://github.com/fsfe/reuse-tool
Source0: %pypi_source
-Patch: 0001-Use-importlib-mode-for-pytest.patch
Patch: 0002-Skip-tests-with-old-freezegun.patch
Patch: 0003-Prepare-test_cli_main.py-for-click-8.2.patch
@@ -59,7 +58,10 @@ popd
install -p -m0644 -Dt "${RPM_BUILD_ROOT}%{_mandir}/man1" docs/manpages/*.1
%check
-%{pytest}
+# Note: just running %%{pytest} does not work, since the path manipulation
+# by that macro and `--doctest-modules` confuse the import machinery too much.
+# Hence the manual specification of the test directories.
+%{pytest} tests/ "${RPM_BUILD_ROOT}/%{python3_sitearch}/reuse/"
%files -n reuse -f %{pyproject_files}
%license LICENSES/*.txt
diff --git a/sources b/sources
index 3bc0ddb..bea1de1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (reuse-5.0.2.tar.gz) = f7df31098b28f06272c84edf161c62a0c8d6db87d18429d3f1387d7b931fe9c8cee167262349cc73f174a8daf52933d495034a445b32627534eb3063e74a563b
+SHA512 (reuse-5.1.1.tar.gz) = 3c4896cc524bc8301319ade07c83bbdf9455faadf1158ad0fcaec17f59e20f0e3e7912bc26d630b4851231461f12ca634c1f7f54f58d3470699fb7a925ca981f
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-19 12:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-19 12:50 [rpms/reuse] epel10: Update to version 5.1.1 (rhbz#2393143)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox