mirror of https://github.com/astral-sh/uv
Switch from a git snapshot to released rust-netrc 1.1.2 (#8424)
<!-- Thank you for contributing to uv! To help us out with reviewing, please consider the following: - Does this pull request include a summary of the change? (See below.) - Does this pull request include a descriptive title? - Does this pull request include references to any relevant issues? --> ## Summary <!-- What's the purpose of the change? What does it do, and why? --> Before this PR (and since651fe6f4e6) `uv` depends on a git snapshot of `rust-netrc` at544f3890b6, with fixes from https://github.com/gribouille/netrc/pull/3 for https://github.com/astral-sh/uv/issues/8003. Since `rust-netrc` 0.1.2 was just released, and it includes those fixes – plus an additional [change to support `~`-expansion](ca0860c0a0) – `uv` can go back to depending on published crates from crates.io. ## Test Plan <!-- How was it tested? --> ``` $ cargo build $ cargo run python install $ cargo test ``` I get ``` ──────────────────────────────────────────────────────────────────────────────── ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ Snapshot Summary ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ Snapshot: sha Source: crates/uv/tests/it/build.rs:1454 ──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── Expression: snapshot ──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── -old snapshot +new results ────────────┬─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── 11 11 │ writing top-level names to src/project.egg-info/top_level.txt 12 12 │ writing manifest file 'src/project.egg-info/SOURCES.txt' 13 13 │ reading manifest file 'src/project.egg-info/SOURCES.txt' 14 14 │ writing manifest file 'src/project.egg-info/SOURCES.txt' 15 │+[CACHE_DIR]/builds-v0/[TMP]/pkg_resources.html 16 │+ import pkg_resources 15 17 │ running sdist 16 18 │ running egg_info 17 19 │ writing src/project.egg-info/PKG-INFO 18 20 │ writing dependency_links to src/project.egg-info/dependency_links.txt ┈┈┈┈┈┈┈┈┈┈┈┈┼┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈ 35 37 │ copying src/project.egg-info/top_level.txt -> project-0.1.0/src/project.egg-info 36 38 │ Writing project-0.1.0/setup.cfg 37 39 │ Creating tar archive 38 40 │ removing 'project-0.1.0' (and everything under it) 41 │+[CACHE_DIR]/builds-v0/[TMP]/pkg_resources.html 42 │+ import pkg_resources 39 43 │ Building wheel from source distribution... 40 44 │ running egg_info 41 45 │ writing src/project.egg-info/PKG-INFO 42 46 │ writing dependency_links to src/project.egg-info/dependency_links.txt 43 47 │ writing requirements to src/project.egg-info/requires.txt 44 48 │ writing top-level names to src/project.egg-info/top_level.txt 45 49 │ reading manifest file 'src/project.egg-info/SOURCES.txt' 46 50 │ writing manifest file 'src/project.egg-info/SOURCES.txt' 51 │+[CACHE_DIR]/builds-v0/[TMP]/pkg_resources.html 52 │+ import pkg_resources 47 53 │ running bdist_wheel 48 54 │ running build 49 55 │ running build_py 50 56 │ creating build ┈┈┈┈┈┈┈┈┈┈┈┈┼┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈┈ 73 79 │ adding 'project-0.1.0.dist-info/WHEEL' 74 80 │ adding 'project-0.1.0.dist-info/top_level.txt' 75 81 │ adding 'project-0.1.0.dist-info/RECORD' 76 82 │ removing build/bdist.linux-x86_64/wheel 83 │+[CACHE_DIR]/builds-v0/[TMP]/pkg_resources.html 84 │+ import pkg_resources 77 85 │ Successfully built dist/project-0.1.0.tar.gz and dist/project-0.1.0-py3-none-any.whl ────────────┴─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── To update snapshots run `cargo insta review` Stopped on the first failure. Run `cargo insta test` to run all snapshots. thread 'build::sha' panicked at /home/ben/.cargo/registry/src/index.crates.io-6f17d22bba15001f/insta-1.40.0/src/runtime.rs:548:9: snapshot assertion for 'sha' failed in line 1454 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace failures: build::sha test result: FAILED. 1299 passed; 1 failed; 4 ignored; 0 measured; 0 filtered out; finished in 101.18s error: test failed, to rerun pass `-p uv --test it` ``` The sole failure looks unrelated to me, and I can reproduce it on `main` (currentlye8b8daf0fb), so I conclude that it has nothing to do with this change.
This commit is contained in:
Ben Beasley
GitHub
parent
e8b8daf0fb
commit
40f842df09
|
|
@ -920,6 +920,15 @@ dependencies = [
|
|||
"dirs-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs"
|
||||
version = "5.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
|
||||
dependencies = [
|
||||
"dirs-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs-sys"
|
||||
version = "0.4.1"
|
||||
|
|
@ -2148,6 +2157,15 @@ version = "0.2.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
|
||||
|
||||
[[package]]
|
||||
name = "os_str_bytes"
|
||||
version = "6.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "overload"
|
||||
version = "0.1.1"
|
||||
|
|
@ -2937,9 +2955,11 @@ checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
|
|||
|
||||
[[package]]
|
||||
name = "rust-netrc"
|
||||
version = "0.1.1"
|
||||
source = "git+https://github.com/gribouille/netrc?rev=544f3890b621f0dc30fcefb4f804269c160ce2e9#544f3890b621f0dc30fcefb4f804269c160ce2e9"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7e98097f62769f92dbf95fb51f71c0a68ec18a4ee2e70e0d3e4f47ac005d63e9"
|
||||
dependencies = [
|
||||
"shellexpand",
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
|
|
@ -3248,6 +3268,17 @@ version = "0.1.5"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f"
|
||||
|
||||
[[package]]
|
||||
name = "shellexpand"
|
||||
version = "3.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b"
|
||||
dependencies = [
|
||||
"bstr",
|
||||
"dirs",
|
||||
"os_str_bytes",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "shlex"
|
||||
version = "1.3.0"
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ reqwest-middleware = { git = "https://github.com/TrueLayer/reqwest-middleware",
|
|||
reqwest-retry = { git = "https://github.com/TrueLayer/reqwest-middleware", rev = "d95ec5a99fcc9a4339e1850d40378bbfe55ab121" }
|
||||
rkyv = { version = "0.8.8", features = ["bytecheck"] }
|
||||
rmp-serde = { version = "1.3.0" }
|
||||
rust-netrc = { git = "https://github.com/gribouille/netrc", rev = "544f3890b621f0dc30fcefb4f804269c160ce2e9" }
|
||||
rust-netrc = { version = "0.1.2" }
|
||||
rustc-hash = { version = "2.0.0" }
|
||||
rustix = { version = "0.38.37", default-features = false, features = ["fs", "std"] }
|
||||
same-file = { version = "1.0.6" }
|
||||
|
|
|
|||
Loading…
Reference in New Issue