[rpms/reuse] epel10: Update to version 4.0.2 (rhbz#2283644)

A new commit has been pushed.

Repo   : rpms/reuse
Branch : epel10
Commit : 7e11739047eacff640b352e77ea7e1f4caece589
Author : Jan Staněk <jstanek@redhat.com>
Date   : 2024-07-08T15:01:30+02:00
Stats  : +198/-157 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/reuse/c/7e11739047eacff640b352e77ea7e1f4caece589?branch=epel10

Log:
Update to version 4.0.2 (rhbz#2283644)

---
diff --git a/0001-Include-CONTRIBUTING.md-in-sdist.patch b/0001-Include-CONTRIBUTING.md-in-sdist.patch
deleted file mode 100644
index 5561854..0000000
--- a/0001-Include-CONTRIBUTING.md-in-sdist.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 5908f69f147716d5f5f72ab88fe512407e01cf2d Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Fri, 17 May 2024 14:31:32 +0200
-Subject: [PATCH] Include CONTRIBUTING.md in sdist
-
-Signed-off-by: rpm-build <rpm-build>
----
- CONTRIBUTING.md | 88 +++++++++++++++++++++++++++++++++++++++++++++++++
- pyproject.toml  |  1 +
- 2 files changed, 89 insertions(+)
- create mode 100644 CONTRIBUTING.md
-
-diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
-new file mode 100644
-index 0000000..10097a6
---- /dev/null
-+++ b/CONTRIBUTING.md
-@@ -0,0 +1,88 @@
-+<!--
-+SPDX-FileCopyrightText: 2021 Free Software Foundation Europe e.V. <https://fsfe.org>
-+
-+SPDX-License-Identifier: CC-BY-SA-4.0
-+-->
-+
-+# Contribution guidelines
-+
-+Any issues or suggestions are welcome at <https://github.com/fsfe/reuse-tool> or
-+via e-mail to one of the maintainers. General inquiries can be sent to
-+<reuse@lists.fsfe.org>.
-+
-+## Code of conduct
-+
-+Interaction within this project is covered by the
-+[FSFE's Code of Conduct](https://fsfe.org/about/codeofconduct).
-+
-+## Pull requests
-+
-+Pull requests are generally welcome and encouraged, but please beware that they
-+may be closed as out-of-scope or otherwise not aligned with the design goals. To
-+be safe, open an issue and engage in dialogue before beginning to implement a
-+feature that may not be accepted.
-+
-+When making a pull request, don't hesitate to add yourself to the AUTHORS.rst
-+file and the copyright headers of the files you touch.
-+
-+## Translation
-+
-+Translations are welcome at
-+<https://hosted.weblate.org/projects/fsfe/reuse-tool/>. If you need additional
-+help to get started, don't hesitate to get in touch with the maintainers.
-+
-+Broader instructions on how to help the FSFE translate things into local
-+languages can be found at <https://fsfe.org/contribute/translators/>. The
-+translators keep in touch with the <translators@lists.fsfe.org> mailing list.
-+
-+## Local development
-+
-+Starting local development is very simple, just execute the following commands:
-+
-+```bash
-+git clone git@github.com:fsfe/reuse-tool.git
-+cd reuse-tool/
-+poetry install  # You may need to install poetry using your package manager.
-+poetry run pre-commit install  # Using poetry is optional here if you already have pre-commit.
-+```
-+
-+Next, you'll find the following commands handy:
-+
-+- `poetry run reuse`
-+- `poetry run pytest`
-+- `poetry run pylint src`
-+- `poetry run mypy`
-+- `make docs`
-+
-+## Development conventions
-+
-+### Poetry
-+
-+Because our downstreams may not have a very recent version of Poetry, we should
-+target `poetry-core>=1.1.0` and `poetry~=1.2.0` when interacting with Poetry,
-+especially when generating the `poetry.lock` file. You can
-+`pip install poetry~=1.2.0` to ascertain that you always get this right.
-+
-+In order to update the `poetry.lock` file while changing as few lines as
-+possible, run `poetry lock --no-update`.
-+
-+## Release checklist
-+
-+- Verify changelog
-+- Create branch release-x.y.z
-+- `bumpversion --new-version x.y.z minor`
-+- `make update-resources`
-+- Alter changelog
-+- Do some final tweaks/bugfixes (and alter changelog)
-+- `make test-release`
-+- `pip install -i https://test.pypi.org/simple reuse` and test the package.
-+- Once everything is good, `git tag -s vx.y.z`. Minimal tag message.
-+- `git push origin vx.y.z`
-+- `make release`
-+- `git checkout main`
-+- `git merge release-x.y.z`
-+- `git push origin main`
-+- Create a release on GitHub.
-+- Update readthedocs (if not happened automatically)
-+- Update API worker: https://git.fsfe.org/reuse/api-worker#user-content-server
-+- Make sure package is updated in distros (contact maintainers)
-diff --git a/pyproject.toml b/pyproject.toml
-index 5ac2c96..2a72d62 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -30,6 +30,7 @@ include = [
-     { path = "AUTHORS.rst", format = "sdist" },
-     { path = "README.md", format = "sdist" },
-     { path = "CHANGELOG.md", format = "sdist" },
-+    { path = "CONTRIBUTING.md", format = "sdist" },
-     { path = ".reuse", format = "sdist" },
-     { path = "LICENSES", format = "sdist" },
-     { path = "docs", format = "sdist" },
--- 
-2.45.1
-

diff --git a/0001-Use-importlib-mode-for-pytest.patch b/0001-Use-importlib-mode-for-pytest.patch
new file mode 100644
index 0000000..aac56ff
--- /dev/null
+++ b/0001-Use-importlib-mode-for-pytest.patch
@@ -0,0 +1,154 @@
+From c6ac7df9260ceb315bfdd1f7c942226c235ee664 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 1/2] 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>
+---
+ pyproject.toml                 | 2 +-
+ tests/test_global_licensing.py | 3 ++-
+ tests/test_lint.py             | 4 ++--
+ tests/test_main.py             | 3 ++-
+ tests/test_project.py          | 3 ++-
+ tests/test_report.py           | 4 ++--
+ tests/test_util.py             | 3 ++-
+ 7 files changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index 51f587a..09af3db 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -139,7 +139,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_global_licensing.py b/tests/test_global_licensing.py
+index bd2b289..d6a04cb 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
+ 
+@@ -26,6 +25,8 @@ from reuse.global_licensing import (
+     ReuseTOML,
+ )
+ 
++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 6ca93f9..d22d069 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_main.py b/tests/test_main.py
+index 3068b33..633084d 100644
+--- a/tests/test_main.py
++++ b/tests/test_main.py
+@@ -24,7 +24,6 @@ from unittest.mock import create_autospec
+ from urllib.error import URLError
+ 
+ import pytest
+-from conftest import RESOURCES_DIRECTORY
+ from freezegun import freeze_time
+ 
+ from reuse import download
+@@ -32,6 +31,8 @@ from reuse._main import main
+ from reuse._util import GIT_EXE, HG_EXE, PIJUL_EXE, cleandoc_nl
+ from reuse.report import LINT_VERSION
+ 
++from .conftest import RESOURCES_DIRECTORY
++
+ # REUSE-IgnoreStart
+ 
+ 
+diff --git a/tests/test_project.py b/tests/test_project.py
+index 0041466..c118caa 100644
+--- a/tests/test_project.py
++++ b/tests/test_project.py
+@@ -14,7 +14,6 @@ from inspect import cleandoc
+ from pathlib import Path
+ 
+ import pytest
+-from conftest import RESOURCES_DIRECTORY, posix
+ from license_expression import LicenseSymbol
+ 
+ from reuse import ReuseInfo, SourceType
+@@ -26,6 +25,8 @@ from reuse.global_licensing import (
+ )
+ from reuse.project import GlobalLicensingConflict, Project
+ 
++from .conftest import RESOURCES_DIRECTORY, posix
++
+ # REUSE-IgnoreStart
+ 
+ 
+diff --git a/tests/test_report.py b/tests/test_report.py
+index 084d591..7052c3d 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
+ 
++from .conftest import cpython, posix
++
+ # REUSE-IgnoreStart
+ 
+ 
+diff --git a/tests/test_util.py b/tests/test_util.py
+index ab00bd2..360b204 100644
+--- a/tests/test_util.py
++++ b/tests/test_util.py
+@@ -18,11 +18,12 @@ from pathlib import Path
+ 
+ import pytest
+ from boolean.boolean import ParseError
+-from conftest import no_root, posix
+ 
+ from reuse import _util
+ from reuse._util import _LICENSING
+ 
++from .conftest import no_root, posix
++
+ # REUSE-IgnoreStart
+ 
+ 
+-- 
+2.45.2
+

diff --git a/0002-Skip-problematic-tests.patch b/0002-Skip-problematic-tests.patch
new file mode 100644
index 0000000..4c64ceb
--- /dev/null
+++ b/0002-Skip-problematic-tests.patch
@@ -0,0 +1,28 @@
+From 50f5ad4e1d2bf37263733cea00f4d95f3295c465 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jstanek@redhat.com>
+Date: Mon, 8 Jul 2024 14:33:48 +0200
+Subject: [PATCH 2/2] Skip problematic tests
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jan Staněk <jstanek@redhat.com>
+---
+ tests/test_main.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/test_main.py b/tests/test_main.py
+index 633084d..5c440d5 100644
+--- a/tests/test_main.py
++++ b/tests/test_main.py
+@@ -356,6 +356,7 @@ def test_lint_no_multiprocessing(fake_repository, stringio, multiprocessing):
+     assert ":-)" in stringio.getvalue()
+ 
+ 
++@pytest.mark.skip("Freezes in mock")
+ @freeze_time("2024-04-08T17:34:00Z")
+ def test_spdx(fake_repository, stringio):
+     """Compile to an SPDX document."""
+-- 
+2.45.2
+

diff --git a/0002-Use-importlib-mode-for-pytest.patch b/0002-Use-importlib-mode-for-pytest.patch
deleted file mode 100644
index 6192301..0000000
--- a/0002-Use-importlib-mode-for-pytest.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d513c3451ee2cbf12a51b4a522a41e52a60e623e Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Fri, 17 May 2024 14:36:49 +0200
-Subject: [PATCH] Use importlib mode for pytest
-
-Signed-off-by: rpm-build <rpm-build>
----
- pyproject.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index 2a72d62..a171e82 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -108,7 +108,7 @@ use_parentheses = true
- line_length = 80
- 
- [tool.pytest.ini_options]
--addopts = "--doctest-modules"
-+addopts = "--doctest-modules --import-mode=importlib"
- 
- [tool.mypy]
- files = [
--- 
-2.45.1
-

diff --git a/reuse.spec b/reuse.spec
index dbcfb14..2ed76f2 100644
--- a/reuse.spec
+++ b/reuse.spec
@@ -1,5 +1,5 @@
 Name:           reuse
-Version:        3.0.2
+Version:        4.0.2
 Release:        %autorelease
 Summary:        A tool for compliance with the REUSE recommendations
 # The CC0-1.0 licence applies to json data files, not code.
@@ -8,8 +8,8 @@ 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-Include-CONTRIBUTING.md-in-sdist.patch
-Patch:          0002-Use-importlib-mode-for-pytest.patch
+Patch:          0001-Use-importlib-mode-for-pytest.patch
+Patch:          0002-Skip-problematic-tests.patch
 
 # Build
 BuildRequires:  python3-devel
@@ -19,13 +19,14 @@ BuildRequires:  git
 BuildRequires:  mercurial
 # These are development dependencies in the Poetry config, not build
 # dependencies. They are build dependencies for Fedora packaging.
-BuildRequires:  %{py3_dist pytest}
 BuildRequires:  %{py3_dist Sphinx}
-BuildRequires:  %{py3_dist sphinx_rtd_theme}
+BuildRequires:  %{py3_dist freezegun}
+BuildRequires:  %{py3_dist furo}
+BuildRequires:  %{py3_dist myst-parser}
+BuildRequires:  %{py3_dist pytest}
 BuildRequires:  %{py3_dist sphinx-autodoc-typehints}
+BuildRequires:  %{py3_dist sphinx_rtd_theme}
 BuildRequires:  %{py3_dist sphinxcontrib-apidoc}
-BuildRequires:  %{py3_dist recommonmark}
-BuildRequires:  %{py3_dist furo}
 Recommends:     git
 Recommends:     mercurial
 BuildArch:      noarch
@@ -45,7 +46,8 @@ generates a project's bill of materials.
 %pyproject_wheel
 pushd docs
 PBR_VERSION=%{version} sphinx-build-%{python3_version} . html
-rm -rf html/.{doctrees,buildinfo}
+PBR_VERSION=%{version} sphinx-build-%{python3_version} -b man . manpages
+rm -rf {html,man}/.{doctrees,buildinfo}
 popd
 
 %install
@@ -53,13 +55,17 @@ popd
 
 %pyproject_save_files reuse
 
+install -p -m0644 -Dt "${RPM_BUILD_ROOT}%{_mandir}/man1" docs/manpages/*.1
+
 %check
-%pytest
+%{pytest}
 
 %files -n reuse -f %{pyproject_files}
 %license LICENSES/*.txt
 %doc README.md CHANGELOG.md docs/html/
 %{_bindir}/reuse
+%{_mandir}/man1/reuse.1*
+%{_mandir}/man1/reuse-*.1*
 
 %changelog
 %autochangelog

diff --git a/sources b/sources
index abce09f..f4c6af1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (reuse-3.0.2.tar.gz) = 3ed6f46a13eb84270e23736034c787e2b1d99766d8e0a996373201a4f8f02ee4f15c12c27da445be5820e7ac27d7fc4b2eafb35145792501082dd852183f60aa
+SHA512 (reuse-4.0.2.tar.gz) = 4e3170be728d75fb82653291582fe124924cb515208b25334219f802baea5646a964c1cdc87ce90ed1241a1b7601137dfe4490910313032e2cd78a3bd5605e04