Merge branch 'fsfe:main' into main

.github/pull_request_template.md

@@ -0,0 +1,18 @@
+<!--
+Before submitting a PR, please read CONTRIBUTING.md. Non-trivial changes should
+be discussed in an issue before committing to a PR.
+
+Please succinctly describe your changes.
+-->
+
+<!-- Next, let's do a check list. Remove what doesn't apply. -->
+
+- [ ] Added a change log entry in `changelog.d/<directory>/`.
+- [ ] Added self to copyright blurb of touched files.
+- [ ] Added self to `AUTHORS.rst`.
+- [ ] Wrote tests.
+- [ ] Documented my changes in `docs/man/` or elsewhere.
+- [ ] My changes do not contradict
+      [the current specification](https://reuse.software/spec/).
+- [x] I agree to license my contribution under the licenses indicated in the
+      changed files.

.github/workflows/jujutsu.yaml

@@ -0,0 +1,37 @@
+# SPDX-FileCopyrightText: 2023 Free Software Foundation Europe e.V.
+# SPDX-FileCopyrightText: 2024 Skyler Grey <sky@a.starrysky.fyi>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+name: Test with Jujutsu
+
+# These tests are run exclusively on the main branch to reduce CPU time wasted
+# on every single PR that very likely does not affect Jujutsu functionality.
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - "src/reuse/**.py"
+      - "tests/**.py"
+jobs:
+  test-jujutsu:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.x
+      - name: Install dependencies
+        run: |
+          pip install poetry~=1.3.0
+          poetry install --no-interaction --only main,test
+      - name: Set up Jujutsu
+        run: |
+          cargo install cargo-binstall
+          cargo binstall --strategies crate-meta-data jj-cli --no-confirm
+          export PATH=~/.cargo/bin:$PATH
+      - name: Run tests with pytest
+        run: |
+          poetry run pytest --cov=reuse

.readthedocs.yaml

@@ -11,9 +11,10 @@ build:
     python: "3.8"
   jobs:
     post_create_environment:
-      - pip install poetry
+      - python -m pip install poetry
     post_install:
-      - VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH poetry install --with docs
+      - VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH python -m poetry install --with
+        docs
 
 sphinx:
   configuration: docs/conf.py

AUTHORS.rst

@@ -16,118 +16,138 @@ Development Lead
 Contributors
 ------------
 
-- Sebastian Schuberth <schuberth@fsfe.org>
-
+- Linus Sehn <linus@fsfe.org>
 - Max Mehl <max.mehl@fsfe.org>
-
+- Nico Rikken <nico.rikken@fsfe.org>
+- Florian Snow <florian@familysnow.net>
+- Sebastian Schuberth <schuberth@fsfe.org>
+- Samuel Gaist <samuel.gaist@idiap.ch>
+- Diego Elio Pettenò <flameeyes@flameeyes.com>
 - Matija Šuklje <matija@suklje.name>
-
-- Greg Kroah-Hartman
-
-- Basil Peace
-
-- Keith Maxwell
-
-- Stefan Bakker <s.bakker777@gmail.com>
-
-- Kirill Elagin <kirelagin@gmail.com>
-
+- gallegonovato <fran-carro@hotmail.es>
+- Ihor Hordiichuk <igor_ck@outlook.com>
+- Liam Beguin <liambeguin@gmail.com>
+- J. Lavoie <j.lavoie@net-c.ca>
+- Anthony Loiseau <anthony.loiseau@allcircuits.com>
+- André Ockers <ao@fsfe.org>
+- OliBug <act-zebug@riseup.net>
+- Vincent Lequertier <vincent@fsfe.org>
+- pd <euklade@gmail.com>
+- Thomas Doczkal <doczkal@fsfe.org>
+- Tirifto <tirifto@posteo.cz>
+- 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>
+- David Alfonso <developer@davidalfonso.es>
+- Pietro Albini <pietro.albini@ferrous-systems.com>
+- Shun Sakai <sorairolake@protonmail.ch>
+- Jiří Podhorecký <j.podhorecky@volny.cz>
+- Korrat <korrat@protonmail.com>
+- Paul Spooren <mail@aparcar.org>
 - Tuomas Siipola <tuomas@zpl.fi>
-
-- Diego Elio Pettenò <flameeyes@flameeyes.com>
-
-- David Alfonso
-
-- Maximilian Dolling <mdolling@gfz-potsdam.de>
-
-- yoctocell
-
-- Tuomas Siipola
-
+- Wesley Schwengle <wesleys@opperschaap.net>
+- Chris Wesseling <chris.wesseling@cwi.nl>
+- Ethan Kerrick <kerrickethan@gmail.com>
+- Friedrich von Never <friedrich@fornever.me>
 - Gri-ffin <gameshunter359@gmail.com>
-
-- Nico Rikken <nico.rikken@fsfe.org>
-
-- Florian Snow <florian@familysnow.net>
-
-- Linus Sehn <linus@fsfe.org>
-
-- Yaman Qalieh
-
-- Pietro Albini <pietro.albini@ferrous-systems.com>
-
-- Matthias Riße
-
+- Matthias Riße <m.risse@fz-juelich.de>
+- Michael Weimann <mail@michael-weimann.eu>
+- Roberto Redradix <roberto@redradix.com>
+- Robin Vobruba <hoijui.quaero@gmail.com>
 - Stefan Hynek <stefan.hynek@uni-goettingen.de>
-
-- rajivsunar07
-
-- roberto-red <roberto@redradix.com>
-
-- Shun Sakai
-
-- Dirk Brömmel
-
-- Robin Vobruba
-
-- Markus Haug <korrat@proton.me>
-
-- Kevin Broch
-
-- Anthony Loiseau
-
-- Apteryks
-
-Translators
------------
-
-- Dutch:
-
-  + André Ockers <ao@fsfe.org>
-
-  + Carmen Bianca Bakker <carmenbianca@fsfe.org>
-
-- French:
-
-  + OliBug <act-zebug@riseup.net>
-
-  + Vincent Lequertier <vincent@fsfe.org>
-
-- Galician:
-
-  + pd <euklade@gmail.com>
-
-- German:
-
-  + Max Mehl <max.mehl@fsfe.org>
-
-  + Thomas Doczkal <doczkal@fsfe.org>
-
-- Esperanto:
-
-  + Carmen Bianca Bakker <carmenbianca@fsfe.org>
-
-  + Tirifto <tirifto@posteo.cz>
-
-- Italian:
-
-  + Luca Bonissi <lucabon@fsfe.org>
-
-- Portuguese:
-
-  + José Vieira <jvieira33@sapo.pt>
-
-- Spanish:
-
-  + flow <adolflow@sindominio.net>
-
-  + pd <euklade@gmail.com>
-
-  + Roberto Bauglir <bauglir@fsfe.org>
-
-- Turkish:
-
-  + T. E. Kalayci <tekrei@member.fsf.org>
-
+- sudorook <daemon@nullcodon.com>
+- Adam Spiers <reuse-tool@adamspiers.org>
+- Ajinkya Patil <ajinkyarangnathpatil@gmail.com>
+- FeRD (Frank Dana) <ferdnyc@gmail.com>
+- Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+- Hugo Osvaldo Barrera <hugo@whynothugo.nl>
+- Jakelyst <86010593+Jakelyst@users.noreply.github.com>
+- Jiri Vlasak <jiri.hubacek@gmail.com>
+- Johannes Zarl-Zierl <johannes@zarl-zierl.at>
+- 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>
+- Thomas Bach <thomas.bach@email.de>
+- Walter Paulo <polo@tictips.net>
+- Wolfgang Traylor <wolfgang.traylor@senckenberg.de>
+- Xinglu Chen <public@yoctocell.xyz>
+- ethulhu <ethel@ethulhu.co.uk>
+- gfbdrgng <hnaofegnp@hldrive.com>
+- 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>
+- BigBlueHat <byoung@bigbluehat.com>
+- David Kleuker <davidak@users.noreply.github.com>
+- David Marzal <2069735+Marzal@users.noreply.github.com>
+- Dimitris Apostolou <dimitris.apostolou@icloud.com>
+- Dirk Brömmel <dbroemmel@users.noreply.github.com>
+- Dmitry Bogatov <KAction@disroot.org>
+- FestplattenSchnitzel <festplatte.schnitzel@posteo.de>
+- George Rawlinson <george@rawlinson.net.nz>
+- Gert van Dijk <github@gertvandijk.nl>
+- Gerwin Klein <gerwin.klein@data61.csiro.au>
+- Hanspeter Portner <dev@open-music-kontrollers.ch>
+- Hotripak <hotr1pak@gmail.com>
+- Jan Staněk <jstanek@redhat.com>
+- Jason Yundt <swagfortress@gmail.com>
+- Johannes Keyser <joke@fsfe.org>
+- Jon Burdo <jon@jonburdo.com>
+- Josef Andersson <josef.andersson@gmail.com>
+- José Vieira <jvieira33@sapo.pt>
+- Kevin Meagher <11620178+kjmeagher@users.noreply.github.com>
+- Lars Francke <lars.francke@stackable.de>
+- Libor Pechacek <lpechacek@gmx.com>
+- Léo de Souza <dev@leodesouza.net>
+- Marius Brehler <marius.brehler@iml.fraunhofer.de>
+- Mark A. Tsuchida <marktsuchida@gmail.com>
+- Markus Vieth <vieth@uni-mainz.de>
+- Mathias Dannesbo <45558062+md-magenta@users.noreply.github.com>
+- Miro Hrončok <miro@hroncok.cz>
+- Monaco <monaco@usp.br>
+- Nicolás Alvarez <nicolas.alvarez@gmail.com>
+- Nir Soffer <nsoffer@redhat.com>
+- 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>
+- 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>