Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upUpgrade python-patch to the latest upstream release #2284
Merged
Conversation
aa21265
to
1054a86
This fixes brave/brave-browser#3932. The version we were using was an svn import of `code.google.com` to GitHub but both `code.google.com` and the importer are now defunct: http://piotr.gabryjeluk.pl/blog:closing-svn2github The upstream developer, according to the PyPI project page (https://pypi.org/project/patch/), has moved to a dedicated repo on GitHub: https://github.com/techtonik/python-patch I picked the latest upstream release (1.16): https://github.com/techtonik/python-patch/releases/tag/1.16 techtonik/python-patch@2148d54 as the commit to pin our dependency to since the only commits on master after that are related to a part of the package that we don't use and that has been moved to another package: techtonik/python-patch@76f0205
1054a86
to
7ea4713
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.
fmarier commentedApr 19, 2019
•
edited
This fixes brave/brave-browser#3932.
The version we were using was an svn import of
code.google.comto GitHub but bothcode.google.comand the importer are now defunct:http://piotr.gabryjeluk.pl/blog:closing-svn2github
The upstream developer, according to the PyPI project page (https://pypi.org/project/patch/), has moved to a dedicated repo on GitHub:
https://github.com/techtonik/python-patch
I picked the latest upstream release (1.16):
https://github.com/techtonik/python-patch/releases/tag/1.16
techtonik/python-patch@2148d54
as the commit to pin our dependency to since the only commits on master after that are related to a part of the package that we don't use and that has been moved to another package:
techtonik/python-patch@76f0205
Submitter Checklist:
npm test brave_unit_tests && npm test brave_browser_tests && npm run test-security) onnpm run lint)git rebase master(if needed).git rebase -ito squash commits (if needed).Test Plan:
To test that the new version gives me the same output with our current patches, I did the following under the old version:
which gave me the following diff in
src/brave: https://gist.github.com/fmarier/7b127e6d2d6b2b6076f98d81202defe2Then I applied and updated the patches again:
and got the following diff: https://gist.github.com/fmarier/2899dfd116a02a17fa31a1131825f89c
which is in line with this known bug (also reported upstream).
I ran
gclient syncand then tested applying the patches again.I got the same results as above in the first and second runs.
Reviewer Checklist:
After-merge Checklist:
changes has landed on.