Switch from vendored PubGrub to a fork #438
Merged
Conversation
This file contains 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
| @@ -48,6 +47,7 @@ once_cell = { version = "1.18.0" } | |||
| petgraph = { version = "0.6.4" } | |||
| platform-info = { version = "2.0.2" } | |||
| plist = { version = "1.6.0" } | |||
| pubgrub = { git = "https://github.com/zanieb/pubgrub", rev = "46f1214fe6b7886709a35d8d2f2c0e1b56433b26" } | |||
There was a problem hiding this comment.
I think we should probably tag this branch, and just add the tag as a comment, like we did for the parser. Though I'm extremely open to better ideas...
There was a problem hiding this comment.
Behold my suggestion :) astral-sh/pubgrub#2
I think this will work well without the overhead?
There was a problem hiding this comment.
I see no reason to comment with the tag since it should be trivial to find the tag for any commit?
charliermarsh
approved these changes
Nov 16, 2023
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.
A fork will let us stay up to date with the upstream while replaying our work on top of it.
I expect a similar workflow to the RustPython-Parser fork we maintained, except that I wrote an automation to create tags for each commit on the fork (astral-sh/pubgrub#2) so we do not need to manually tag and document each commit.
To update with the upstream:
mainbranch on top of the latest changes in upstream'sdevbranchmainbranch historymainin our forkSince we automatically tag each commit on the fork, we should never lose the commits that are dropped from
mainduring rebase.