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

Relicense clippy to the Rust license #3269

Merged
merged 5 commits into from
Oct 6, 2018
Merged

Relicense clippy to the Rust license #3269

merged 5 commits into from
Oct 6, 2018

Conversation

Manishearth
Copy link
Member

See #2885, #3093

I've included documentation on the relicense process in case it ever becomes a problem.

r? @oli-obk @phansch

cc @rust-lang/dev-tools

@Manishearth Manishearth mentioned this pull request Oct 5, 2018
Closed
49 tasks
@Manishearth Manishearth closed this Oct 6, 2018
@Manishearth Manishearth reopened this Oct 6, 2018
@Manishearth
Copy link
Member Author

retriggering CI

phansch
phansch approved these changes Oct 6, 2018
View reviewed changes
Copy link
Member

@phansch phansch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

First time I'm involved in a relicensing, so I'm not sure if there's something specific to look out for.

I think we can get each of the screenshots down to ~100kb from currently ~500kb. I didn't check the size of every image, but assuming 100kb/image, in total that would be 1.1Mb instead of ~5Mb. (I took the first image, opened it in Krita, exported it to JPEG and set the quality to 5% before exporting)

etc/relicense/RELICENSE_DOCUMENTATION.md Outdated
- #3100 ([archive](http://web.archive.org/web/20181005184901/https://github.com/rust-lang-nursery/rust-clippy/issues/3100))
- #3230 ([archive](http://web.archive.org/web/20181005184903/https://github.com/rust-lang-nursery/rust-clippy/issues/3230))

The usernames of commentors on these issues can be found in relicense_comments.txt
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/commentor/commenter

LICENSE-APACHE

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it enough to have the licenses in these two files, because this sections mentions commenting in files?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, right.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And we needed this under MPL too, really, so it's good we relicensed this :)

@Manishearth
Copy link
Member Author

I tried convert -quality 5 foo.png foo.jpg and the file size was about 100kb but the files were really blurry and unreadable. Are you getting better results? If so, could you check those in?

@Manishearth
Copy link
Member Author

We can also upload these pngs to GitHub itself as an image?

@Manishearth Manishearth force-pushed the relicense branch 2 times, most recently from 86bceb6 to 69bb10c Compare October 6, 2018 16:24
@phansch
Copy link
Member

phansch commented Oct 6, 2018

Oh right.. Krita kept showing the original image and not the exported image. It's indeed very blurry.

We can also upload the screenshots to this PR inside a comment and link those, I think.

@Manishearth
Document relicensing process
8db2092
@Manishearth
Relicense clippy
ca437e8 
Documentation on relicensing in previous commit

Fixes #2885

Also fixes #3093, fixes #3094, fixes 3095, fixes #3096, fixes #3097, fixes #3098,
fixes #3099, fixes #3100, fixes #3230
@Manishearth
Add license header to Rust files
e9c025e
@Manishearth
Add license header to other files
23e5e24
@Manishearth
Copy link
Member Author

Manishearth commented Oct 6, 2018 •
edited
Loading

Screenshots (I linked to them directly):

issue-3093
issue-3094
issue-3095
issue-3096
issue-3097
issue-3098
issue-3099
issue-3100
issue-3230
pull-3195
pull-3251

@Manishearth
Copy link
Member Author

This seems ready?

@Manishearth
Copy link
Member Author

Oh, you approved it already. lol.

@Manishearth Manishearth merged commit 1e0729d into master Oct 6, 2018
@Manishearth
Copy link
Member Author

🎉

@Manishearth Manishearth mentioned this pull request Oct 6, 2018
Closed
30 tasks
@phansch
Copy link
Member

phansch commented Oct 6, 2018

🎉 🎉

@mcarton mcarton deleted the relicense branch October 6, 2018 19:10
@ordovicia
Copy link
Contributor

Lisence section on README has not updated yet.

@Manishearth
Copy link
Member Author

Manishearth commented Oct 7, 2018 via email

@mati865 mati865 mentioned this pull request Oct 3, 2019
Merged
bors added a commit that referenced this pull request Oct 3, 2019
@bors
Auto merge of #4616 - mati865:license, r=Manishearth
5ed118f 
Fix license in Cargo.toml files

Missed in #3269

changelog: none

r? @Manishearth
bors added a commit that referenced this pull request Oct 9, 2019
@bors
Auto merge of #4616 - mati865:license, r=Manishearth
db233b0 
Fix license in Cargo.toml files

Missed in #3269

changelog: none

r? @Manishearth
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@phansch phansch phansch approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Manishearth @phansch @ordovicia