Merge branch 'main' into fix-git-submodules

.github/workflows/test.yaml

@@ -57,9 +57,9 @@ jobs:
         run: |
           pip install poetry
           poetry install --no-interaction
-      - name: Lint with PyLint
+      - name: Lint with Pylint
         run: |
-          poetry run pylint src/reuse tests/*.py
+          poetry run pylint src/reuse/ tests/
 
   black:
     runs-on: ubuntu-20.04

.pylintrc

@@ -9,7 +9,7 @@ jobs=0
 
 [MESSAGES CONTROL]
 
-disable=R0801,
+disable=duplicate-code,
          logging-fstring-interpolation,
          implicit-str-concat
 enable=useless-suppression

AUTHORS.rst

@@ -60,6 +60,8 @@ Contributors
 
 - Stefan Hynek <stefan.hynek@uni-goettingen.de>
 
+- roberto-red <roberto@redradix.com>
+
 - Matthias Riße
 
 Translators

CHANGELOG.md

@@ -1,6 +1,7 @@
 <!--
 SPDX-FileCopyrightText: 2017 Free Software Foundation Europe e.V. <https://fsfe.org>
 SPDX-FileCopyrightText: © 2020 Liferay, Inc. <https://liferay.com>
+SPDX-FileCopyrightText: 2023 DB Systel GmbH
 
 SPDX-License-Identifier: CC-BY-SA-4.0
 -->
@@ -17,7 +18,9 @@ Every release contains the following sections:
 - `Fixed` for any bug fixes.
 - `Security` in case of vulnerabilities.
 
-The versions follow [semantic versioning](https://semver.org).
+The versions follow [semantic versioning](https://semver.org) for the `reuse`
+CLI command and its behaviour. There are no guarantees of stability for the
+`reuse` Python library.
 
 <!--
 ## Unreleased - YYYY-MM-DD
@@ -45,12 +48,18 @@ The versions follow [semantic versioning](https://semver.org).
   - CommonJS (`.cjs`) (#632)
   - Qt .pro (`.pro`) (#632)
   - Textile (`.textile`) (#712)
+  - Svelte components (`.svelte`)
 - More files are recognised:
   - Clang format (`.clang-format`) (#632)
+  - Browserslist config (`.browserslist`)
+  - Prettier config (`.prettierrc`) and ignored files (`.prettierignore`)
 - Added loglevel argument to pytest and skip one test if loglevel is too high
   (#645).
 - `--add-license-concluded`, `--creator-person`, and `--creator-organization`
   added to `reuse spdx`. (#623)
+- Additional license metadata for the Python package has been added. The actual
+  SPDX license expression remains the same:
+  `Apache-2.0 AND CC0-1.0 AND CC-BY-SA-4.0 AND GPL-3.0-or-later`. (#733)
 
 ### Changed
 
@@ -61,6 +70,7 @@ The versions follow [semantic versioning](https://semver.org).
   or old setups", which "have the submodule's git directory inside the submodule
   instead of embedded into the superproject's git directory". (#687)
 - Bumped SPDX license list to v3.20. (#692)
+- Sphinx documentation: Switched from RTD theme to Furo. (#673, #716)
 
 ### Deprecated
 
@@ -75,6 +85,9 @@ The versions follow [semantic versioning](https://semver.org).
 - Fixed a compatibility issue where reuse could not be installed (built) if
   gettext is not installed. (#691)
 - Translations are available in Docker images. (#701)
+- Marked the `/data` directory in Docker containers as safe in Git, preventing
+  errors related to linting Git repositories. (#720)
+- Repaired error when using Galician translations. (#719)
 
 ### Security
 

CONTRIBUTING.md

@@ -53,6 +53,15 @@ Next, you'll find the following commands handy:
 - `poetry run pylint src`
 - `make docs`
 
+## Development conventions
+
+### Poetry
+
+Because our downstreams may not have a very recent version of Poetry, we should
+target `poetry-core~=1.0.0` and `poetry~=1.1.0` when interacting with Poetry,
+especially when generating the `poetry.lock` file. You can
+`pip install poetry~=1.1.0` to ascertain that you always get this right.
+
 ## Release checklist
 
 - Verify changelog

Makefile

@@ -52,7 +52,7 @@ reuse: dist ## check with self
 
 .PHONY: docs
 docs: ## generate Sphinx HTML documentation, including API docs
-	poetry export --with dev --without-hashes >docs/requirements.txt
+	poetry export --dev --without-hashes >docs/requirements.txt
 	$(MAKE) -C docs html
 
 .PHONY: docs-ci

po/reuse.pot

@@ -9,7 +9,7 @@ msgstr ""
 "#-#-#-#-#  reuse.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-06 13:27+0000\n"
+"POT-Creation-Date: 2023-04-24 08:11+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "#-#-#-#-#  argparse.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-06 13:27+0000\n"
+"POT-Creation-Date: 2023-04-24 08:11+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -583,40 +583,41 @@ msgstr ""
 msgid "prevents output"
 msgstr ""
 
-#: src/reuse/project.py:66
-msgid "could not find supported VCS"
+#: src/reuse/project.py:68
+msgid ""
+"project is not a VCS repository or required VCS software is not installed"
 msgstr ""
 
-#: src/reuse/project.py:157
+#: src/reuse/project.py:162
 #, python-brace-format
 msgid "'{path}' covered by .reuse/dep5"
 msgstr ""
 
-#: src/reuse/project.py:178
+#: src/reuse/project.py:183
 #, python-brace-format
 msgid ""
 "'{path}' holds an SPDX expression that cannot be parsed, skipping the file"
 msgstr ""
 
-#: src/reuse/project.py:251
+#: src/reuse/project.py:256
 msgid ".reuse/dep5 has syntax errors"
 msgstr ""
 
-#: src/reuse/project.py:253
+#: src/reuse/project.py:258
 msgid ".reuse/dep5 could not be parsed as utf-8"
 msgstr ""
 
-#: src/reuse/project.py:279
+#: src/reuse/project.py:284
 #, python-brace-format
 msgid "determining identifier of '{path}'"
 msgstr ""
 
-#: src/reuse/project.py:287
+#: src/reuse/project.py:292
 #, python-brace-format
 msgid "{path} does not have a file extension"
 msgstr ""
 
-#: src/reuse/project.py:297
+#: src/reuse/project.py:302
 #, python-brace-format
 msgid ""
 "Could not resolve SPDX License Identifier of {path}, resolving to "
@@ -625,7 +626,7 @@ msgid ""
 "file extension."
 msgstr ""
 
-#: src/reuse/project.py:309
+#: src/reuse/project.py:314
 #, python-brace-format
 msgid ""
 "{identifier} is the SPDX License Identifier of both {path} and {other_path}"