Skip to content

Commit

Permalink
Fix tests and a warning
Browse files Browse the repository at this point in the history
  • Loading branch information
mitsuhiko committed Aug 27, 2023
1 parent 5d351f9 commit 2d20ae8
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
[workspace]
members = ["rye"]
resolver = "1"
2 changes: 1 addition & 1 deletion rye/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ hex = "0.4.3"
junction = "1.0.0"
bzip2 = "0.4.4"
zip = { version = "0.6.5", features = ["deflate"], default-features = false }
self-replace = "1.3.2"
self-replace = "1.3.5"
configparser = "3.0.2"
monotrail-utils = { git = "https://github.com/konstin/poc-monotrail", version = "0.0.1" }
python-pkginfo = { version = "0.5.6", features = ["serde"] }
Expand Down
2 changes: 1 addition & 1 deletion rye/src/sources.rs
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ fn test_get_download_url() {
let url = get_download_url(&"3.8.14".parse().unwrap(), "macos", "aarch64");
assert_eq!(url, Some((PythonVersion { kind: "cpython".into(), major: 3, minor: 8, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20221002/cpython-3.8.14%2B20221002-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("d17a3fcc161345efa2ec0b4ab9c9ed6c139d29128f2e34bb636338a484aa7b72"))));
let url = get_download_url(&"3.8".parse().unwrap(), "macos", "aarch64");
assert_eq!(url, Some((PythonVersion { kind: "cpython".into(), major: 3, minor: 8, patch: 16, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20230507/cpython-3.8.16%2B20230507-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("d2b0c70e9926b208ad49aa6835d199f9365a162c4e61f985bb56057501a50cf5"))));
assert_eq!(url, Some((PythonVersion { kind: "cpython".into(), major: 3, minor: 8, patch: 17, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20230826/cpython-3.8.17%2B20230826-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("d08a542bed35fc74ac6e8f6884c8aa29a77ff2f4ed04a06dcf91578dea622f9a"))));
let url = get_download_url(&"3".parse().unwrap(), "macos", "aarch64");
assert_eq!(url, Some((PythonVersion { kind: "cpython".into(), major: 3, minor: 11, patch: 3, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20230507/cpython-3.11.3%2B20230507-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("cd296d628ceebf55a78c7f6a7aed379eba9dbd72045d002e1c2c85af0d6f5049"))));
}
1 change: 1 addition & 0 deletions rye/src/sync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,7 @@ fn inject_tcl_config(venv: &Path, py_bin: &Path) -> Result<(), Error> {
}

// There is only one folder in the venv/lib folder. But in practice, only pypy will use this method in linux
#[cfg(unix)]
fn get_site_packages(lib_dir: PathBuf) -> Result<Option<PathBuf>, Error> {
let entries = fs::read_dir(&lib_dir).context("read venv/lib/ path is fail")?;

Expand Down

0 comments on commit 2d20ae8

Please sign in to comment.