Merge pull request #4 from rivosinc/dev/kbroch/merge-upstream2

merge with upstream
rivosinc · Jan 30, 2025 · 16db23c · 16db23c
2 parents 476d7ad + e6d6b3d
commit 16db23c
Show file tree

Hide file tree

Showing 112 changed files with 20,733 additions and 16,389 deletions.
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -23,7 +23,7 @@ jobs:
   # ===========================================================================
   docker_test:
     name: Test the Docker images
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v2
       # Dockerfile
@@ -46,7 +46,7 @@ jobs:
   # ===========================================================================
   docker_push_tag:
     name: Push Docker images for tags to Docker Hub
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     # Depends on successful Docker build/test
     needs:
       - docker_test

diff --git a/.github/workflows/gettext.yaml b/.github/workflows/gettext.yaml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   create-pot:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v3
         with:
@@ -23,8 +23,11 @@ jobs:
           # exception to the branch protection, so we'll use that account's
           # token to push to the main branch.
           token: ${{ secrets.FSFE_SYSTEM_TOKEN }}
-      - name: Install gettext and wlc
-        run: sudo apt-get install -y gettext wlc
+      - name: Install poetry, gettext, and wlc
+        run: sudo apt-get install -y python3-poetry gettext wlc
+      # We mostly install reuse to install the click dependency.
+      - name: Install reuse
+        run: poetry install --no-interaction --only main
       - name: Lock Weblate
         run: |
           wlc --url https://hosted.weblate.org/api/ --key ${{secrets.WEBLATE_KEY }} lock fsfe/reuse-tool
@@ -34,14 +37,14 @@ jobs:
       - name: Pull Weblate translations
         run: git pull origin main
       - name: Create .pot file
-        run: make create-pot
+        run: poetry run make create-pot
       # Normally, POT-Creation-Date changes in two locations. Check if the diff
       # includes more than just those two lines.
       - name: Check if sufficient lines were changed
         id: diff
         run:
-          echo "changed=$(git diff -U0 | grep '^[+|-][^+|-]' | grep -Ev
-          '^[+-]("POT-Creation-Date|#:)' | wc -l)" >> $GITHUB_OUTPUT
+          echo "changed=$(git diff -U0 po/reuse.pot | grep '^[+|-][^+|-]' | grep
+          -Ev '^[+-]("POT-Creation-Date|#:)' | wc -l)" >> $GITHUB_OUTPUT
       - name: Commit and push updated reuse.pot
         if: ${{ steps.diff.outputs.changed != '0' }}
         run: |

diff --git a/.github/workflows/jujutsu.yaml b/.github/workflows/jujutsu.yaml
@@ -16,7 +16,7 @@ on:
       - "tests/**.py"
 jobs:
   test-jujutsu:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python

diff --git a/.github/workflows/license_list_up_to_date.yaml b/.github/workflows/license_list_up_to_date.yaml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   license-list-up-to-date:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/pijul.yaml b/.github/workflows/pijul.yaml
@@ -16,7 +16,7 @@ on:
       - "tests/**.py"
 jobs:
   test-pijul:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -20,12 +20,12 @@ jobs:
       # do not abort the whole test job if one combination in the matrix fails
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.12"]
-        os: [ubuntu-22.04]
+        python-version: ["3.9", "3.13"]
+        os: [ubuntu-24.04]
         include:
-          - python-version: "3.8"
+          - python-version: "3.9"
             os: macos-latest
-          - python-version: "3.8"
+          - python-version: "3.9"
             os: windows-latest
 
     steps:
@@ -37,19 +37,19 @@ jobs:
       - name: Install dependencies
         run: |
           pip install poetry~=1.3.0
-          poetry install --no-interaction --only main,test
+          poetry install --no-interaction --only main,test --all-extras
       - name: Run tests with pytest
         run: |
           poetry run pytest --cov=reuse
 
   pylint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Install dependencies
         run: |
           pip install poetry~=1.3.0
@@ -59,13 +59,13 @@ jobs:
           poetry run pylint src/reuse/ tests/
 
   black:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Install dependencies
         run: |
           pip install poetry~=1.3.0
@@ -76,13 +76,13 @@ jobs:
           poetry run black --check .
 
   mypy:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Install dependencies
         run: |
           pip install poetry~=1.3.0
@@ -92,7 +92,7 @@ jobs:
           poetry run mypy
 
   prettier:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container: node:latest
     steps:
       - uses: actions/checkout@v2
@@ -102,13 +102,13 @@ jobs:
         run: npx prettier --check .
 
   reuse:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Install dependencies
         run: |
           pip install poetry~=1.3.0
@@ -117,13 +117,13 @@ jobs:
         run: make reuse
 
   docs:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Install dependencies
         run: |
           pip install poetry~=1.3.0

diff --git a/.github/workflows/third_party_lint.yaml b/.github/workflows/third_party_lint.yaml
@@ -18,7 +18,7 @@ on:
 
 jobs:
   third-party-lint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       # do not abort the whole test job if one combination in the matrix fails
       fail-fast: false
@@ -33,7 +33,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Install dependencies
         run: |
           pip install poetry~=1.3.0
@@ -45,7 +45,7 @@ jobs:
           matrix.repo }}
 
   third-party-lint-expect-failure:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       # do not abort the whole test job if one combination in the matrix fails
       fail-fast: false
@@ -56,7 +56,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Install dependencies
         run: |
           pip install poetry~=1.3.0

diff --git a/.gitignore b/.gitignore
@@ -147,7 +147,6 @@ dmypy.json
 
 # End of https://www.gitignore.io/api/linux,python
 
-po/reuse.pot
 *.mo
 docs/api/
 docs/history.md

diff --git a/.pre-commit-hooks.yaml b/.pre-commit-hooks.yaml
@@ -3,14 +3,22 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 - id: reuse
-  name: reuse
+  name: reuse lint
   entry: reuse
   args: ["lint"]
   language: python
   pass_filenames: false
   description:
-    "Lint the project directory for compliance with the REUSE Specification"
-  language_version: python3
+    "Lint the project directory for compliance with the REUSE Specification."
+
+- id: reuse-lint-file
+  name: reuse lint-file
+  entry: reuse
+  args: ["lint-file"]
+  language: python
+  description:
+    "Lint the changed files for compliance with the REUSE Specification."
+
 - id: reuse-annotate
   name: reuse-annotate
   entry: "reuse annotate"

diff --git a/.pylintrc b/.pylintrc
@@ -11,7 +11,9 @@ jobs=0
 
 disable=duplicate-code,
          logging-fstring-interpolation,
-         implicit-str-concat
+         implicit-str-concat,
+         inconsistent-quotes,
+         too-many-positional-arguments
 enable=useless-suppression
 
 [REPORTS]

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -8,7 +8,7 @@ build:
   # This should mirror the configuration in ./.github/workflows/test.yaml
   os: ubuntu-22.04
   tools:
-    python: "3.8"
+    python: "3.9"
   jobs:
     post_create_environment:
       - python -m pip install poetry

diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -38,9 +38,7 @@ Contributors
 - Luca Bonissi <lucabon@fsfe.org>
 - José Vieira <jvieira33@sapo.pt>
 - flow <adolflow@sindominio.net>
-- pd <euklade@gmail.com>
 - Roberto Bauglir <bauglir@fsfe.org>
-- T. E. Kalayci <tekrei@member.fsf.org>
 - John Mulligan <jmulligan@redhat.com>
 - Kevin Broch <kbroch@rivosinc.com>
 - Benoit Rolandeau <benoit.rolandeau@allcircuits.com>
@@ -73,14 +71,12 @@ Contributors
 - Keith Maxwell <keith.maxwell@gmail.com>
 - Kirill Elagin <kirelagin@gmail.com>
 - Kristoffer Grundström <swedishsailfishosuser@tutanota.com>
-- Luca Bonissi <lucabon@fsfe.org>
 - Manlio Perillo <manlio.perillo@gmail.com>
 - Mauro Aranda <maurooaranda@gmail.com>
 - Maxim Cournoyer <maxim.cournoyer@gmail.com>
 - Mikko Piuhola <mikkopiu@users.noreply.github.com>
 - Raniere Silva <Raniere.CostadaSilva@gesis.org>
 - Robert Cohn <rscohn2@gmail.com>
-- Sebastian Schuberth <sschuberth@fsfe.org>
 - Simon Schliesky <p-github@schliesky.com>
 - Stefan Bakker <s.bakker777@gmail.com>
 - T. E. Kalayci <tekrei@member.fsf.org>
@@ -93,12 +89,9 @@ Contributors
 - mdolling <mdolling@gfz-potsdam.de>
 - psykose <alice@ayaya.dev>
 - Adrián Chaves <adrian@chaves.io>
-- Alvar <8402811+oxzi@users.noreply.github.com>
 - Alvar Penning <post@0x21.biz>
 - Aminda Suomalainen <suomalainen+git@mikaela.info>
 - Andrey Bienkowski <hexagon-recursion@posteo.net>
-- André Ockers <ao@fsfe.org>
-- Anthony Loiseau <anthony@loiseau.fr>
 - Arnout Engelen <arnout@bzzt.net>
 - Basil Peace <grv87@yandex.ru>
 - Benedikt Fein <fein@fim.uni-passau.de>
@@ -119,7 +112,7 @@ Contributors
 - Johannes Keyser <joke@fsfe.org>
 - Jon Burdo <jon@jonburdo.com>
 - Josef Andersson <josef.andersson@gmail.com>
-- José Vieira <jvieira33@sapo.pt>
+- Kerry McAdams <github@klmcadams>
 - Kevin Meagher <11620178+kjmeagher@users.noreply.github.com>
 - Lars Francke <lars.francke@stackable.de>
 - Libor Pechacek <lpechacek@gmx.com>
@@ -135,19 +128,19 @@ Contributors
 - Olaf Meeuwissen <paddy-hack@member.fsf.org>
 - Pep <socialkuma@hotmail.com>
 - Philipp Zabel <philipp.zabel@gmail.com>
-- Roberto Bauglir <bauglir@fsfe.org>
 - Romain Tartière <romain@blogreen.org>
 - Ryan Schmidt <git@ryandesign.com>
 - Sebastian Crane <seabass@fsfe.org>
-- T. E. Kalaycı <tekrei@tutanota.com>
+- Sebastien Morais <github@SMoraisAnsys>
 - Vishesh Handa <me@vhanda.in>
 - Vlad-Stefan Harbuz <vlad@vladh.net>
 - Yaman Qalieh <ybq987@gmail.com>
 - criadoperez <alejandro@criadoperez.com>
-- ethulhu <eth.morgan@gmail.com>
 - nautilusx <translate@disroot.org>
 - pukkamustard <pukkamustard@users.noreply.github.com>
 - rajivsunar07 <56905029+rajivsunar07@users.noreply.github.com>
 - Сергій <sergiy.goncharuk.1@gmail.com>
 - Mersho <code.rezaei@gmail.com>
 - Skyler Grey <sky@a.starrysky.fyi>
+- Emil Velikov <emil.l.velikov@gmail.com>
+- Linnea Gräf <nea@nea.moe>