pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

reuse-tool: Update to 5.0.2



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Mon Nov 25 12:17:48 2024 +0100
Changeset:	2e7fe3373635fdbe548f03a3005bd5e7e8910d06

Modified Files:
	reuse-tool/COMMIT_MSG
	reuse-tool/Makefile
	reuse-tool/PLIST
	reuse-tool/distinfo
	reuse-tool/patches/patch-docs_conf.py

Log Message:
reuse-tool: Update to 5.0.2

- Dependency for py-click added
- Incompatibility with Python 3.8 declared

v5.0.2 - 2024-11-14
===================

Fixed
-----
- The release date for the v5.0.0 entry in the change log was wrong.

v5.0.1 - 2024-11-14
===================

Fixed
-----
- Fix readthedocs build.

v5.0.0 - 2024-11-14
===================

This is a big release for a small change set. With this release, the tool
becomes compatible with
[REUSE Specification 3.3](https://reuse.software/spec-3.3), which is a very
subtly improved release of the much bigger version 3.2.

Changed
-------
- Bumped REUSE Specification version to
  [version 3.3](https://reuse.software/spec-3.3). (#1069)
- Switched from `argparse` to `click` for handling the CLI. The CLI should still
  handle the same, with identical options and arguments, but some stuff changed
  under the hood. (#1084)

  Find here a small list of differences:

  - `-h` is no longer shorthand for `--help`.
  - `--version` now outputs "reuse, version X.Y.Z", followed by a licensing
    blurb on different paragraphs.
  - Some options are made explicitly mutually exclusive, such as `annotate`'s
    `--skip-unrecognised` and `--style`, and `download`'s `--output` and
    `--all`.
  - Subcommands which take a list of things (files, license) as arguments, such
    as `annotate`, `lint-file`, or `download`, now also allow zero arguments.
    This will do nothing, but can be useful in scripting.
  - `annotate` and `lint-file` now also take directories as arguments. This will
    do nothing, but can be useful in scripting.

- Changes to comment styles:
  - Allow Python-style comments in Cargo.lock files. (#1060)
  - `.s` files (GNU as) now use the C comment style. (#1034)
  - `.ld` files (GNU ld) now use the C comment style. (#1034)
- `REUSE.toml` no longer needs a licensing header. (#1042)
- `.gitkeep` is no longer ignored, because this is not defined in the
  specification. However, if `.gitkeep` is a 0-size file, it will remain ignored
  (because 0-size files are ignored). (#1043)
- If `REUSE.toml` is ignored by VCS, the linter no longer parses this file.
  (#1047)
- SPDX license and exception list updated to v3.25.0.
- More `LICENSE` and `COPYING`-like files are ignored. Now, such files suffixed
  by `-anything` are also ignored, typically something like `LICENSE-MIT`. Files
  with the UK spelling `LICENCE` are also ignored. (#1041)

Removed
-------
- Python 3.8 support removed. (#1080)

Added
-----
- More file types are recognised:
  - Cabal (`.cabal`, `cabal.project`) (#1089, #1090)
  - `.envrc` (#1061)
  - `.flake.lock` (#1061)
  - Ansible Jinja2 (`.j2`) (#1036)
  - Poetry lock file (`poetry.lock`) (#1037)
- Added `lint-file` subcommand to enable running lint on specific files. (#1055)
- Added shell completion via `click`. (#1084)
- Added Jujutsu VCS support. (#TODO)
- Added new copyright prefixes `spdx-string`, `spdx-string-c`, and
  `spdx-string-symbol`. (#979)
- Support for Python 3.13. (#1092)

Fixed
-----
- In `REUSE.toml`, fixed the globbing of a single asterisk succeeded by a slash
  (e.g. `directory-*/foo.py`). The glob previously did nothing. (#1078)
- Increased the minimum requirement of `attrs` to `>=21.3`. Older versions do
  not import correctly. (#1044)
- Performance greatly improved for projects with large directories ignored by
  VCS. (#1047)
- Performance slightly improved for large projects. (#1047)
- The plain output of `lint` has been slightly improved, getting rid of an
  errant newline. (#1091)
- `reuse annotate --merge-copyrights` now works more reliably with copyright
  prefixes. This still needs some work, though. (#979)
- In some scenarios, where a user has multiple `REUSE.toml` files and one of
  those files could not be parsed, the wrong `REUSE.toml` was signalled as being
  unparseable. This is now fixed. (#1047)
- Fixed a bug where `REUSE.toml` did not correctly apply its annotations to
  files which have an accompanying `.license` file. (#1058)
- When running `reuse download SPDX-IDENTIFIER+`, download `SPDX-IDENTIFIER`
  instead. This also works for `reuse download --all`. (#1098)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2e7fe3373635fdbe548f03a3005bd5e7e8910d06

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 reuse-tool/COMMIT_MSG                 |  2 +-
 reuse-tool/Makefile                   |  5 ++-
 reuse-tool/PLIST                      | 60 ++++++++++++++++++++++++++++-------
 reuse-tool/distinfo                   |  8 ++---
 reuse-tool/patches/patch-docs_conf.py |  4 +--
 5 files changed, 59 insertions(+), 20 deletions(-)

diffs:
diff --git a/reuse-tool/COMMIT_MSG b/reuse-tool/COMMIT_MSG
index 36e0c21a53..22329f8c0b 100644
--- a/reuse-tool/COMMIT_MSG
+++ b/reuse-tool/COMMIT_MSG
@@ -1,3 +1,3 @@
-devel/reuse-tool: Add reuse-tool version 4.0.3
+devel/reuse-tool: Add reuse-tool version 5.0.2
 
 Tool for compliance with the REUSE recommendations.
diff --git a/reuse-tool/Makefile b/reuse-tool/Makefile
index ee83e14f19..f8fbde6e79 100644
--- a/reuse-tool/Makefile
+++ b/reuse-tool/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	reuse-tool-4.0.3
+DISTNAME=	reuse-tool-5.0.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=fsfe/}
 GITHUB_PROJECT=	reuse-tool
@@ -13,12 +13,15 @@ LICENSE=	apache-2.0 AND gnu-gpl-v3 AND cc-by-sa-v4.0 AND cc0-1.0-universal
 
 USE_LANGUAGES=	# none
 
+PYTHON_VERSIONS_INCOMPATIBLE=	38
+
 TOOL_DEPENDS+=	${PYPKGPREFIX}-myst-parser>=3.0.1:../../textproc/py-myst-parser
 TOOL_DEPENDS+=	${PYPKGPREFIX}-pbr>=6.0.0:../../devel/py-pbr
 TOOL_DEPENDS+=	${PYPKGPREFIX}-poetry-core>=1.9.0:../../devel/py-poetry-core
 TOOL_DEPENDS+=	${PYPKGPREFIX}-sphinx>=7.3.7:../../textproc/py-sphinx
 DEPENDS+=	${PYPKGPREFIX}-attrs>=21.3:../../devel/py-attrs
 DEPENDS+=	${PYPKGPREFIX}-binaryornot>=0.4.4:../../devel/py-binaryornot
+DEPENDS+=	${PYPKGPREFIX}-click>=8.1.7:../../devel/py-click
 DEPENDS+=	${PYPKGPREFIX}-debian>=0.1.34<0.1.45:../../wip/py-debian
 DEPENDS+=	${PYPKGPREFIX}-boolean.py>=3.8.0:../../devel/py-boolean.py
 DEPENDS+=	${PYPKGPREFIX}-license-expression>=1.0:../../devel/py-license-expression
diff --git a/reuse-tool/PLIST b/reuse-tool/PLIST
index b045cbb3a4..2e19f02d39 100644
--- a/reuse-tool/PLIST
+++ b/reuse-tool/PLIST
@@ -18,33 +18,72 @@ ${PYSITELIB}/reuse/__main__.pyo
 ${PYSITELIB}/reuse/_annotate.py
 ${PYSITELIB}/reuse/_annotate.pyc
 ${PYSITELIB}/reuse/_annotate.pyo
-${PYSITELIB}/reuse/_format.py
-${PYSITELIB}/reuse/_format.pyc
-${PYSITELIB}/reuse/_format.pyo
 ${PYSITELIB}/reuse/_licenses.py
 ${PYSITELIB}/reuse/_licenses.pyc
 ${PYSITELIB}/reuse/_licenses.pyo
-${PYSITELIB}/reuse/_main.py
-${PYSITELIB}/reuse/_main.pyc
-${PYSITELIB}/reuse/_main.pyo
 ${PYSITELIB}/reuse/_util.py
 ${PYSITELIB}/reuse/_util.pyc
 ${PYSITELIB}/reuse/_util.pyo
+${PYSITELIB}/reuse/cli/__init__.py
+${PYSITELIB}/reuse/cli/__init__.pyc
+${PYSITELIB}/reuse/cli/__init__.pyo
+${PYSITELIB}/reuse/cli/annotate.py
+${PYSITELIB}/reuse/cli/annotate.pyc
+${PYSITELIB}/reuse/cli/annotate.pyo
+${PYSITELIB}/reuse/cli/common.py
+${PYSITELIB}/reuse/cli/common.pyc
+${PYSITELIB}/reuse/cli/common.pyo
+${PYSITELIB}/reuse/cli/convert_dep5.py
+${PYSITELIB}/reuse/cli/convert_dep5.pyc
+${PYSITELIB}/reuse/cli/convert_dep5.pyo
+${PYSITELIB}/reuse/cli/download.py
+${PYSITELIB}/reuse/cli/download.pyc
+${PYSITELIB}/reuse/cli/download.pyo
+${PYSITELIB}/reuse/cli/lint.py
+${PYSITELIB}/reuse/cli/lint.pyc
+${PYSITELIB}/reuse/cli/lint.pyo
+${PYSITELIB}/reuse/cli/lint_file.py
+${PYSITELIB}/reuse/cli/lint_file.pyc
+${PYSITELIB}/reuse/cli/lint_file.pyo
+${PYSITELIB}/reuse/cli/main.py
+${PYSITELIB}/reuse/cli/main.pyc
+${PYSITELIB}/reuse/cli/main.pyo
+${PYSITELIB}/reuse/cli/spdx.py
+${PYSITELIB}/reuse/cli/spdx.pyc
+${PYSITELIB}/reuse/cli/spdx.pyo
+${PYSITELIB}/reuse/cli/supported_licenses.py
+${PYSITELIB}/reuse/cli/supported_licenses.pyc
+${PYSITELIB}/reuse/cli/supported_licenses.pyo
 ${PYSITELIB}/reuse/comment.py
 ${PYSITELIB}/reuse/comment.pyc
 ${PYSITELIB}/reuse/comment.pyo
 ${PYSITELIB}/reuse/convert_dep5.py
 ${PYSITELIB}/reuse/convert_dep5.pyc
 ${PYSITELIB}/reuse/convert_dep5.pyo
+${PYSITELIB}/reuse/copyright.py
+${PYSITELIB}/reuse/copyright.pyc
+${PYSITELIB}/reuse/copyright.pyo
+${PYSITELIB}/reuse/covered_files.py
+${PYSITELIB}/reuse/covered_files.pyc
+${PYSITELIB}/reuse/covered_files.pyo
 ${PYSITELIB}/reuse/download.py
 ${PYSITELIB}/reuse/download.pyc
 ${PYSITELIB}/reuse/download.pyo
+${PYSITELIB}/reuse/exceptions.py
+${PYSITELIB}/reuse/exceptions.pyc
+${PYSITELIB}/reuse/exceptions.pyo
+${PYSITELIB}/reuse/extract.py
+${PYSITELIB}/reuse/extract.pyc
+${PYSITELIB}/reuse/extract.pyo
 ${PYSITELIB}/reuse/global_licensing.py
 ${PYSITELIB}/reuse/global_licensing.pyc
 ${PYSITELIB}/reuse/global_licensing.pyo
 ${PYSITELIB}/reuse/header.py
 ${PYSITELIB}/reuse/header.pyc
 ${PYSITELIB}/reuse/header.pyo
+${PYSITELIB}/reuse/i18n.py
+${PYSITELIB}/reuse/i18n.pyc
+${PYSITELIB}/reuse/i18n.pyo
 ${PYSITELIB}/reuse/lint.py
 ${PYSITELIB}/reuse/lint.pyc
 ${PYSITELIB}/reuse/lint.pyo
@@ -72,14 +111,11 @@ ${PYSITELIB}/reuse/resources/exceptions.json
 ${PYSITELIB}/reuse/resources/exceptions.json.license
 ${PYSITELIB}/reuse/resources/licenses.json
 ${PYSITELIB}/reuse/resources/licenses.json.license
-${PYSITELIB}/reuse/spdx.py
-${PYSITELIB}/reuse/spdx.pyc
-${PYSITELIB}/reuse/spdx.pyo
-${PYSITELIB}/reuse/supported_licenses.py
-${PYSITELIB}/reuse/supported_licenses.pyc
-${PYSITELIB}/reuse/supported_licenses.pyo
 ${PYSITELIB}/reuse/templates/default_template.jinja2
 ${PYSITELIB}/reuse/templates/default_template.jinja2.license
+${PYSITELIB}/reuse/types.py
+${PYSITELIB}/reuse/types.pyc
+${PYSITELIB}/reuse/types.pyo
 ${PYSITELIB}/reuse/vcs.py
 ${PYSITELIB}/reuse/vcs.pyc
 ${PYSITELIB}/reuse/vcs.pyo
diff --git a/reuse-tool/distinfo b/reuse-tool/distinfo
index 522748f701..ac883e5f3b 100644
--- a/reuse-tool/distinfo
+++ b/reuse-tool/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-BLAKE2s (reuse-tool-4.0.3.tar.gz) = 387c6737cd9098d5f6074247260c745b08acc881464c9fe188284c3356401185
-SHA512 (reuse-tool-4.0.3.tar.gz) = 2f9dca807a0f3eed9356c1fcbe9f7bc8fd9711ac3583811decf90bbb28818a0af64925fa31ee84e8c0e8241d64e9194209b03cb422bf1aeb6b160eca3289bec6
-Size (reuse-tool-4.0.3.tar.gz) = 360402 bytes
-SHA1 (patch-docs_conf.py) = 50ed766eb22fee68a1e39c634e71d3ef040f1410
+BLAKE2s (reuse-tool-5.0.2.tar.gz) = 01e27295a32353cf8820f5d31db25e6bd331314c7026a039372962394d13bed3
+SHA512 (reuse-tool-5.0.2.tar.gz) = 472048dcb16df330478727278de593e6e102fe224d7acd485666d3d2ceb49725426e008e1c116c41acea3c767de347cf5e4775c1471cb287c5d594860db75a5a
+Size (reuse-tool-5.0.2.tar.gz) = 398518 bytes
+SHA1 (patch-docs_conf.py) = 5616d9c3168e5e370788fb470b37a6b1b0556a01
diff --git a/reuse-tool/patches/patch-docs_conf.py b/reuse-tool/patches/patch-docs_conf.py
index 3598fbcddd..70551bed08 100644
--- a/reuse-tool/patches/patch-docs_conf.py
+++ b/reuse-tool/patches/patch-docs_conf.py
@@ -4,7 +4,7 @@ Disable "apidoc" (not required for building man pages).
 Disable "intersphinx_mapping" (wants do fetch stuff from network).
 pkgsrc-wip package for py-furo is broken (not required for building man pages).
 
---- docs/conf.py.orig	2024-07-08 11:58:05.000000000 +0000
+--- docs/conf.py.orig	2024-11-14 09:32:08.000000000 +0000
 +++ docs/conf.py
 @@ -52,29 +52,15 @@ extensions = [
      "sphinx.ext.intersphinx",
@@ -20,7 +20,7 @@ pkgsrc-wip package for py-furo is broken (not required for building man pages).
 -
 -apidoc_module_dir = str(ROOT_DIR / "src/reuse")
 -# apidoc_output_dir = "api"
--# apidoc_excluded_paths = []
+-apidoc_excluded_paths = ["cli"]
 -apidoc_separate_modules = True
 -apidoc_toc_file = False
 -apidoc_extra_args = ["--maxdepth", "2"]


Home | Main Index | Thread Index | Old Index