Use reuse tool 4.0 #127923
Merged
Use reuse tool 4.0 #127923
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
) Updated requirements file ) Ran `reuse convert-dep5` to switch to new file format
Kobzol
reviewed
Jul 18, 2024
There was a problem hiding this comment.
This is great, thanks for working on it! I saw that you already discussed this with Pietro on the Ferrocene repo, and he is the author of the original issue, so he might want to bless this.
I cross-checked the TOML file with the original reuse file, everything looks fine. So apart from one nit (left a comment) LGTM.
This comment has been minimized.
This comment has been minimized.
) brew install [email protected] ) python3.10 -m venv /tmp/myenv ) source /tmp/myenv/bin/activate ) pip install pip-tools ) /tmp/myenv/bin/pip-compile --allow-unsafe --generate-hashes reuse-requirements.in
Also remove to licenses we no longer need, and given REUSE.toml reads some basic idea of what it's about.
|
Can you also revert c6eb03b? With r=me otherwise |
11 tasks
Now that we have reuse-tool 4.0, we no longer need to massage the JSON license data to collapse LLVM into a single copyright notice and license - reuse-tool can do it for us using an annotation in REUSE.toml. This effectively reverts c6eb03b.
|
That change has now been removed. |
|
@bors r+ |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 22, 2024
Rollup of 9 pull requests Successful merges: - rust-lang#117932 (Correct rustdoc section where we talk about rustdoc emitting errors on invalid code) - rust-lang#125990 (Rename `deprecated_safe` lint to `deprecated_safe_2024`) - rust-lang#127506 (rustc_target: add known safe s390x target features) - rust-lang#127820 (Rewrite and rename `issue-14698`. `issue-33329` and `issue-107094` `run-make` tests to rmake or ui) - rust-lang#127923 (Use reuse tool 4.0) - rust-lang#128008 (Start using `#[diagnostic::do_not_recommend]` in the standard library) - rust-lang#128036 (add more tests) - rust-lang#128051 (rustdoc: revert spacing change in item-table) - rust-lang#128059 (Add regression test for items list size (rust-lang#128023)) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 22, 2024
Rollup merge of rust-lang#127923 - ferrocene:use-reuse-tool-4.0, r=pietroalbini Use reuse tool 4.0 This change upgrades us to reuse-tool 4.0.3, which has a new TOML format configuration instead of the old `.reuse/dep5` Debian-style file. * Updated requirements file to install reuse-4.0.3 * Ran `reuse convert-dep5` to switch to new file format * Switched over to `override` so the `REUSE.toml` file takes precedence over whatever random Copyright strings `reuse` finds in the source tree. Should fix rust-lang#127361
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change upgrades us to reuse-tool 4.0.3, which has a new TOML format configuration instead of the old
.reuse/dep5Debian-style file.reuse convert-dep5to switch to new file formatoverrideso theREUSE.tomlfile takes precedence over whatever random Copyright stringsreusefinds in the source tree.Should fix #127361