diff --git a/Cargo.toml b/Cargo.toml index b068412fe0..a79361f5e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,2 +1,3 @@ [workspace] members = ["rye"] +resolver = "1" diff --git a/rye/Cargo.toml b/rye/Cargo.toml index d084e789ef..24b3b7be43 100644 --- a/rye/Cargo.toml +++ b/rye/Cargo.toml @@ -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"] } diff --git a/rye/src/sources.rs b/rye/src/sources.rs index ce9e440ad0..e9b9fa105a 100644 --- a/rye/src/sources.rs +++ b/rye/src/sources.rs @@ -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")))); } diff --git a/rye/src/sync.rs b/rye/src/sync.rs index 5f967ab9a5..3444991f67 100644 --- a/rye/src/sync.rs +++ b/rye/src/sync.rs @@ -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, Error> { let entries = fs::read_dir(&lib_dir).context("read venv/lib/ path is fail")?;