Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Convert .reuse/dep5 to REUSE.toml. #929

Merged
merged 4 commits into from
Jul 9, 2024
Merged

Convert .reuse/dep5 to REUSE.toml. #929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15fbdfe
Convert dep5 to REUSE.toml.
MarkCallow Jul 8, 2024
1376fd9
Remove --suppress-deprecation.
MarkCallow Jul 8, 2024
d876a85
Remove workaround for reuse 4.0.2 issue.
MarkCallow Jul 9, 2024
84687ef
Correct a comment.
MarkCallow Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
223 changes: 0 additions & 223 deletions .reuse/dep5
View file
Open in desktop

This file was deleted.

10 changes: 2 additions & 8 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,14 +213,8 @@ install:
if [ "$CHECK_REUSE" = "YES" -o "$CHECK_REUSE" = "ONLY" ]; then
set -e # because the if below swallows a bad exit status.
# reuse available via `apt install reuse` is very old: 0.14.0.
# Therefore install via pip. Version today, 2024.7.7, is 4.0.2.
# Therefore install via pip. Version today, 2024.7.9, is 4.0.3.
pip3 install reuse
# 4.0.2's version specifier, attrs>=21.1, is too relaxed. reuse fails
# with ModuleNotFound for attrs. 21.2 is installed in the runner.
# It needs a more recent attrs. As of 2.24.7.7 this upgrades to 23.2
# and reuse works. Watch https://github.com/fsfe/reuse-tool/issues/1039.
# When fixed remove this upgrade line.
pip3 install --upgrade attrs
set +e
fi
if [ "$CHECK_REUSE" != "ONLY" -a "$CHECK_MKVK" != "ONLY" -a "$WASM_BUILD" != "YES" ]; then
Expand Down Expand Up @@ -282,7 +276,7 @@ script:
linux)
if [ "$CHECK_REUSE" = "YES" -o "$CHECK_REUSE" = "ONLY" ]; then
echo "Calling reuse lint."
reuse --suppress-deprecation lint
reuse lint
fi
if [ "$CHECK_REUSE" != "ONLY" -a "$CHECK_MKVK" != "ONLY" ]; then
if [ "$WASM_BUILD" = "YES" ]; then
Expand Down
Loading
Loading