Skip to content

Commit 832058d

Browse files
authored
Switch from vendored PubGrub to a fork (#438)
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: - Rebase our fork's `main` branch on top of the latest changes in upstream's `dev` branch - Force push, overwriting our `main` branch history - Change the commit hash here to the last commit on `main` in our fork Since we automatically tag each commit on the fork, we should never lose the commits that are dropped from `main` during rebase.
1 parent e41ec12 commit 832058d

38 files changed

+4
-11769
lines changed

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[workspace]
22
members = ["crates/*"]
3-
exclude = ["vendor/pubgrub"]
43
resolver = "2"
54

65
[workspace.package]
@@ -49,6 +48,7 @@ once_cell = { version = "1.18.0" }
4948
petgraph = { version = "0.6.4" }
5049
platform-info = { version = "2.0.2" }
5150
plist = { version = "1.6.0" }
51+
pubgrub = { git = "https://github.com/zanieb/pubgrub", rev = "46f1214fe6b7886709a35d8d2f2c0e1b56433b26" }
5252
pyproject-toml = { version = "0.8.0" }
5353
rand = { version = "0.8.5" }
5454
rayon = { version = "1.8.0" }

crates/puffin-cli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ pep440_rs = { path = "../pep440-rs" }
2020
pep508_rs = { path = "../pep508-rs" }
2121
platform-host = { path = "../platform-host" }
2222
platform-tags = { path = "../platform-tags" }
23-
pubgrub = { path = "../../vendor/pubgrub" }
2423
puffin-client = { path = "../puffin-client" }
2524
puffin-dispatch = { path = "../puffin-dispatch" }
2625
puffin-distribution = { path = "../puffin-distribution" }
@@ -45,6 +44,7 @@ futures = { workspace = true }
4544
indicatif = { workspace = true }
4645
itertools = { workspace = true }
4746
miette = { workspace = true, features = ["fancy"] }
47+
pubgrub = { workspace = true }
4848
pyproject-toml = { workspace = true }
4949
tempfile = { workspace = true }
5050
thiserror = { workspace = true }

crates/puffin-resolver/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ pep440_rs = { path = "../pep440-rs" }
1616
pep508_rs = { path = "../pep508-rs" }
1717
platform-host = { path = "../platform-host" }
1818
platform-tags = { path = "../platform-tags" }
19-
pubgrub = { path = "../../vendor/pubgrub" }
2019
puffin-cache = { path = "../puffin-cache" }
2120
puffin-client = { path = "../puffin-client" }
2221
puffin-distribution = { path = "../puffin-distribution" }
@@ -37,6 +36,7 @@ fxhash = { workspace = true }
3736
itertools = { workspace = true }
3837
once_cell = { workspace = true }
3938
petgraph = { workspace = true }
39+
pubgrub = { workspace = true }
4040
tempfile = { workspace = true }
4141
thiserror = { workspace = true }
4242
tokio = { workspace = true }

vendor/pubgrub/CHANGELOG.md

Lines changed: 0 additions & 170 deletions
This file was deleted.

vendor/pubgrub/Cargo.toml

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)