From 1ce72f2531e4cf936b9098cf31d042f505daeadc Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Thu, 25 Jul 2024 16:39:47 -0400 Subject: [PATCH 01/19] Always write `--index-url` before `--extra-index-url` (#1278) ## Summary Closes https://github.com/astral-sh/rye/issues/1012. --- rye/src/cli/add.rs | 2 +- rye/src/cli/rye.rs | 2 +- rye/src/installer.rs | 4 ++-- rye/src/pyproject.rs | 47 +++++++++++++++++++++++++++++--------------- 4 files changed, 35 insertions(+), 20 deletions(-) diff --git a/rye/src/cli/add.rs b/rye/src/cli/add.rs index 9fa56f2ad2..fc538b5b91 100644 --- a/rye/src/cli/add.rs +++ b/rye/src/cli/add.rs @@ -445,7 +445,7 @@ fn find_best_matches_with_unearth( Some(ver) => ver.format_simple(), None => "".into(), }) - .arg(&format_requirement(requirement).to_string()) + .arg(format_requirement(requirement).to_string()) .arg(serde_json::to_string(&sources)?); if pre { unearth.arg("--pre"); diff --git a/rye/src/cli/rye.rs b/rye/src/cli/rye.rs index b744bb0b7c..e1891297d7 100644 --- a/rye/src/cli/rye.rs +++ b/rye/src/cli/rye.rs @@ -454,7 +454,7 @@ fn uninstall(args: UninstallCommand) -> Result<(), Error> { let shim_dir = app_dir.join("shims"); if let Ok(dir) = shim_dir.read_dir() { for entry in dir.flatten() { - fs::remove_file(&entry.path()).ok(); + fs::remove_file(entry.path()).ok(); } } diff --git a/rye/src/installer.rs b/rye/src/installer.rs index 55fd8f4e51..d34fa9d60c 100644 --- a/rye/src/installer.rs +++ b/rye/src/installer.rs @@ -180,7 +180,7 @@ pub fn install( } cmd.env("PYTHONWARNINGS", "ignore"); } - cmd.arg("--").arg(&requirement.to_string()); + cmd.arg("--").arg(requirement.to_string()); // we don't support versions below 3.7, but for 3.7 we need importlib-metadata // to be installed @@ -410,7 +410,7 @@ fn uninstall_helper(target_venv_path: &Path, shim_dir: &Path) -> Result<(), Erro let script = script?; if let Some(base_name) = script.path().file_name() { let shim_path = shim_dir.join(base_name); - if let Ok(true) = is_same_file(&shim_path, &script.path()) { + if let Ok(true) = is_same_file(&shim_path, script.path()) { fs::remove_file(&shim_path).ok(); } } diff --git a/rye/src/pyproject.rs b/rye/src/pyproject.rs index d1865bd92f..34dcd5c41e 100644 --- a/rye/src/pyproject.rs +++ b/rye/src/pyproject.rs @@ -1421,17 +1421,25 @@ impl ExpandedSources { /// Attach common pip args to a command. pub fn add_as_pip_args(&self, cmd: &mut Command) { - for (url, default) in self.index_urls.iter() { - if *default { - cmd.arg("--index-url"); - } else { - cmd.arg("--extra-index-url"); - } - cmd.arg(&url.to_string()); + for url in self + .index_urls + .iter() + .filter_map(|(url, default)| if *default { Some(url) } else { None }) + { + cmd.arg("--index-url"); + cmd.arg(url.to_string()); + } + for url in self + .index_urls + .iter() + .filter_map(|(url, default)| if *default { None } else { Some(url) }) + { + cmd.arg("--extra-index-url"); + cmd.arg(url.to_string()); } for link in &self.find_links { cmd.arg("--find-links"); - cmd.arg(&link.to_string()); + cmd.arg(link.to_string()); } for host in &self.trusted_hosts { cmd.arg("--trusted-host"); @@ -1441,18 +1449,25 @@ impl ExpandedSources { /// Write the sources to a lockfile. pub fn add_to_lockfile(&self, out: &mut dyn std::io::Write) -> std::io::Result<()> { - for (url, default) in self.index_urls.iter() { - if *default { - writeln!(out, "--index-url {}", url)?; - } else { - writeln!(out, "--extra-index-url {}", url)?; - } + for url in self + .index_urls + .iter() + .filter_map(|(url, default)| if *default { Some(url) } else { None }) + { + writeln!(out, "--index-url {url}")?; + } + for url in self + .index_urls + .iter() + .filter_map(|(url, default)| if *default { None } else { Some(url) }) + { + writeln!(out, "--extra-index-url {url}")?; } for link in &self.find_links { - writeln!(out, "--find-links {}", link)?; + writeln!(out, "--find-links {link}")?; } for host in &self.trusted_hosts { - writeln!(out, "--trusted-host {}", host)?; + writeln!(out, "--trusted-host {host}")?; } Ok(()) } From 05f1c49bea26c1e928f698e7272217d83962aee9 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Sat, 27 Jul 2024 14:38:36 -0400 Subject: [PATCH 02/19] Use case-insensitive comparison for detecting `rye.exe` (#1286) ## Summary This check can be subtly incorrect on case-insensitive filesystems (e.g., NTFS). Seems easiest to just make the whole comparison case-insensitive. Closes https://github.com/astral-sh/rye/issues/1284. --- rye/src/cli/shim.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rye/src/cli/shim.rs b/rye/src/cli/shim.rs index aa8bb16a4c..c4decafd2b 100644 --- a/rye/src/cli/shim.rs +++ b/rye/src/cli/shim.rs @@ -31,7 +31,7 @@ fn detect_shim(args: &[OsString]) -> Option { // rye is itself placed in the shims folder, so it must not // detect itself. - if shim_name == "rye" || shim_name == "rye.exe" { + if shim_name.eq_ignore_ascii_case("rye") || shim_name.eq_ignore_ascii_case("rye.exe") { return None; } From ec56412f0c3ae802e12f719eda3aa3cb972cbdd7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 27 Jul 2024 17:29:57 -0400 Subject: [PATCH 03/19] Sync UV Releases (#1269) --- rye/src/sources/generated/uv_downloads.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rye/src/sources/generated/uv_downloads.inc b/rye/src/sources/generated/uv_downloads.inc index 63e961a7f9..f90bb434e1 100644 --- a/rye/src/sources/generated/uv_downloads.inc +++ b/rye/src/sources/generated/uv_downloads.inc @@ -2,11 +2,11 @@ // To regenerate, run `rye run uv-downloads > rye/src/sources/generated/uv_downloads.inc` from the root of the repository. use std::borrow::Cow; pub const UV_DOWNLOADS: &[UvDownload] = &[ - UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 0, minor: 2, patch: 27, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.27/uv-aarch64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("d071d3063933e2e98322619bd4318594e84b7f6ce4f6c5c13a2ef424b0704bb7") }, - UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 27, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.27/uv-aarch64-unknown-linux-musl.tar.gz"), sha256: Cow::Borrowed("f7ad07f32e01dfdbd6b217c7f6acd7822eb6600d9992d204b93bfa0749bc6b29") }, - UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("windows"), major: 0, minor: 2, patch: 27, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.27/uv-i686-pc-windows-msvc.zip"), sha256: Cow::Borrowed("6183e4fecfe5404dc69d9cc23c248441ba25a21541c8046c8a27b09a63f224b7") }, - UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 27, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.27/uv-i686-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("4def707256649e6ad40ad33c8c00464d163728a969e54baf94f9d8463b4b89d8") }, - UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 0, minor: 2, patch: 27, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.27/uv-x86_64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("56be1ded925e7c1852f8853f7637942786ae379c0ecdbc88cf101f17f8413129") }, - UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 0, minor: 2, patch: 27, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.27/uv-x86_64-pc-windows-msvc.zip"), sha256: Cow::Borrowed("1ea0b0623c362c47c6d00801e09ddf948cc27cc18200e5390469e279dfb85d29") }, - UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 27, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.27/uv-x86_64-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("224cdff5d82ff7053d1a9bf61e5ae89961d536eb2da8a4a13b93a49a0ab434bf") }, + UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 0, minor: 2, patch: 30, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.30/uv-aarch64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("387f24ebf55f304352bc5fc4638ca251112ab682291a00290de3753a1b5092f7") }, + UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 30, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.30/uv-aarch64-unknown-linux-musl.tar.gz"), sha256: Cow::Borrowed("4b4e5fb2ca63fee674a32ed99e1c371d4dcfe194787c3bddc7bef37b4ae3fd24") }, + UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("windows"), major: 0, minor: 2, patch: 30, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.30/uv-i686-pc-windows-msvc.zip"), sha256: Cow::Borrowed("2ce7b022fab83161cf9b26a8413702ab328c2f01a530a2739712527acd769068") }, + UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 30, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.30/uv-i686-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("6777ab4ee773df50790da19586afe41507dd9b4c69db39e09154cc013e066aa5") }, + UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 0, minor: 2, patch: 30, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.30/uv-x86_64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("4048630dcfca6946dd8b7f2e8ff38dbc54a9e47ae50f9e04a372081c413e0b66") }, + UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 0, minor: 2, patch: 30, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.30/uv-x86_64-pc-windows-msvc.zip"), sha256: Cow::Borrowed("8cae7297892b5cd947fc8dc9ef045dc82c8a3c948413cbc68aa46285b888031c") }, + UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 30, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.30/uv-x86_64-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("572a09703b40680191f4da33ffad2ae57cee93f0007f1eb25b84d241b0b418f2") }, ]; From 0da8f3f9cb0b4dae3d2ee6c84be56782632fd06e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 27 Jul 2024 17:30:06 -0400 Subject: [PATCH 04/19] Sync Python Releases (#1280) --- .../sources/generated/python_downloads.inc | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/rye/src/sources/generated/python_downloads.inc b/rye/src/sources/generated/python_downloads.inc index b7886dcb16..bc32a7a704 100644 --- a/rye/src/sources/generated/python_downloads.inc +++ b/rye/src/sources/generated/python_downloads.inc @@ -101,12 +101,12 @@ pub const PYTHON_VERSIONS: &[(PythonVersion, &str, Option<&str>)] = &[ (PythonVersion { name: Cow::Borrowed("pypy"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("linux"), major: 3, minor: 7, patch: 9, suffix: None }, "https://downloads.python.org/pypy/pypy3.7-v7.3.3-linux32.tar.bz2", Some("7d81b8e9fcd07c067cfe2f519ab770ec62928ee8787f952cadf2d2786246efc8")), (PythonVersion { name: Cow::Borrowed("pypy"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 7, patch: 9, suffix: None }, "https://downloads.python.org/pypy/pypy3.7-v7.3.3-linux64.tar.bz2", Some("37e2804c4661c86c857d709d28c7de716b000d31e89766599fdf5a98928b7096")), (PythonVersion { name: Cow::Borrowed("pypy"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 7, patch: 9, suffix: None }, "https://downloads.python.org/pypy/pypy3.7-v7.3.3-osx64.tar.bz2", Some("d72b27d5bb60813273f14f07378a08822186a66e216c5d1a768ad295b582438d")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 12, patch: 4, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.12.4%2B20240713-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("c7093d43470f07fce45a8fdc15e9e5bddd696174199083721cb1311ca5a100d1")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 12, patch: 4, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.12.4%2B20240713-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("a5ad9b19db463f30138352f1dea620ac182a51aefb3398f3a7b8ed865c1f22e9")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 12, patch: 4, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.12.4%2B20240713-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("b9d5a845480ef06133ca518dffc5083a8a5ba455d227504c6f03012c874caf6c")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 12, patch: 4, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.12.4%2B20240713-x86_64-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("f9eda278682713c45d13671d6e3a78df44293c9ed7be8ba2cc4284dc2ba5d5a9")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 12, patch: 4, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.12.4%2B20240713-x86_64-apple-darwin-pgo%2Blto-full.tar.zst", Some("810cc81031f68d0c6b7b5ae685ad590958a842824e08e5d28dea82396da0af44")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 12, patch: 4, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.12.4%2B20240713-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst", Some("3f1eb222d1d43d5d70551e8bd64d54aff40f754eb08600167c779f2f1c3559ac")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 12, patch: 4, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.12.4%2B20240726-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("05cbc91569f94a07f96a7ae04b62e19a9d7a3e74400d7d6b5b042f17285d2601")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 12, patch: 4, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.12.4%2B20240726-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("3b017ab70e2f11b95d909317fc4e76c000ece588461058a642bf74db77cec267")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 12, patch: 4, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.12.4%2B20240726-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("4d321e97e499610c887da89682c796967dba9337a1102e9e5d98d65cef5dde52")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 12, patch: 4, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.12.4%2B20240726-x86_64-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("164f9ca029de9220d6f473e835b06c14684905912aee73312c560238fc2051d6")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 12, patch: 4, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.12.4%2B20240726-x86_64-apple-darwin-pgo%2Blto-full.tar.zst", Some("60cfc2465326cb44303e3a8904d4e606ec54aaa41be378532e219f05f06ef37d")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 12, patch: 4, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.12.4%2B20240726-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst", Some("369d3a8a205cdbc754034f304ecedd4da0120cc9c71b6baac0147908aba15ece")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 12, patch: 3, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240415/cpython-3.12.3%2B20240415-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("a4f17d1e3b4ea0e4c2a3664f232c0857979522936af582f7de92b57050220f74")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 12, patch: 3, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240415/cpython-3.12.3%2B20240415-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("fa2b8c377f17dfb097a93c0fba217d93075a7ceba0cc877066e95be969e6b73d")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 12, patch: 3, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240415/cpython-3.12.3%2B20240415-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("31bb3f579f3dcbbf3bf1dc71a188112e821cdfc77d21c9dbfe82ea78538110e1")), @@ -131,12 +131,12 @@ pub const PYTHON_VERSIONS: &[(PythonVersion, &str, Option<&str>)] = &[ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 12, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.12.0%2B20231002-x86_64-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("5ce861907a2751a3a7395b1aaada830c2b072acc03f3dd0bcbaaa2b7a9166fc0")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 12, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.12.0%2B20231002-x86_64-apple-darwin-pgo%2Blto-full.tar.zst", Some("3b4781e7fd4efabe574ba0954e54c35c7d5ac4dc5b2990b40796c1c6aec67d79")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 12, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.12.0%2B20231002-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst", Some("5bdff7ed56550d96f9b26a27a8c25f0cc58a03bff19e5f52bba84366183cab8b")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.11.9%2B20240713-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("806a1c30d200ba7cc491f024d122fd4127bb6e094f45040f4d6ff5738a7897e5")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.11.9%2B20240713-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("4cb03ac8b12366038059045aa8405794b96d9b3c73919c157a98f73e21b13031")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.11.9%2B20240713-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("4ef2bc9db41b845d35a44bc166abbbb30514a2742ef37643f8c122a6bd71534e")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.11.9%2B20240713-x86_64-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("131d8c047f5ca97773c22bed35aca2a9cde267d3ebe13de54aa3c333fe1d19f6")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.11.9%2B20240713-x86_64-apple-darwin-pgo%2Blto-full.tar.zst", Some("d4f99453e0ab87c11c10ee1d173ef55afc0e4750492b38e89c9e30aa14198e19")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.11.9%2B20240713-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst", Some("126ddab6d6f6fbfe2f3e73176476fdf306d3ccfac67f8542d12ce0c998142644")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.11.9%2B20240726-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("6ec00fd43c8b1e4ff81944f9c641a4a6a85024bb84bfeff6615f6f19047daca5")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.11.9%2B20240726-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("38ef401284a94090fb5fb52a841ed142c7726857d121d5578ca7926c8643c148")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.11.9%2B20240726-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("eda4f3eb3c19361d0664b83e74c31e3c784e28a6efa5f3322fed409a167c9b44")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.11.9%2B20240726-x86_64-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("ee7ab314b049db55e5c518d1ad5fd4564f55cf79646a4bf97d6b79e3e5ff688a")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.11.9%2B20240726-x86_64-apple-darwin-pgo%2Blto-full.tar.zst", Some("98e6204582b0b6330c97dc2f77ae87163cb12262345ef787c53b68b8a1953d05")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.11.9%2B20240726-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst", Some("a666503ab9ea3852b9bdaa905003bb4e5d682405c715bf7a025c33ce6258c1de")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 11, patch: 8, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.11.8%2B20240224-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("1d84ed69e5acce555513e9261ce4b78bed19969b06a51a26b2781a375d70083d")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 11, patch: 8, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.11.8%2B20240224-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("c0650884b929253b8688797d1955850f6e339bf0428b3d935f62ab3159f66362")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 11, patch: 8, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.11.8%2B20240224-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("c3e90962996177a027bd73dd9fd8c42a2d6ef832cda26db4ab4efc6105160537")), @@ -183,12 +183,12 @@ pub const PYTHON_VERSIONS: &[(PythonVersion, &str, Option<&str>)] = &[ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 11, patch: 1, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20230116/cpython-3.11.1%2B20230116-x86_64-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("02332441cb610b1e1aa2d2972e261e2910cc6a950b7973cac22c0759a93c5fcd")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 11, patch: 1, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20230116/cpython-3.11.1%2B20230116-x86_64-apple-darwin-pgo%2Blto-full.tar.zst", Some("0eb61be53ee13cf75a30b8a164ef513a2c7995b25b118a3a503245d46231b13a")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 11, patch: 1, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20230116/cpython-3.11.1%2B20230116-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst", Some("f5c46fffda7d7894b975af728f739b02d1cec50fd4a3ea49f69de9ceaae74b17")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.10.14%2B20240713-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("115204ab7c5013ec2b0e9e594c4ef55b5eb892bdfcc55eb56ed5b4845515df7e")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.10.14%2B20240713-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("4558c58bd03309d0c7131d4b5c2cbce9843d385fbcc7d75e575b4bf887bf5f68")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.10.14%2B20240713-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("d6fc0101ba01d63aae1416d8205fe5c700f80d5bed1edbab1250c900d85a7d20")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.10.14%2B20240713-x86_64-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("01c1038755944cbd7017a4e13e53237e68cd6bbfcff34ca8c9f53a71653e5c9a")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.10.14%2B20240713-x86_64-apple-darwin-pgo%2Blto-full.tar.zst", Some("ece66670f9464828bce9e276a74da62d4663ab8cfd277f6758a7c65d1f245fa0")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.10.14%2B20240713-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst", Some("1003c93f92fdcca57308076995b224b888a7ee556763759e69d36e198b5bef14")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.10.14%2B20240726-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("7f0682fe77d4ac8d44bac73c592d5bba976f204d938e22342c26aafcc1016960")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.10.14%2B20240726-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("f20dbd7b1f18ebf7f4cb5f1768e6525a2f328d53e8b6a7e29664418c8478ce70")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.10.14%2B20240726-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("99fef0c517830a5b683f213f19b2730293e03e5dca81db1a4e6b97c96e6b885d")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.10.14%2B20240726-x86_64-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("d030c3f4391c31769f8ee53a70f73de7bebb297606812c5e4587240fd0afd5b1")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.10.14%2B20240726-x86_64-apple-darwin-pgo%2Blto-full.tar.zst", Some("51b73993fc99f1c6e5d9fb0b70857b50183c4e1947d4ebee50fafed55152cb5b")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.10.14%2B20240726-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst", Some("457057db6e97d525c0dcde425ed88f5b7fb9fe75fbfc79a4aa3b15a14cba5710")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 10, patch: 13, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.10.13%2B20240224-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("7f23a4afa4032a7c5a4e0ec926da37eea242472142613c2baa029ef61c3c493c")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 10, patch: 13, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.10.13%2B20240224-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("57b83a4aa32bdbe7611f1290313ef24f2574dff5fa59181c0ccb26c14c688b73")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("linux"), major: 3, minor: 10, patch: 13, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20230826/cpython-3.10.13%2B20230826-i686-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("cc5625a16fbec682d4ce40c0d185318164bd181efaa7eaf945ca63015db9fea3")), @@ -273,12 +273,12 @@ pub const PYTHON_VERSIONS: &[(PythonVersion, &str, Option<&str>)] = &[ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 10, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20211017/cpython-3.10.0-x86_64-unknown-linux-gnu-pgo%2Blto-20211017T1616.tar.zst", None), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 10, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20211017/cpython-3.10.0-x86_64-apple-darwin-pgo%2Blto-20211017T1616.tar.zst", None), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 10, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20211017/cpython-3.10.0-x86_64-pc-windows-msvc-shared-pgo-20211017T1616.tar.zst", None), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.9.19%2B20240713-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("dbd9882b61082c05496ef00c43760802d04cf3158b51d69b29b088d9346c1f09")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.9.19%2B20240713-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("e1a251fc23529800653be104aae59cf60f74fa0ebecf373b35e20bfaabee3fe4")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.9.19%2B20240713-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("02095d278a23244d84c82dafc608c259b0cd0c8a21f5a7faf8b1630271304a75")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.9.19%2B20240713-x86_64-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("c623fad21b04611a3456a95b03d286fd29297b803b99f59bf45ec8eb87dae12d")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.9.19%2B20240713-x86_64-apple-darwin-pgo%2Blto-full.tar.zst", Some("46a30e4f7d93c8863e1ef4064f9e9dbe088af35147f57553c3dbf5188290b1e5")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.9.19%2B20240713-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst", Some("961fda1c29d7280ac7989a5055d9495674a959abc8137402e19da96d7e8a59c1")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.9.19%2B20240726-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("163c4b78ed43fd46012fba8601089365e568fbdf09dd8530c0a43fa95c9ab02c")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.9.19%2B20240726-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("7f04e96ebd9fbde4c18d1adedc1c3a3804df8919c088fdb33b1dd44a68632e39")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.9.19%2B20240726-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("1746133bdb6312a3c839c752d94edaaa4ceff6bbfe05d9dac5cf183e1d28346b")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.9.19%2B20240726-x86_64-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("179470b65a70f77189adb5637ccc8fa5ee443fc88d74113ce0e60b5d8548bf49")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.9.19%2B20240726-x86_64-apple-darwin-pgo%2Blto-full.tar.zst", Some("e76c9bfa292a2fbff0e47664571f52000f494155cd195f8d8e483b8d2d1af23f")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.9.19%2B20240726-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst", Some("2ddd1ea39dd2ad56c774749698364256630eb95a7ca71b1c7a3af9ed2ecaa5fb")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 9, patch: 18, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.9.18%2B20240224-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("93d7b15bf02a3191cfdee9d9d68bf2da782fc04cb142bcca6a4299fe524d9b37")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 9, patch: 18, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.9.18%2B20240224-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("579f9b68bbb3a915cbab9682e4d3c253bc96b0556b8a860982c49c25c61f974a")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("linux"), major: 3, minor: 9, patch: 18, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20230826/cpython-3.9.18%2B20230826-i686-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("9e40a541b4eb6eb0a5e2f35724a18332aea91c61e18dec77ca40da5cf2496839")), @@ -387,12 +387,12 @@ pub const PYTHON_VERSIONS: &[(PythonVersion, &str, Option<&str>)] = &[ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 9, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20201020/cpython-3.9.0-x86_64-unknown-linux-gnu-pgo-20201020T0627.tar.zst", None), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 9, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20201020/cpython-3.9.0-x86_64-apple-darwin-pgo-20201020T0626.tar.zst", None), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 9, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20201020/cpython-3.9.0-x86_64-pc-windows-msvc-shared-pgo-20201021T0245.tar.zst", None), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.8.19%2B20240713-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("ef62298357f66f9bf808cc27a32b4fdfd61860551fea3e946df820918e5ad6f3")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.8.19%2B20240713-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("d27327b398fea1a82bafc574c5d906b2e97192e04c2514dd431d723df72e9711")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.8.19%2B20240713-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("24d65be61d177147b37d4696ad775a6a011b0b3aafac93bd615a9474c53f0a7e")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.8.19%2B20240713-x86_64-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("61ac5bd70e29fa66b4739e37be66ec164b04f1dd5875c7ee2d223cf3265d4292")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.8.19%2B20240713-x86_64-apple-darwin-pgo%2Blto-full.tar.zst", Some("d9546a80f2e979b18a915d4c9aa3e053aeec9a4ddb9bab706ee55e6ebaf3b347")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240713/cpython-3.8.19%2B20240713-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst", Some("625f1c22a8f903abf07eff43209f65fc0c4857be5aef5c9945daef83f2687af2")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.8.19%2B20240726-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("a69135d4436f78ffb771bb1b3e26c89cc1747ff77cb8d4c5e23ccdaabcba7e59")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.8.19%2B20240726-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("005c2439b581cf6e5de1e79a62d5a36246d07e2d5579b818a6af24d53821feae")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.8.19%2B20240726-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("3cdc8c3ed907968fc2760147e44134a39cd1c3558327faa682934d09e524b0e3")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.8.19%2B20240726-x86_64-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("8675f055d1815dcbe5de94e7f4c84b0942ace527e4e1639b561f1672b517263f")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.8.19%2B20240726-x86_64-apple-darwin-pgo%2Blto-full.tar.zst", Some("d9ded43a6a5be03e770ad7e2f1a4c44e67401ed7218a2081677fa4ba7cb3e61f")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.8.19%2B20240726-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst", Some("d75c18671e28ad698a32e589ca043b2cc0fff1cf7bae8f71501df68cd01e3a86")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 8, patch: 18, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.8.18%2B20240224-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("df66801678a5f4accee67784aff058f283fd52e42898527b7ff0e1cbc3e50e8c")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 8, patch: 18, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.8.18%2B20240224-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("c732c068cddcd6a008c1d6d8e35802f5bdc7323bd2eb64e77210d3d5fe4740c2")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 8, patch: 18, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.8.18%2B20240224-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("9f94c7b54b97116cd308e73cda0b7a7b7fff4515932c5cbba18eeae9ec798351")), From 4b34ca16ac06794640c86a82ccd8ccd7b124a0ad Mon Sep 17 00:00:00 2001 From: 3w36zj6 <52315048+3w36zj6@users.noreply.github.com> Date: Wed, 31 Jul 2024 02:23:47 +0900 Subject: [PATCH 05/19] Fix documentation for readline license (#1297) NITS: I fixed the license for readline in the documentation to GPLv3. cf. https://tiswww.case.edu/php/chet/readline/rltop.html > Readline is free software, distributed under the terms of the [GNU General Public License, version 3](http://www.gnu.org/licenses/gpl.html). cf. https://gregoryszorc.com/docs/python-build-standalone/main/running.html#licensing > Most licenses are fairly permissive. Notable exceptions to this are GDBM and readline, which are both licensed under GPL Version 3. --- docs/guide/toolchains/cpython.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guide/toolchains/cpython.md b/docs/guide/toolchains/cpython.md index e78bdade18..d42dcaca1f 100644 --- a/docs/guide/toolchains/cpython.md +++ b/docs/guide/toolchains/cpython.md @@ -28,7 +28,7 @@ different from a regular Python build. The following changes to a regular Python versions you should be aware of: -* `libedit` instead of `readline`: unfortunately `readline` is GPL2 licensed +* `libedit` instead of `readline`: unfortunately `readline` is GPLv3 licensed and this is a hazard for redistributions. As such, the portable Python builds link against the more freely licensed `libedit` instead. From c0616e10b61722ee32a4c8f2f2a41c7214715de8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 13:18:24 +0000 Subject: [PATCH 06/19] Sync UV Releases (#1295) --- rye/src/sources/generated/uv_downloads.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rye/src/sources/generated/uv_downloads.inc b/rye/src/sources/generated/uv_downloads.inc index f90bb434e1..b2f280740e 100644 --- a/rye/src/sources/generated/uv_downloads.inc +++ b/rye/src/sources/generated/uv_downloads.inc @@ -2,11 +2,11 @@ // To regenerate, run `rye run uv-downloads > rye/src/sources/generated/uv_downloads.inc` from the root of the repository. use std::borrow::Cow; pub const UV_DOWNLOADS: &[UvDownload] = &[ - UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 0, minor: 2, patch: 30, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.30/uv-aarch64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("387f24ebf55f304352bc5fc4638ca251112ab682291a00290de3753a1b5092f7") }, - UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 30, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.30/uv-aarch64-unknown-linux-musl.tar.gz"), sha256: Cow::Borrowed("4b4e5fb2ca63fee674a32ed99e1c371d4dcfe194787c3bddc7bef37b4ae3fd24") }, - UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("windows"), major: 0, minor: 2, patch: 30, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.30/uv-i686-pc-windows-msvc.zip"), sha256: Cow::Borrowed("2ce7b022fab83161cf9b26a8413702ab328c2f01a530a2739712527acd769068") }, - UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 30, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.30/uv-i686-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("6777ab4ee773df50790da19586afe41507dd9b4c69db39e09154cc013e066aa5") }, - UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 0, minor: 2, patch: 30, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.30/uv-x86_64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("4048630dcfca6946dd8b7f2e8ff38dbc54a9e47ae50f9e04a372081c413e0b66") }, - UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 0, minor: 2, patch: 30, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.30/uv-x86_64-pc-windows-msvc.zip"), sha256: Cow::Borrowed("8cae7297892b5cd947fc8dc9ef045dc82c8a3c948413cbc68aa46285b888031c") }, - UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 30, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.30/uv-x86_64-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("572a09703b40680191f4da33ffad2ae57cee93f0007f1eb25b84d241b0b418f2") }, + UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 0, minor: 2, patch: 32, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.32/uv-aarch64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("5084b7544da648d3467440f87a3f2929ca7c593a311a3b77271b638ca7664f3c") }, + UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 32, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.32/uv-aarch64-unknown-linux-musl.tar.gz"), sha256: Cow::Borrowed("b3fff6bb0ae62154c5d17256b40f3d568a7bd7037e4839cb672545b16cd8622f") }, + UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("windows"), major: 0, minor: 2, patch: 32, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.32/uv-i686-pc-windows-msvc.zip"), sha256: Cow::Borrowed("7a449bc0fe9326d31ad809c8cfbe19ba2b67b28c9dc631bb6f1696334442d928") }, + UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 32, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.32/uv-i686-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("1c91f7ad89b5697a33906be435fe6b9fad903916096ef61f034257252a8e4c86") }, + UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 0, minor: 2, patch: 32, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.32/uv-x86_64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("e86f3bd4e7c30b0e4094d1eff520d762fdfac9e55da785db23b0139b675aeda9") }, + UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 0, minor: 2, patch: 32, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.32/uv-x86_64-pc-windows-msvc.zip"), sha256: Cow::Borrowed("1725fafdcc1390574b8682805ec31ebc9287085f562dc7ac6a64b186abaf1b0d") }, + UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 32, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.32/uv-x86_64-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("c676266d23c8dbe7832c44f37832c4e4ecf21781b7b0560bf27b270bedb14462") }, ]; From 29e36574baa3d1a10200a6a4178489dfd6384ae5 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Thu, 1 Aug 2024 20:44:09 -0400 Subject: [PATCH 07/19] Update bundled pip to 24.2.0 (#1304) --- rye/src/bootstrap.rs | 2 +- rye/src/piptools.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rye/src/bootstrap.rs b/rye/src/bootstrap.rs index da001ea343..18b1ffb9c5 100644 --- a/rye/src/bootstrap.rs +++ b/rye/src/bootstrap.rs @@ -33,7 +33,7 @@ pub const SELF_PYTHON_TARGET_VERSION: PythonVersionRequest = PythonVersionReques suffix: None, }; -const SELF_VERSION: u64 = 21; +const SELF_VERSION: u64 = 22; pub const SELF_REQUIREMENTS: &str = r#" build==1.2.1 diff --git a/rye/src/piptools.rs b/rye/src/piptools.rs index 7764aba168..23e2a70da9 100644 --- a/rye/src/piptools.rs +++ b/rye/src/piptools.rs @@ -13,7 +13,7 @@ use crate::utils::{get_venv_python_bin, CommandOutput, IoPathContext}; // When changing these, also update `SELF_VERSION` in bootstrap.rs to ensure // that the internals are re-created. -pub const LATEST_PIP: &str = "pip==23.3.2"; +pub const LATEST_PIP: &str = "pip==24.2.0"; const PIP_TOOLS_LATEST_REQ: &[&str] = &[LATEST_PIP, "pip-tools==7.3.0"]; const PIP_TOOLS_LEGACY_REQ: &[&str] = &["pip==22.2.0", "pip-tools==6.14.0"]; From 640c8ce017a7efcbd12543139bda5306dc6ecc68 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 01:37:18 +0000 Subject: [PATCH 08/19] Sync UV Releases (#1303) --- rye/src/sources/generated/uv_downloads.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rye/src/sources/generated/uv_downloads.inc b/rye/src/sources/generated/uv_downloads.inc index b2f280740e..86992a9ea0 100644 --- a/rye/src/sources/generated/uv_downloads.inc +++ b/rye/src/sources/generated/uv_downloads.inc @@ -2,11 +2,11 @@ // To regenerate, run `rye run uv-downloads > rye/src/sources/generated/uv_downloads.inc` from the root of the repository. use std::borrow::Cow; pub const UV_DOWNLOADS: &[UvDownload] = &[ - UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 0, minor: 2, patch: 32, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.32/uv-aarch64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("5084b7544da648d3467440f87a3f2929ca7c593a311a3b77271b638ca7664f3c") }, - UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 32, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.32/uv-aarch64-unknown-linux-musl.tar.gz"), sha256: Cow::Borrowed("b3fff6bb0ae62154c5d17256b40f3d568a7bd7037e4839cb672545b16cd8622f") }, - UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("windows"), major: 0, minor: 2, patch: 32, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.32/uv-i686-pc-windows-msvc.zip"), sha256: Cow::Borrowed("7a449bc0fe9326d31ad809c8cfbe19ba2b67b28c9dc631bb6f1696334442d928") }, - UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 32, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.32/uv-i686-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("1c91f7ad89b5697a33906be435fe6b9fad903916096ef61f034257252a8e4c86") }, - UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 0, minor: 2, patch: 32, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.32/uv-x86_64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("e86f3bd4e7c30b0e4094d1eff520d762fdfac9e55da785db23b0139b675aeda9") }, - UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 0, minor: 2, patch: 32, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.32/uv-x86_64-pc-windows-msvc.zip"), sha256: Cow::Borrowed("1725fafdcc1390574b8682805ec31ebc9287085f562dc7ac6a64b186abaf1b0d") }, - UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 32, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.32/uv-x86_64-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("c676266d23c8dbe7832c44f37832c4e4ecf21781b7b0560bf27b270bedb14462") }, + UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 0, minor: 2, patch: 33, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.33/uv-aarch64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("a2602b99e71bc04d7eb11df00b87be068727bb47fc415f7fcbd24dae49c947a3") }, + UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 33, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.33/uv-aarch64-unknown-linux-musl.tar.gz"), sha256: Cow::Borrowed("9d4ba96eee49b9483fd55ab1b376ed4b9f88f0f9d155c0e48e7280d3cc388d4e") }, + UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("windows"), major: 0, minor: 2, patch: 33, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.33/uv-i686-pc-windows-msvc.zip"), sha256: Cow::Borrowed("69c5d28aa75d0ce3fa5466736e2e156db48514cd7c9c44e6bc6515994944695d") }, + UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 33, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.33/uv-i686-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("176caa5100e047b32e84c0c7ce1a31f74610b3f94266f5aa3f86d02417fcdfb6") }, + UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 0, minor: 2, patch: 33, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.33/uv-x86_64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("0d4a2c20e1d0e06c83a60fac0d85bff46cd5312f146dd0f6bf35b63ae8f7a9fe") }, + UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 0, minor: 2, patch: 33, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.33/uv-x86_64-pc-windows-msvc.zip"), sha256: Cow::Borrowed("c080525062c3d803e63ef493002f234056dd6efe6d0281d86d672510702823d3") }, + UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 33, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.33/uv-x86_64-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("e62a4123e6b77c9dd22f133212f7bac638077ebde73daa20fea3bef3ac51c84c") }, ]; From 3e3c8540f7f72e5742d6e347f392b2631c0b1b4d Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Thu, 1 Aug 2024 21:44:18 -0400 Subject: [PATCH 09/19] Prep for v0.38.0 release (#1305) --- CHANGELOG.md | 14 ++++++++++++++ Cargo.lock | 2 +- rye/Cargo.toml | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1e739decd..7713c136fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,20 @@ that were not yet released. +## 0.38.0 + +Released on 2024-08-01. + +* Fix `rye add` and `rye remove` to create proper `tool.rye` section for `--dev` and `--exclude` flags by @flyaroundme in https://github.com/astral-sh/rye/pull/1256 +* Fix `uninstall_cmd` on Windows by @250h in https://github.com/astral-sh/rye/pull/1153 +* Make rye run print script list to stdout by @mitsuhiko in https://github.com/astral-sh/rye/pull/1268 +* Always write `--index-url` before `--extra-index-url` by @charliermarsh in https://github.com/astral-sh/rye/pull/1278 +* Use case-insensitive comparison for detecting `rye.exe` by @charliermarsh in https://github.com/astral-sh/rye/pull/1286 +* Update Python releases to include stripped variants by @github-actions in https://github.com/astral-sh/rye/pull/1280 +* Fix documentation for readline license by @3w36zj6 in https://github.com/astral-sh/rye/pull/1297 +* Update bundled uv version to `v0.2.33` by @github-actions in https://github.com/astral-sh/rye/pull/1303 +* Update bundled pip to `v24.2.0` by @charliermarsh in https://github.com/astral-sh/rye/pull/1304 + ## 0.37.0 Released on 2024-07-20. diff --git a/Cargo.lock b/Cargo.lock index b2a4a7d789..942403ca97 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1799,7 +1799,7 @@ dependencies = [ [[package]] name = "rye" -version = "0.37.0" +version = "0.38.0" dependencies = [ "age", "anyhow", diff --git a/rye/Cargo.toml b/rye/Cargo.toml index 2194a97456..8b697f3853 100644 --- a/rye/Cargo.toml +++ b/rye/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rye" -version = "0.37.0" +version = "0.38.0" edition = "2021" license = "MIT" From ab5baa02580117358e097a91263bde011ff10d68 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Sat, 3 Aug 2024 16:02:39 -0400 Subject: [PATCH 10/19] Update Cargo dependencies (#1310) Closes https://github.com/astral-sh/rye/issues/1306. --- Cargo.lock | 514 +++++++++++++++++++++++++++++------------------------ 1 file changed, 283 insertions(+), 231 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 942403ca97..346a0f10d6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -99,9 +99,9 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anyhow" @@ -135,9 +135,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -148,12 +148,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.21.7" @@ -180,9 +174,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block-buffer" @@ -195,9 +189,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", "serde", @@ -238,13 +232,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.98" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" dependencies = [ "jobserver", "libc", - "once_cell", ] [[package]] @@ -285,11 +278,11 @@ dependencies = [ [[package]] name = "charset" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e9079d1a12a2cc2bffb5db039c43661836ead4082120d5844f02555aca2d46" +checksum = "f1f927b07c74ba84c7e5fe4db2baeb3e996ab2688992e39ac68ce3220a677c7e" dependencies = [ - "base64 0.13.1", + "base64 0.22.1", "encoding_rs", ] @@ -316,9 +309,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.4" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" dependencies = [ "clap_builder", "clap_derive", @@ -326,9 +319,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" dependencies = [ "anstyle", "clap_lex", @@ -337,18 +330,18 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.2" +version = "4.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e" +checksum = "a8670053e87c316345e384ca1f3eba3006fc6355ed8b8a1140d104e109e3df34" dependencies = [ "clap", ] [[package]] name = "clap_complete_nushell" -version = "4.5.1" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0e48e026ce7df2040239117d25e4e79714907420c70294a5ce4b6bbe6a7b6" +checksum = "5fe32110e006bccf720f8c9af3fee1ba7db290c724eab61544e1d3295be3a40e" dependencies = [ "clap", "clap_complete", @@ -356,27 +349,27 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.72", ] [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "configparser" -version = "3.0.4" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec6d3da8e550377a85339063af6e3735f4b1d9392108da4e083a1b3b9820288" +checksum = "e57e3272f0190c3f1584272d613719ba5fc7df7f4942fe542e63d949cf3a649b" [[package]] name = "console" @@ -461,9 +454,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.72+curl-8.6.0" +version = "0.4.74+curl-8.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29cbdc8314c447d11e8fd156dcdd031d9e02a7a976163e396b548c03153bc9ea" +checksum = "8af10b986114528fcdc4b63b6f5f021b7057618411046a4de2ba0f0149a097bf" dependencies = [ "cc", "libc", @@ -476,15 +469,14 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.2" +version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "fiat-crypto", - "platforms", "rustc_version", "subtle", "zeroize", @@ -498,7 +490,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.72", ] [[package]] @@ -537,7 +529,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.72", ] [[package]] @@ -571,13 +563,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.72", ] [[package]] @@ -588,9 +580,9 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encode_unicode" @@ -667,9 +659,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" dependencies = [ "crc32fast", "miniz_oxide", @@ -813,7 +805,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.72", ] [[package]] @@ -869,9 +861,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "git-testament" @@ -891,7 +883,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.72", "time", ] @@ -967,7 +959,7 @@ dependencies = [ "serde", "serde_derive", "thiserror", - "toml 0.8.13", + "toml 0.8.19", "unic-langid", ] @@ -1009,7 +1001,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.65", + "syn 2.0.72", "unic-langid", ] @@ -1023,7 +1015,7 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.72", ] [[package]] @@ -1038,9 +1030,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" dependencies = [ "equivalent", "hashbrown", @@ -1135,9 +1127,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -1154,9 +1146,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" @@ -1166,9 +1158,9 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libz-sys" -version = "1.1.16" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" dependencies = [ "cc", "libc", @@ -1178,9 +1170,9 @@ dependencies = [ [[package]] name = "license" -version = "3.3.1" +version = "3.4.0+3.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bba2f02ee1d13cd4bea565658939cd851d70e391f34f7c27b45b2077df3a2e4" +checksum = "a7da1e0d845faf299a9fe5f201a918a0dc0d5fc22c7b9580a6a23fed3a912b37" dependencies = [ "reword", "serde", @@ -1211,9 +1203,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "mailparse" @@ -1228,15 +1220,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "minijinja" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7165d0e94806d52ad5295e4b54a95176d831814840bc067298ca647e1c956338" +checksum = "f4bf71af278c578cbcc91d0b1ff092910208bc86f7b3750364642bd424e3dcd3" dependencies = [ "serde", "serde_json", @@ -1250,9 +1242,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] @@ -1274,7 +1266,7 @@ dependencies = [ "target-lexicon", "tempfile", "thiserror", - "toml 0.8.13", + "toml 0.8.19", "tracing", "unscanny", "ureq", @@ -1287,7 +1279,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -1309,6 +1301,27 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +[[package]] +name = "num_enum" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "number_prefix" version = "0.4.0" @@ -1317,9 +1330,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.32.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" dependencies = [ "memchr", ] @@ -1344,18 +1357,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.2.3+3.2.1" +version = "300.3.1+3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" +checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -1366,9 +1379,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -1382,9 +1395,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.1", + "redox_syscall 0.5.3", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -1454,7 +1467,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.72", ] [[package]] @@ -1475,12 +1488,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" -[[package]] -name = "platforms" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" - [[package]] name = "poly1305" version = "0.8.0" @@ -1494,9 +1501,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" [[package]] name = "powerfmt" @@ -1506,9 +1513,21 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] [[package]] name = "proc-macro-error" @@ -1536,9 +1555,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -1554,9 +1573,9 @@ dependencies = [ [[package]] name = "python-pkginfo" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85f2c5f010e6a63cabc4abcd60d8a61f8f8c450ac60ff0f4ae32a23b2c17d626" +checksum = "4320ca452fe003f8a07afb8e30c315bbd813ae8105f454ddefebf15a24021e1f" dependencies = [ "flate2", "fs-err", @@ -1565,7 +1584,7 @@ dependencies = [ "serde", "tar", "thiserror", - "zip 1.3.0", + "zip 1.1.4", ] [[package]] @@ -1579,9 +1598,9 @@ dependencies = [ [[package]] name = "quoted_printable" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" +checksum = "640c9bd8497b02465aeef5375144c26062e0dcd5939dfcbb0f5db76cb8c17c73" [[package]] name = "rand" @@ -1624,18 +1643,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -1645,9 +1664,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -1656,9 +1675,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reword" @@ -1700,9 +1719,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "8.4.0" +version = "8.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a" +checksum = "fa66af4a4fdd5e7ebc276f115e895611a34739a9c1c01028383d612d550953c0" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -1711,22 +1730,22 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.4.0" +version = "8.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4" +checksum = "6125dbc8867951125eec87294137f4e9c2c96566e61bf72c45095a7c77761478" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.65", + "syn 2.0.72", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "8.4.0" +version = "8.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32" +checksum = "2e5347777e9aacb56039b0e1f28785929a8a3b709e87482e7442c72e7c12529d" dependencies = [ "sha2", "walkdir", @@ -1759,7 +1778,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -1768,11 +1787,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ "log", + "once_cell", "ring", "rustls-pki-types", "rustls-webpki", @@ -1788,9 +1808,9 @@ checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ "ring", "rustls-pki-types", @@ -1842,7 +1862,7 @@ dependencies = [ "static_vcruntime", "tar", "tempfile", - "toml_edit", + "toml_edit 0.22.20", "url", "walkdir", "which", @@ -1914,9 +1934,9 @@ dependencies = [ [[package]] name = "self-replace" -version = "1.3.7" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525db198616b2bcd0f245daf7bfd8130222f7ee6af9ff9984c19a61bf1160c55" +checksum = "f7828a58998685d8bf5a3c5e7a3379a5867289c20828c3ee436280b44b598515" dependencies = [ "fastrand 1.9.0", "tempfile", @@ -1946,40 +1966,41 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.202" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.202" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.72", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -2009,9 +2030,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "similar" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" +checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" [[package]] name = "slab" @@ -2081,9 +2102,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -2097,9 +2118,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.65" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -2108,9 +2129,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" dependencies = [ "filetime", "libc", @@ -2119,18 +2140,19 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53" dependencies = [ "cfg-if", "fastrand 2.1.0", + "once_cell", "rustix", "windows-sys 0.52.0", ] @@ -2147,22 +2169,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.72", ] [[package]] @@ -2198,18 +2220,18 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ "displaydoc", ] [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -2231,36 +2253,47 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.13" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.22.20", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.13" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.18", ] [[package]] @@ -2283,7 +2316,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.72", ] [[package]] @@ -2358,9 +2391,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "universal-hash" @@ -2386,9 +2419,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.7" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea" dependencies = [ "base64 0.22.1", "flate2", @@ -2396,7 +2429,6 @@ dependencies = [ "once_cell", "rustls", "rustls-pki-types", - "rustls-webpki", "serde", "serde_json", "url", @@ -2405,9 +2437,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -2423,9 +2455,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" @@ -2464,7 +2496,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.72", "wasm-bindgen-shared", ] @@ -2486,7 +2518,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2499,18 +2531,18 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "webpki-roots" -version = "0.26.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" dependencies = [ "rustls-pki-types", ] [[package]] name = "which" -version = "6.0.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7" +checksum = "3d9c5ed668ee1f17edb3b627225343d210006a90bb1e3745ce1f30b1fb115075" dependencies = [ "either", "home", @@ -2536,11 +2568,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2564,7 +2596,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -2584,18 +2625,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -2606,9 +2647,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -2618,9 +2659,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -2630,15 +2671,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -2648,9 +2689,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -2660,9 +2701,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -2672,9 +2713,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -2684,15 +2725,24 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.8" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -2738,29 +2788,30 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.72", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -2773,7 +2824,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.65", + "syn 2.0.72", ] [[package]] @@ -2790,9 +2841,9 @@ dependencies = [ [[package]] name = "zip" -version = "1.3.0" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f4a27345eb6f7aa7bd015ba7eb4175fa4e1b462a29874b779e0bbcf96c6ac7" +checksum = "9cc23c04387f4da0374be4533ad1208cbb091d5c11d070dfef13676ad6497164" dependencies = [ "arbitrary", "bzip2", @@ -2801,33 +2852,34 @@ dependencies = [ "displaydoc", "flate2", "indexmap", + "num_enum", "thiserror", "time", ] [[package]] name = "zstd" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "7.1.0" +version = "7.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.10+zstd.1.5.6" +version = "2.0.13+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" dependencies = [ "cc", "pkg-config", From b9b92241c60707ad32c87ddfeba7d231bdc7184b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 20:43:04 -0400 Subject: [PATCH 11/19] Sync UV Releases (#1319) --- rye/src/sources/generated/uv_downloads.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rye/src/sources/generated/uv_downloads.inc b/rye/src/sources/generated/uv_downloads.inc index 86992a9ea0..002dccd489 100644 --- a/rye/src/sources/generated/uv_downloads.inc +++ b/rye/src/sources/generated/uv_downloads.inc @@ -2,11 +2,11 @@ // To regenerate, run `rye run uv-downloads > rye/src/sources/generated/uv_downloads.inc` from the root of the repository. use std::borrow::Cow; pub const UV_DOWNLOADS: &[UvDownload] = &[ - UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 0, minor: 2, patch: 33, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.33/uv-aarch64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("a2602b99e71bc04d7eb11df00b87be068727bb47fc415f7fcbd24dae49c947a3") }, - UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 33, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.33/uv-aarch64-unknown-linux-musl.tar.gz"), sha256: Cow::Borrowed("9d4ba96eee49b9483fd55ab1b376ed4b9f88f0f9d155c0e48e7280d3cc388d4e") }, - UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("windows"), major: 0, minor: 2, patch: 33, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.33/uv-i686-pc-windows-msvc.zip"), sha256: Cow::Borrowed("69c5d28aa75d0ce3fa5466736e2e156db48514cd7c9c44e6bc6515994944695d") }, - UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 33, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.33/uv-i686-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("176caa5100e047b32e84c0c7ce1a31f74610b3f94266f5aa3f86d02417fcdfb6") }, - UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 0, minor: 2, patch: 33, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.33/uv-x86_64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("0d4a2c20e1d0e06c83a60fac0d85bff46cd5312f146dd0f6bf35b63ae8f7a9fe") }, - UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 0, minor: 2, patch: 33, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.33/uv-x86_64-pc-windows-msvc.zip"), sha256: Cow::Borrowed("c080525062c3d803e63ef493002f234056dd6efe6d0281d86d672510702823d3") }, - UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 33, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.33/uv-x86_64-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("e62a4123e6b77c9dd22f133212f7bac638077ebde73daa20fea3bef3ac51c84c") }, + UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 0, minor: 2, patch: 34, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.34/uv-aarch64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("2eebf71aa924d8d977983394c212cb3ad99f6e241e77702822e8f407c8e231e0") }, + UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 34, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.34/uv-aarch64-unknown-linux-musl.tar.gz"), sha256: Cow::Borrowed("227cd1dabb4ebb98e51c1b7735fa94dea96e14db7efb2d3d76b48c87a61a3d28") }, + UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("windows"), major: 0, minor: 2, patch: 34, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.34/uv-i686-pc-windows-msvc.zip"), sha256: Cow::Borrowed("34035c24e9c6dcf1164f10fee22e12fd03b329479233986909458df3259cf22f") }, + UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 34, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.34/uv-i686-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("99c3873d4bc3816c383c0e2686de1066be1ca8ff546e29e418e435296df13ae0") }, + UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 0, minor: 2, patch: 34, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.34/uv-x86_64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("62764007f4553f3677ef86e864097405d1b054e8a62e89f047e545816347491c") }, + UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 0, minor: 2, patch: 34, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.34/uv-x86_64-pc-windows-msvc.zip"), sha256: Cow::Borrowed("d237ebacb6f4a651fbad3af702f29b8262b825e070c87e9020d5164936459393") }, + UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 34, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.34/uv-x86_64-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("cee114bb3c73a4be5066660d71eea1ac996378f567ba69fb7f29c688289245cd") }, ]; From fab67a5c062f226a43f9410ded7fd812d59e1b65 Mon Sep 17 00:00:00 2001 From: "Mikkel A. Madsen" Date: Sat, 10 Aug 2024 12:08:41 +0000 Subject: [PATCH 12/19] fix: requiement -> requirements typo in add.md (#1322) Just fixing a small typo with the text: `requiement` -> `requirement` --- docs/guide/commands/add.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guide/commands/add.md b/docs/guide/commands/add.md index 4c51c7a7c8..6875900c8b 100644 --- a/docs/guide/commands/add.md +++ b/docs/guide/commands/add.md @@ -2,7 +2,7 @@ Adds a Python package to this project. The command takes a PEP 508 requirement string but provides additional helper arguments to make this process more user friendly. For -instance instead of passing git references within the requiement string, the `--git` +instance instead of passing git references within the requirement string, the `--git` parameter can be used. If auto sync is disabled, after a dependency is added it's not automatically From 53fdc7d02bbb9558767059b39a653a0a6637029a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 11 Aug 2024 02:06:16 +0000 Subject: [PATCH 13/19] Sync UV Releases (#1325) --- rye/src/sources/generated/uv_downloads.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rye/src/sources/generated/uv_downloads.inc b/rye/src/sources/generated/uv_downloads.inc index 002dccd489..1a5c69b522 100644 --- a/rye/src/sources/generated/uv_downloads.inc +++ b/rye/src/sources/generated/uv_downloads.inc @@ -2,11 +2,11 @@ // To regenerate, run `rye run uv-downloads > rye/src/sources/generated/uv_downloads.inc` from the root of the repository. use std::borrow::Cow; pub const UV_DOWNLOADS: &[UvDownload] = &[ - UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 0, minor: 2, patch: 34, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.34/uv-aarch64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("2eebf71aa924d8d977983394c212cb3ad99f6e241e77702822e8f407c8e231e0") }, - UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 34, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.34/uv-aarch64-unknown-linux-musl.tar.gz"), sha256: Cow::Borrowed("227cd1dabb4ebb98e51c1b7735fa94dea96e14db7efb2d3d76b48c87a61a3d28") }, - UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("windows"), major: 0, minor: 2, patch: 34, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.34/uv-i686-pc-windows-msvc.zip"), sha256: Cow::Borrowed("34035c24e9c6dcf1164f10fee22e12fd03b329479233986909458df3259cf22f") }, - UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 34, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.34/uv-i686-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("99c3873d4bc3816c383c0e2686de1066be1ca8ff546e29e418e435296df13ae0") }, - UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 0, minor: 2, patch: 34, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.34/uv-x86_64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("62764007f4553f3677ef86e864097405d1b054e8a62e89f047e545816347491c") }, - UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 0, minor: 2, patch: 34, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.34/uv-x86_64-pc-windows-msvc.zip"), sha256: Cow::Borrowed("d237ebacb6f4a651fbad3af702f29b8262b825e070c87e9020d5164936459393") }, - UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 34, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.34/uv-x86_64-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("cee114bb3c73a4be5066660d71eea1ac996378f567ba69fb7f29c688289245cd") }, + UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 0, minor: 2, patch: 35, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.35/uv-aarch64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("e07fd0ed3b5e92ce9018f8775aa76cfd891fae8cb0a1627d5a861158fdbbe32a") }, + UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 35, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.35/uv-aarch64-unknown-linux-musl.tar.gz"), sha256: Cow::Borrowed("b8c920e4d335f09ab032087e0f27b4beda00248577ae708fbebf0362f7b19818") }, + UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("windows"), major: 0, minor: 2, patch: 35, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.35/uv-i686-pc-windows-msvc.zip"), sha256: Cow::Borrowed("2bd193bb68095b21b86a1126a6fe7740a36bd76cdbb606f51b0da6f19214487a") }, + UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 35, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.35/uv-i686-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("44719f49c7e7d634db35d9656f2f168fc13042ab87ee9afe8f04c864a3c341b9") }, + UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 0, minor: 2, patch: 35, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.35/uv-x86_64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("f8159e1977b00cf99e120858253ee675a66669b820e63af7f7e7e91cf6a3b9da") }, + UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 0, minor: 2, patch: 35, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.35/uv-x86_64-pc-windows-msvc.zip"), sha256: Cow::Borrowed("1bbb2a9a81f609a5f257ed066e25902bba995ca2ade3cbd4839703ffbd221071") }, + UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 35, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.35/uv-x86_64-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("f1a9bcbcc3e085fb5ee6a79f5778373fe27fa192d95fc47db20c596789dd1b97") }, ]; From 2747e04b08c381edf6edd9b830e53d37b1cb2cee Mon Sep 17 00:00:00 2001 From: Arnaud Venturi Date: Wed, 21 Aug 2024 02:22:59 +0200 Subject: [PATCH 14/19] Typo in FAQ (#1330) --- docs/guide/faq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guide/faq.md b/docs/guide/faq.md index b5b83482ed..c2c2d00ee5 100644 --- a/docs/guide/faq.md +++ b/docs/guide/faq.md @@ -138,7 +138,7 @@ Standalone Python Builds documentation for solutions. ## Can I use Rye Alongside Other Python Installations? -Rye given it's experimental nature does not want to disrupt already existing Python +Rye given its experimental nature does not want to disrupt already existing Python workflows. As such using it alongside other Python installations is intentionally supported. Even if the Rye shims come first on the `PATH`, Rye will automatically resolve to a different Python installation on the search path when invoked in a From 04fa587d9848f0f4c0eecde759948c0ac46fc934 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 20:55:05 -0400 Subject: [PATCH 15/19] Sync Python Releases (#1336) --- .../sources/generated/python_downloads.inc | 54 ++++++++++--------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/rye/src/sources/generated/python_downloads.inc b/rye/src/sources/generated/python_downloads.inc index bc32a7a704..68bf3280e9 100644 --- a/rye/src/sources/generated/python_downloads.inc +++ b/rye/src/sources/generated/python_downloads.inc @@ -101,6 +101,12 @@ pub const PYTHON_VERSIONS: &[(PythonVersion, &str, Option<&str>)] = &[ (PythonVersion { name: Cow::Borrowed("pypy"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("linux"), major: 3, minor: 7, patch: 9, suffix: None }, "https://downloads.python.org/pypy/pypy3.7-v7.3.3-linux32.tar.bz2", Some("7d81b8e9fcd07c067cfe2f519ab770ec62928ee8787f952cadf2d2786246efc8")), (PythonVersion { name: Cow::Borrowed("pypy"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 7, patch: 9, suffix: None }, "https://downloads.python.org/pypy/pypy3.7-v7.3.3-linux64.tar.bz2", Some("37e2804c4661c86c857d709d28c7de716b000d31e89766599fdf5a98928b7096")), (PythonVersion { name: Cow::Borrowed("pypy"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 7, patch: 9, suffix: None }, "https://downloads.python.org/pypy/pypy3.7-v7.3.3-osx64.tar.bz2", Some("d72b27d5bb60813273f14f07378a08822186a66e216c5d1a768ad295b582438d")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 12, patch: 5, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.12.5%2B20240814-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("bf5b434987f3eb7fb65111e7dbf24d82e961ef4e95400e54721035c0904b42c8")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 12, patch: 5, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.12.5%2B20240814-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("40b7a9bddca90217102e07f5bc2747c75534a1cced299d176a9c0901251a691b")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 12, patch: 5, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.12.5%2B20240814-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("4b0f8e4bcd280fb595c2bbba8d1ae37831c989d2b301b5cefe9fba5e51b506b6")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 12, patch: 5, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.12.5%2B20240814-x86_64-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("e4c7b70f1c8b8ff062f567e048777f55cc9d2a98dd6b71abaf8b10a0e1670906")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 12, patch: 5, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.12.5%2B20240814-x86_64-apple-darwin-pgo%2Blto-full.tar.zst", Some("0556dccef4c94637d6f4f7f645608b72db0a64c43c3a59cf0d9ec021ddf75a30")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 12, patch: 5, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.12.5%2B20240814-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst", Some("a7ddc238799f15c25ac6d4ff7bec3464d9fa8b5e8cf13dad434d89afd0697a1d")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 12, patch: 4, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.12.4%2B20240726-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("05cbc91569f94a07f96a7ae04b62e19a9d7a3e74400d7d6b5b042f17285d2601")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 12, patch: 4, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.12.4%2B20240726-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("3b017ab70e2f11b95d909317fc4e76c000ece588461058a642bf74db77cec267")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 12, patch: 4, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.12.4%2B20240726-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("4d321e97e499610c887da89682c796967dba9337a1102e9e5d98d65cef5dde52")), @@ -131,12 +137,12 @@ pub const PYTHON_VERSIONS: &[(PythonVersion, &str, Option<&str>)] = &[ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 12, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.12.0%2B20231002-x86_64-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("5ce861907a2751a3a7395b1aaada830c2b072acc03f3dd0bcbaaa2b7a9166fc0")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 12, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.12.0%2B20231002-x86_64-apple-darwin-pgo%2Blto-full.tar.zst", Some("3b4781e7fd4efabe574ba0954e54c35c7d5ac4dc5b2990b40796c1c6aec67d79")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 12, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20231002/cpython-3.12.0%2B20231002-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst", Some("5bdff7ed56550d96f9b26a27a8c25f0cc58a03bff19e5f52bba84366183cab8b")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.11.9%2B20240726-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("6ec00fd43c8b1e4ff81944f9c641a4a6a85024bb84bfeff6615f6f19047daca5")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.11.9%2B20240726-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("38ef401284a94090fb5fb52a841ed142c7726857d121d5578ca7926c8643c148")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.11.9%2B20240726-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("eda4f3eb3c19361d0664b83e74c31e3c784e28a6efa5f3322fed409a167c9b44")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.11.9%2B20240726-x86_64-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("ee7ab314b049db55e5c518d1ad5fd4564f55cf79646a4bf97d6b79e3e5ff688a")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.11.9%2B20240726-x86_64-apple-darwin-pgo%2Blto-full.tar.zst", Some("98e6204582b0b6330c97dc2f77ae87163cb12262345ef787c53b68b8a1953d05")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.11.9%2B20240726-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst", Some("a666503ab9ea3852b9bdaa905003bb4e5d682405c715bf7a025c33ce6258c1de")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.11.9%2B20240814-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("63cd27b797589b66689c5be6495c707311d8272b284ad20faff1814b00134ac7")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.11.9%2B20240814-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("6436b83fed284af320743f6f5148ab3decbdc054531b40848977a5fa2347ca44")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.11.9%2B20240814-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("88e3238b59aad1b624f0c45c058059e5c582e686563e3993b1b1dadddfa3fe1d")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.11.9%2B20240814-x86_64-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("73b3bef1220efcfd61dec42af94b9792937fe388bcc7064017c8f3b8e4636187")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.11.9%2B20240814-x86_64-apple-darwin-pgo%2Blto-full.tar.zst", Some("2caa7756679ec65a795b99e306de00ea0a4069bd7b1d6ec45df89d6e37a29577")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 11, patch: 9, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.11.9%2B20240814-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst", Some("7766550c42ce59d53b1dd49e9d698d762c9e5a743c7a57d6d7114ff7d266e131")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 11, patch: 8, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.11.8%2B20240224-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("1d84ed69e5acce555513e9261ce4b78bed19969b06a51a26b2781a375d70083d")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 11, patch: 8, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.11.8%2B20240224-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("c0650884b929253b8688797d1955850f6e339bf0428b3d935f62ab3159f66362")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 11, patch: 8, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.11.8%2B20240224-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("c3e90962996177a027bd73dd9fd8c42a2d6ef832cda26db4ab4efc6105160537")), @@ -183,12 +189,12 @@ pub const PYTHON_VERSIONS: &[(PythonVersion, &str, Option<&str>)] = &[ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 11, patch: 1, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20230116/cpython-3.11.1%2B20230116-x86_64-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("02332441cb610b1e1aa2d2972e261e2910cc6a950b7973cac22c0759a93c5fcd")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 11, patch: 1, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20230116/cpython-3.11.1%2B20230116-x86_64-apple-darwin-pgo%2Blto-full.tar.zst", Some("0eb61be53ee13cf75a30b8a164ef513a2c7995b25b118a3a503245d46231b13a")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 11, patch: 1, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20230116/cpython-3.11.1%2B20230116-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst", Some("f5c46fffda7d7894b975af728f739b02d1cec50fd4a3ea49f69de9ceaae74b17")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.10.14%2B20240726-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("7f0682fe77d4ac8d44bac73c592d5bba976f204d938e22342c26aafcc1016960")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.10.14%2B20240726-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("f20dbd7b1f18ebf7f4cb5f1768e6525a2f328d53e8b6a7e29664418c8478ce70")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.10.14%2B20240726-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("99fef0c517830a5b683f213f19b2730293e03e5dca81db1a4e6b97c96e6b885d")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.10.14%2B20240726-x86_64-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("d030c3f4391c31769f8ee53a70f73de7bebb297606812c5e4587240fd0afd5b1")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.10.14%2B20240726-x86_64-apple-darwin-pgo%2Blto-full.tar.zst", Some("51b73993fc99f1c6e5d9fb0b70857b50183c4e1947d4ebee50fafed55152cb5b")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.10.14%2B20240726-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst", Some("457057db6e97d525c0dcde425ed88f5b7fb9fe75fbfc79a4aa3b15a14cba5710")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.10.14%2B20240814-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("56183ed135dbdaaa6b189a6b0e6b6bcf3f26074297721bdbe9648cdc5247937c")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.10.14%2B20240814-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("ca1bf0cf71ef42a302bc9df6096ac6ae399b971b426e7b620481d86b00fffa8c")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.10.14%2B20240814-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("49ba7ea8de4ca7369be9c3415712d789db3caaa4c6c0530ce94d2db5b4e145cd")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.10.14%2B20240814-x86_64-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("e80e39be6f3fe2620c210889d13041aac16573ebac103f7bbaafeedc0d8fc253")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.10.14%2B20240814-x86_64-apple-darwin-pgo%2Blto-full.tar.zst", Some("75b7453594f41a4d6e50efb643b1717067642ad3cd85fc6151dec1d4fcb15810")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 10, patch: 14, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.10.14%2B20240814-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst", Some("ffd0f253678f20580acb90680138d990f37518cbb622e5a4032759d5b06ff9fe")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 10, patch: 13, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.10.13%2B20240224-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("7f23a4afa4032a7c5a4e0ec926da37eea242472142613c2baa029ef61c3c493c")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 10, patch: 13, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.10.13%2B20240224-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("57b83a4aa32bdbe7611f1290313ef24f2574dff5fa59181c0ccb26c14c688b73")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("linux"), major: 3, minor: 10, patch: 13, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20230826/cpython-3.10.13%2B20230826-i686-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("cc5625a16fbec682d4ce40c0d185318164bd181efaa7eaf945ca63015db9fea3")), @@ -273,12 +279,12 @@ pub const PYTHON_VERSIONS: &[(PythonVersion, &str, Option<&str>)] = &[ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 10, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20211017/cpython-3.10.0-x86_64-unknown-linux-gnu-pgo%2Blto-20211017T1616.tar.zst", None), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 10, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20211017/cpython-3.10.0-x86_64-apple-darwin-pgo%2Blto-20211017T1616.tar.zst", None), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 10, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20211017/cpython-3.10.0-x86_64-pc-windows-msvc-shared-pgo-20211017T1616.tar.zst", None), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.9.19%2B20240726-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("163c4b78ed43fd46012fba8601089365e568fbdf09dd8530c0a43fa95c9ab02c")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.9.19%2B20240726-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("7f04e96ebd9fbde4c18d1adedc1c3a3804df8919c088fdb33b1dd44a68632e39")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.9.19%2B20240726-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("1746133bdb6312a3c839c752d94edaaa4ceff6bbfe05d9dac5cf183e1d28346b")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.9.19%2B20240726-x86_64-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("179470b65a70f77189adb5637ccc8fa5ee443fc88d74113ce0e60b5d8548bf49")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.9.19%2B20240726-x86_64-apple-darwin-pgo%2Blto-full.tar.zst", Some("e76c9bfa292a2fbff0e47664571f52000f494155cd195f8d8e483b8d2d1af23f")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.9.19%2B20240726-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst", Some("2ddd1ea39dd2ad56c774749698364256630eb95a7ca71b1c7a3af9ed2ecaa5fb")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.9.19%2B20240814-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("0d5edd43f3219744be8476f3ff2ab93af852647ff13e344622e83ca26634688d")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.9.19%2B20240814-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("f3a918ec61e0c1676c56cb2e3a29fce733cf0a082bb2577ce12a27f7303c1098")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.9.19%2B20240814-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("077c61230bc95673e95edd1e9cf43a8b2953470f8c83c50cd89bad08e530aa2b")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.9.19%2B20240814-x86_64-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("ad5bd8e0eb95af34ba09c64a2aab1a5f3bdc0bf102501e0bb6a619c25583e55a")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.9.19%2B20240814-x86_64-apple-darwin-pgo%2Blto-full.tar.zst", Some("cb7df2cb1ccdb9b5d24a7dc4de2b1183ea0344c9048da2393bc0bd8e5dc96cca")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 9, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.9.19%2B20240814-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst", Some("f807820ac0f84735e8c4125d590093712252015398a1f4c7ff9795502f511ab4")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 9, patch: 18, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.9.18%2B20240224-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("93d7b15bf02a3191cfdee9d9d68bf2da782fc04cb142bcca6a4299fe524d9b37")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 9, patch: 18, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.9.18%2B20240224-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("579f9b68bbb3a915cbab9682e4d3c253bc96b0556b8a860982c49c25c61f974a")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("linux"), major: 3, minor: 9, patch: 18, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20230826/cpython-3.9.18%2B20230826-i686-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("9e40a541b4eb6eb0a5e2f35724a18332aea91c61e18dec77ca40da5cf2496839")), @@ -387,12 +393,12 @@ pub const PYTHON_VERSIONS: &[(PythonVersion, &str, Option<&str>)] = &[ (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 9, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20201020/cpython-3.9.0-x86_64-unknown-linux-gnu-pgo-20201020T0627.tar.zst", None), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 9, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20201020/cpython-3.9.0-x86_64-apple-darwin-pgo-20201020T0626.tar.zst", None), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 9, patch: 0, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20201020/cpython-3.9.0-x86_64-pc-windows-msvc-shared-pgo-20201021T0245.tar.zst", None), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.8.19%2B20240726-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("a69135d4436f78ffb771bb1b3e26c89cc1747ff77cb8d4c5e23ccdaabcba7e59")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.8.19%2B20240726-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("005c2439b581cf6e5de1e79a62d5a36246d07e2d5579b818a6af24d53821feae")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.8.19%2B20240726-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("3cdc8c3ed907968fc2760147e44134a39cd1c3558327faa682934d09e524b0e3")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.8.19%2B20240726-x86_64-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("8675f055d1815dcbe5de94e7f4c84b0942ace527e4e1639b561f1672b517263f")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.8.19%2B20240726-x86_64-apple-darwin-pgo%2Blto-full.tar.zst", Some("d9ded43a6a5be03e770ad7e2f1a4c44e67401ed7218a2081677fa4ba7cb3e61f")), - (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240726/cpython-3.8.19%2B20240726-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst", Some("d75c18671e28ad698a32e589ca043b2cc0fff1cf7bae8f71501df68cd01e3a86")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.8.19%2B20240814-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("d57b944f770579a2c24b34880843318135ddc816ccb67d9a7022b2c00b2c897e")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.8.19%2B20240814-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("43f3b6d7816448b44f86d2186dba1b7418533a3f4a37d07e5075bb934bcfba76")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.8.19%2B20240814-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("8f69364b8421a51a71da5e897d4f59d0659f18b354896d28c79756de6011c21c")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.8.19%2B20240814-x86_64-unknown-linux-gnu-pgo%2Blto-full.tar.zst", Some("adbe33a5f9a6d3cd05ef90ca2aed7db8d0002492cfdfe81c24cabf6e6e6aacee")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.8.19%2B20240814-x86_64-apple-darwin-pgo%2Blto-full.tar.zst", Some("04c2aca9f8ecceb4f72775d104586608489a016439e4a361d967748bde4949fd")), + (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 3, minor: 8, patch: 19, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240814/cpython-3.8.19%2B20240814-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst", Some("31ff501b345a4054a4eb6a886b4d2799bd11b15afe7338dc2f2e5f2a123f4dba")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 3, minor: 8, patch: 18, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.8.18%2B20240224-aarch64-unknown-linux-gnu-lto-full.tar.zst", Some("df66801678a5f4accee67784aff058f283fd52e42898527b7ff0e1cbc3e50e8c")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 3, minor: 8, patch: 18, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.8.18%2B20240224-aarch64-apple-darwin-pgo%2Blto-full.tar.zst", Some("c732c068cddcd6a008c1d6d8e35802f5bdc7323bd2eb64e77210d3d5fe4740c2")), (PythonVersion { name: Cow::Borrowed("cpython"), arch: Cow::Borrowed("x86"), os: Cow::Borrowed("windows"), major: 3, minor: 8, patch: 18, suffix: None }, "https://github.com/indygreg/python-build-standalone/releases/download/20240224/cpython-3.8.18%2B20240224-i686-pc-windows-msvc-shared-pgo-full.tar.zst", Some("9f94c7b54b97116cd308e73cda0b7a7b7fff4515932c5cbba18eeae9ec798351")), From d271eeff8bdae26ef1e1918064f065ad0662a6f9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2024 01:01:42 +0000 Subject: [PATCH 16/19] Sync UV Releases (#1332) --- rye/src/sources/generated/uv_downloads.inc | 14 +++++++------- rye/tests/test_add.rs | 3 +-- rye/tests/test_sync.rs | 6 ++---- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/rye/src/sources/generated/uv_downloads.inc b/rye/src/sources/generated/uv_downloads.inc index 1a5c69b522..3739dd67a2 100644 --- a/rye/src/sources/generated/uv_downloads.inc +++ b/rye/src/sources/generated/uv_downloads.inc @@ -2,11 +2,11 @@ // To regenerate, run `rye run uv-downloads > rye/src/sources/generated/uv_downloads.inc` from the root of the repository. use std::borrow::Cow; pub const UV_DOWNLOADS: &[UvDownload] = &[ - UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 0, minor: 2, patch: 35, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.35/uv-aarch64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("e07fd0ed3b5e92ce9018f8775aa76cfd891fae8cb0a1627d5a861158fdbbe32a") }, - UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 35, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.35/uv-aarch64-unknown-linux-musl.tar.gz"), sha256: Cow::Borrowed("b8c920e4d335f09ab032087e0f27b4beda00248577ae708fbebf0362f7b19818") }, - UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("windows"), major: 0, minor: 2, patch: 35, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.35/uv-i686-pc-windows-msvc.zip"), sha256: Cow::Borrowed("2bd193bb68095b21b86a1126a6fe7740a36bd76cdbb606f51b0da6f19214487a") }, - UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 35, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.35/uv-i686-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("44719f49c7e7d634db35d9656f2f168fc13042ab87ee9afe8f04c864a3c341b9") }, - UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 0, minor: 2, patch: 35, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.35/uv-x86_64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("f8159e1977b00cf99e120858253ee675a66669b820e63af7f7e7e91cf6a3b9da") }, - UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 0, minor: 2, patch: 35, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.35/uv-x86_64-pc-windows-msvc.zip"), sha256: Cow::Borrowed("1bbb2a9a81f609a5f257ed066e25902bba995ca2ade3cbd4839703ffbd221071") }, - UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 0, minor: 2, patch: 35, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.2.35/uv-x86_64-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("f1a9bcbcc3e085fb5ee6a79f5778373fe27fa192d95fc47db20c596789dd1b97") }, + UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("macos"), major: 0, minor: 3, patch: 0, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.3.0/uv-aarch64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("232935b3b2c187c4f8dc8bf533875bd7163d06a6fab625a1770689b337cbfded") }, + UvDownload {arch: Cow::Borrowed("aarch64"), os: Cow::Borrowed("linux"), major: 0, minor: 3, patch: 0, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.3.0/uv-aarch64-unknown-linux-musl.tar.gz"), sha256: Cow::Borrowed("55bc78ee396f3b9847d28a83edbeeb557edd78462b782459d95fa9cad86cca5e") }, + UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("windows"), major: 0, minor: 3, patch: 0, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.3.0/uv-i686-pc-windows-msvc.zip"), sha256: Cow::Borrowed("1dbe4b2b9829bb11cdb3ec64e916749f6224f0db0a65bbba69570a8aa1289e2c") }, + UvDownload {arch: Cow::Borrowed("i686"), os: Cow::Borrowed("linux"), major: 0, minor: 3, patch: 0, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.3.0/uv-i686-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("b5a7fb7e649de9fb0342fd42c3bb1c5e6dd25d96096e08af99caa276fa44dc07") }, + UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("macos"), major: 0, minor: 3, patch: 0, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.3.0/uv-x86_64-apple-darwin.tar.gz"), sha256: Cow::Borrowed("8f3abf9bc7f49ddf85b1ebb4e5a5dd2032b6e7a4492fb5fce4b70ee4a9938733") }, + UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("windows"), major: 0, minor: 3, patch: 0, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.3.0/uv-x86_64-pc-windows-msvc.zip"), sha256: Cow::Borrowed("b8b693699b46d2063cf92ada07671a309f14ccb99b34f9b3f927f7fa08b24c19") }, + UvDownload {arch: Cow::Borrowed("x86_64"), os: Cow::Borrowed("linux"), major: 0, minor: 3, patch: 0, suffix: None, url: Cow::Borrowed("https://github.com/astral-sh/uv/releases/download/0.3.0/uv-x86_64-unknown-linux-gnu.tar.gz"), sha256: Cow::Borrowed("06e38986b2923882ad250ac42c9e5db3295bde33693aa9a63b8d32632daba007") }, ]; diff --git a/rye/tests/test_add.rs b/rye/tests/test_add.rs index ea4ca29c74..1f3a36ac5d 100644 --- a/rye/tests/test_add.rs +++ b/rye/tests/test_add.rs @@ -219,8 +219,7 @@ fn test_add_explicit_version_or_url() { Prepared 2 packages in [EXECUTION_TIME] Uninstalled 1 package in [EXECUTION_TIME] Installed 2 packages in [EXECUTION_TIME] - - my-project==0.1.0 (from file:[TEMP_PATH]/project) - + my-project==0.1.0 (from file:[TEMP_PATH]/project) + ~ my-project==0.1.0 (from file:[TEMP_PATH]/project) + pip==1.3.1 (from https://github.com/pypa/pip/archive/1.3.1.zip#sha1=da9234ee9982d4bbb3c72346a6de940a148ea686) "###); } diff --git a/rye/tests/test_sync.rs b/rye/tests/test_sync.rs index 5bf4b8f64b..74c8fdcc13 100644 --- a/rye/tests/test_sync.rs +++ b/rye/tests/test_sync.rs @@ -175,8 +175,7 @@ fn test_autosync_remember() { + itsdangerous==2.1.2 + jinja2==3.1.2 + markupsafe==2.1.3 - - my-project==0.1.0 (from file:[TEMP_PATH]/project) - + my-project==0.1.0 (from file:[TEMP_PATH]/project) + ~ my-project==0.1.0 (from file:[TEMP_PATH]/project) + werkzeug==3.0.1 "###); assert_snapshot!(std::fs::read_to_string(space.project_path().join("requirements.lock")).unwrap(), @r###" @@ -221,8 +220,7 @@ fn test_autosync_remember() { Prepared 2 packages in [EXECUTION_TIME] Uninstalled 1 package in [EXECUTION_TIME] Installed 2 packages in [EXECUTION_TIME] - - my-project==0.1.0 (from file:[TEMP_PATH]/project) - + my-project==0.1.0 (from file:[TEMP_PATH]/project) + ~ my-project==0.1.0 (from file:[TEMP_PATH]/project) + urllib3==2.1.0 "###); From bf3ccf8187627d43cd11c83a92c8bd615f163637 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Tue, 20 Aug 2024 21:20:06 -0400 Subject: [PATCH 17/19] Prep for v0.39.0 release (#1344) --- CHANGELOG.md | 10 ++++++++++ Cargo.lock | 2 +- rye/Cargo.toml | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7713c136fa..71c2ce2b83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,16 @@ that were not yet released. +## 0.39.0 + +Released on 2024-08-20. + +* Update Cargo dependencies by @charliermarsh in https://github.com/astral-sh/rye/pull/1310 +* Fix typo in `add.md` by @mikkelam in https://github.com/astral-sh/rye/pull/1322 +* Fix typo in FAQ by @toadjaune in https://github.com/astral-sh/rye/pull/1330 +* Update Python releases to include Python 3.12.4 by @github-actions in https://github.com/astral-sh/rye/pull/1336 +* Update bundled uv version to `v0.3.0` by @github-actions in https://github.com/astral-sh/rye/pull/1332 + ## 0.38.0 Released on 2024-08-01. diff --git a/Cargo.lock b/Cargo.lock index 346a0f10d6..e1a1be7c98 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1819,7 +1819,7 @@ dependencies = [ [[package]] name = "rye" -version = "0.38.0" +version = "0.39.0" dependencies = [ "age", "anyhow", diff --git a/rye/Cargo.toml b/rye/Cargo.toml index 8b697f3853..4721fda01d 100644 --- a/rye/Cargo.toml +++ b/rye/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rye" -version = "0.38.0" +version = "0.39.0" edition = "2021" license = "MIT" From 2c690505e955fd9c5773b4059aee05269a90b49d Mon Sep 17 00:00:00 2001 From: nazq Date: Tue, 20 Aug 2024 22:33:01 -0400 Subject: [PATCH 18/19] Remove pip-tools, use uv for all operations (#1226) --- docs/guide/config.md | 5 - docs/guide/docker.md | 34 ++++-- docs/guide/rust.md | 8 -- docs/guide/sync.md | 29 +++--- docs/philosophy.md | 15 ++- rye/src/bootstrap.rs | 5 +- rye/src/cli/add.rs | 220 +++------------------------------------ rye/src/cli/build.rs | 24 ++--- rye/src/cli/list.rs | 48 +++------ rye/src/cli/mod.rs | 9 +- rye/src/cli/rye.rs | 17 --- rye/src/cli/toolchain.rs | 11 +- rye/src/config.rs | 14 +-- rye/src/installer.rs | 73 ++++--------- rye/src/lock.rs | 116 +++++---------------- rye/src/main.rs | 1 - rye/src/piptools.rs | 104 ------------------ rye/src/sync.rs | 135 +++++------------------- rye/src/utils/mod.rs | 2 +- rye/src/uv.rs | 28 +---- 20 files changed, 180 insertions(+), 718 deletions(-) delete mode 100644 rye/src/piptools.rs diff --git a/docs/guide/config.md b/docs/guide/config.md index bda7499c7c..f21d8578a4 100644 --- a/docs/guide/config.md +++ b/docs/guide/config.md @@ -81,11 +81,6 @@ force-rye-managed = false # virtual environments. global-python = false -# When set to `true`, Rye will use `uv` for package resolution and installation. -# Set to `false` to fall back to the `pip-tools` resolver. -# Learn more about uv here: https://github.com/astral-sh/uv -use-uv = true - # Enable or disable automatic `sync` after `add` and `remove`. This defaults # to `true` when uv is enabled and `false` otherwise. autosync = true diff --git a/docs/guide/docker.md b/docs/guide/docker.md index 56e7dd5ea3..84fa595a63 100644 --- a/docs/guide/docker.md +++ b/docs/guide/docker.md @@ -14,11 +14,26 @@ This guide requires some familiarity with Docker and Dockerfiles. - Your `pyproject.toml` should contain `virtual = true` under the `[tool.rye]` section. If it's not there, add it and run `rye sync`. - If you're just setting up a project, run `rye init --virtual` instead of `rye init`. -1. Create a `Dockerfile` in your project root with the following content: +2. Create a `Dockerfile` in your project root with the following content, using [`uv`](https://github.com/astral-sh/uv): ```Dockerfile FROM python:slim + RUN pip install uv + + WORKDIR /app + COPY requirements.lock ./ + uv pip install --no-cache -r requirements.lock + + COPY src . + CMD python main.py + ``` + + Or, using `pip`: + + ```Dockerfile + FROM python:slim + WORKDIR /app COPY requirements.lock ./ RUN PYTHONDONTWRITEBYTECODE=1 pip install --no-cache-dir -r requirements.lock @@ -27,7 +42,7 @@ This guide requires some familiarity with Docker and Dockerfiles. CMD python main.py ``` -2. You can now build your image like this: +3. You can now build your image like this: ```bash docker build . @@ -56,11 +71,12 @@ The `Dockerfile`s in this guide are examples. Some adjustments you might want to If your code is an installable package, it's recommended that you first build it, then install it inside your Docker image. This way you can be sure that the image is exactly the same as what a user installation would be. -An example `Dockerfile` might look like this: +An example `Dockerfile` might look like this with [`uv`](https://github.com/astral-sh/uv): ```Dockerfile FROM python:slim -RUN --mount=source=dist,target=/dist PYTHONDONTWRITEBYTECODE=1 pip install --no-cache-dir /dist/*.whl +RUN pip install uv +RUN --mount=source=dist,target=/dist uv pip install --no-cache /dist/*.whl CMD python -m my_package ``` @@ -78,8 +94,12 @@ The [Dockerfile adjustments from the previous section](#dockerfile-adjustments) ## Explanations -Rye's lock file standard is the `requirements.txt` format from `pip`, so you don't actually need `rye` in your container to be able to install dependencies. +Rye's lockfile standard is the `requirements.txt` format from `pip` (and used by [`uv`](https://github.com/astral-sh/uv)), so you don't actually need `rye` in your container to be able to install dependencies. This makes the Dockerfile much simpler and avoids the necessity for multi-stage builds if small images are desired. -The `PYTHONDONTWRITEBYTECODE=1` env var and `--no-cache-dir` parameters when invoking Pip both make the image smaller by not writing any temporary files. -Both Bytecode and Pip caches are speeding things up when running Pip multiple times, but since we are working in a container, we can be pretty sure that we'll never invoke pip again. +The `--no-cache-dir` and `--no-cache` parameters, passed to `pip` and `uv` respectively, make the image smaller by not +writing any temporary files. While caching can speed up subsequent builds, it's not necessary in a container where the +image is built once and then used many times. + +Similarly, the `PYTHONDONTWRITEBYTECODE=1` environment variable is set to avoid writing `.pyc` files, which are not +needed in a container. (`uv` skips writing `.pyc` files by default.) diff --git a/docs/guide/rust.md b/docs/guide/rust.md index b0b13a5846..55b1ebfdd1 100644 --- a/docs/guide/rust.md +++ b/docs/guide/rust.md @@ -41,14 +41,6 @@ it as a global tool: rye install maturin ``` -Note that `maturin develop` requires `pip` to be installed into the virtualenv. Before -you can use it you need to add it: - -``` -rye add --dev pip -rye sync -``` - Rye recommends mixed python/rust modules. In that case you can save some valuable iteration time by running `maturin develop --skip-install`: diff --git a/docs/guide/sync.md b/docs/guide/sync.md index aa2438a380..4e2746e8cc 100644 --- a/docs/guide/sync.md +++ b/docs/guide/sync.md @@ -1,13 +1,9 @@ # Syncing and Locking -Rye supports two systems to manage dependencies: -[uv](https://github.com/astral-sh/uv) and -[pip-tools](https://github.com/jazzband/pip-tools). It currently defaults to -`uv` as it offers significantly better performance, but will offer you the -option to use `pip-tools` instead. +Rye uses [`uv`](https://github.com/astral-sh/uv) to manage dependencies. In order to download dependencies rye creates two "lockfiles" (called -`requirements.lock` and `requirements-dev.lock`). These are not real lockfiles +`requirements.lock` and `requirements-dev.lock`). These are not real lockfiles, but they fulfill a similar purpose until a better solution has been implemented. Whenever `rye sync` is called, it will update lockfiles as well as the @@ -66,12 +62,12 @@ rye lock Flask --pre +++ 0.18.0 By default (unless the `tool.rye.lock-with-sources` config key is set to `true` in the -`pyproject.toml`) lock files are not generated with source references. This means that -if custom sources are used the lock file cannot be installed via `pip` unless also +`pyproject.toml`) lockfiles are not generated with source references. This means that +if custom sources are used the lockfile cannot be installed via `uv` or `pip`, unless `--find-links` and other parameters are manually passed. This can be particularly useful -when the lock file is used for docker image builds. +when the lockfile is used for Docker image builds. -When this flag is passed then the lock file is generated with references to `--index-url`, +When this flag is passed then the lockfile is generated with references to `--index-url`, `--extra-index-url` or `--find-links`. ``` @@ -100,11 +96,18 @@ lockfile (`requirements-dev.lock`). rye sync --no-dev ``` -## Limitations +## Platform Compatibility -Lockfiles depend on the platform they were generated on. This is a known limitation -in pip-tools. +By default, lockfiles depend on the platform they were generated on. For example, if your project relies on platform-specific packages and you generate lockfiles on Windows, these lockfiles will include Windows-specific projects. Consequently, they won't be compatible with other platforms like Linux or macOS. + +To generate a cross-platform lockfile, you can enable uv's `universal` setting +by adding the following to your `pyproject.toml`: + +```toml +[tool.rye] +universal = true +``` diff --git a/docs/philosophy.md b/docs/philosophy.md index 44481d300e..6022030bd7 100644 --- a/docs/philosophy.md +++ b/docs/philosophy.md @@ -11,14 +11,13 @@ on my mind when I built it: of dependencies. Not even `pip` or `setuptools` are installed into it. Rye manages the virtualenv from outside the virtualenv. -- **No Core Non Standard Stuff:** Rye (with the exception of it's own `tool` section +- **No Core Non-Standard Stuff:** Rye (with the exception of its own `tool` section in the `pyproject.toml`) uses standardized keys. That means it uses regular requirements as you would expect. It also does not use a custom lock file - format and uses [`uv`](https://github.com/astral-sh/uv) and - [`pip-tools`](https://github.com/jazzband/pip-tools) behind the scenes. + format and uses [`uv`](https://github.com/astral-sh/uv). -- **No Pip:** Rye uses pip, but it does not expose it. It manages dependencies in - `pyproject.toml` only. +- **No Pip:** Rye uses [`uv`](https://github.com/astral-sh/uv) to manage dependencies, + through `pyproject.toml` only. - **No System Python:** I can't deal with any more linux distribution weird Python installations or whatever mess there is on macOS. I used to build my own Pythons @@ -53,10 +52,8 @@ lack of standardization. Here is what this project ran into over the years: which allows both remote and local references to co-exist and it rewrites them on publish. -- **No Exposed Pip:** pip is intentionally not exposed. If you were to install something - into the virtualenv, it disappears next time you sync. If you symlink `rye` to - `~/.rye/shims/pip` you can get access to pip without installing it into the - virtualenv. There be dragons. +- **No Exposed Pip:** pip is intentionally not exposed. If you install something + into the virtualenv with pip, it disappears next time you sync. - **No Workspace Spec:** for monorepos and things of that nature, the Python ecosystem would need a definition of workspaces. Today that does not exist which forces every diff --git a/rye/src/bootstrap.rs b/rye/src/bootstrap.rs index 18b1ffb9c5..f84fcf5b4e 100644 --- a/rye/src/bootstrap.rs +++ b/rye/src/bootstrap.rs @@ -12,7 +12,6 @@ use once_cell::sync::Lazy; use tempfile::tempdir_in; use crate::config::Config; -use crate::piptools::LATEST_PIP; use crate::platform::{ get_app_dir, get_canonical_py_path, get_python_bin_within, get_toolchain_python_bin, list_known_toolchains, @@ -154,8 +153,8 @@ pub fn ensure_self_venv_with_toolchain( let uv_venv = uv.venv(&venv_dir, &py_bin, &version, None)?; // write our marker uv_venv.write_marker()?; - // update pip and our requirements - uv_venv.update(LATEST_PIP, SELF_REQUIREMENTS)?; + // update our requirements + uv_venv.update_requirements(SELF_REQUIREMENTS)?; // Update the shims let shims = app_dir.join("shims"); diff --git a/rye/src/cli/add.rs b/rye/src/cli/add.rs index fc538b5b91..e181c88342 100644 --- a/rye/src/cli/add.rs +++ b/rye/src/cli/add.rs @@ -1,63 +1,22 @@ use std::env; use std::path::{Path, PathBuf}; -use std::process::{Command, Stdio}; use std::str::FromStr; use anyhow::{anyhow, bail, Context, Error}; use clap::{Parser, ValueEnum}; -use pep440_rs::{Operator, Version, VersionSpecifier, VersionSpecifiers}; +use pep440_rs::{Operator, VersionSpecifier, VersionSpecifiers}; use pep508_rs::{Requirement, VersionOrUrl}; -use serde::Deserialize; use url::Url; use crate::bootstrap::ensure_self_venv; use crate::config::Config; -use crate::consts::VENV_BIN; use crate::lock::KeyringProvider; use crate::pyproject::{BuildSystem, DependencyKind, ExpandedSources, PyProject}; use crate::sources::py::PythonVersion; use crate::sync::{autosync, sync, SyncOptions}; -use crate::utils::{format_requirement, get_venv_python_bin, set_proxy_variables, CommandOutput}; +use crate::utils::{format_requirement, get_venv_python_bin, CommandOutput}; use crate::uv::UvBuilder; -const PACKAGE_FINDER_SCRIPT: &str = r#" -import sys -import json -from unearth.finder import PackageFinder -from unearth.session import PyPISession -from packaging.version import Version - -py_ver = sys.argv[1] -package = sys.argv[2] -sources = json.loads(sys.argv[3]) -pre = len(sys.argv) > 4 and sys.argv[4] == "--pre" - -finder = PackageFinder( - index_urls=[x[0] for x in sources["index_urls"]], - find_links=sources["find_links"], - trusted_hosts=sources["trusted_hosts"], -) -if py_ver: - finder.target_python.py_ver = tuple(map(int, py_ver.split('.'))) -choices = iter(finder.find_matches(package)) -if not pre: - choices = (m for m in choices if not(m.version and Version(m.version).is_prerelease)) - -print(json.dumps([x.as_json() for x in choices])) -"#; - -#[derive(Deserialize, Debug)] -struct Match { - name: String, - version: Option, - link: Option, -} - -#[derive(Deserialize, Debug)] -struct Link { - requires_python: Option, -} - #[derive(Parser, Debug)] pub struct ReqExtras { /// Install the given package from this git repository @@ -155,7 +114,7 @@ impl ReqExtras { }; } else if let Some(ref path) = self.path { // For hatchling build backend, it use {root:uri} for file relative path, - // but this not supported by pip-tools, + // but this not supported by uv, // and use ${PROJECT_ROOT} will cause error in hatchling, so force absolute path. let is_hatchling = PyProject::discover()?.build_backend() == Some(BuildSystem::Hatchling); @@ -240,8 +199,7 @@ pub struct Args { pub fn execute(cmd: Args) -> Result<(), Error> { let output = CommandOutput::from_quiet_and_verbose(cmd.quiet, cmd.verbose); - let self_venv = ensure_self_venv(output).context("error bootstrapping venv")?; - let python_path = self_venv.join(VENV_BIN).join("python"); + ensure_self_venv(output).context("error bootstrapping venv")?; let cfg = Config::current(); let mut pyproject_toml = PyProject::discover()?; @@ -272,34 +230,16 @@ pub fn execute(cmd: Args) -> Result<(), Error> { } if !cmd.excluded { - if cfg.use_uv() { - sync(SyncOptions::python_only().pyproject(None)) - .context("failed to sync ahead of add")?; - resolve_requirements_with_uv( - &pyproject_toml, - &py_ver, - &mut requirements, - cmd.pre, - output, - &default_operator, - cmd.keyring_provider, - )?; - } else { - if cmd.keyring_provider != KeyringProvider::Disabled { - bail!("`--keyring-provider` option requires the uv backend"); - } - for requirement in &mut requirements { - resolve_requirements_with_unearth( - &pyproject_toml, - &python_path, - &py_ver, - requirement, - cmd.pre, - output, - &default_operator, - )?; - } - } + sync(SyncOptions::python_only().pyproject(None)).context("failed to sync ahead of add")?; + resolve_requirements_with_uv( + &pyproject_toml, + &py_ver, + &mut requirements, + cmd.pre, + output, + &default_operator, + cmd.keyring_provider, + )?; } for requirement in &requirements { @@ -332,138 +272,6 @@ pub fn execute(cmd: Args) -> Result<(), Error> { Ok(()) } -fn resolve_requirements_with_unearth( - pyproject_toml: &PyProject, - python_path: &PathBuf, - py_ver: &PythonVersion, - requirement: &mut Requirement, - pre: bool, - output: CommandOutput, - default_operator: &Operator, -) -> Result<(), Error> { - let matches = find_best_matches_with_unearth( - pyproject_toml, - python_path, - Some(py_ver), - requirement, - pre, - )?; - if matches.is_empty() { - let all_matches = - find_best_matches_with_unearth(pyproject_toml, python_path, None, requirement, pre) - .unwrap_or_default(); - if all_matches.is_empty() { - // if we did not consider pre-releases, maybe we could find it by doing so. In - // that case give the user a helpful warning before erroring. - if !pre { - let all_pre_matches = find_best_matches_with_unearth( - pyproject_toml, - python_path, - None, - requirement, - true, - ) - .unwrap_or_default(); - if let Some(pre) = all_pre_matches.into_iter().next() { - warn!( - "{} ({}) was found considering pre-releases. Pass --pre to allow use.", - pre.name, - pre.version.unwrap_or_default() - ); - } - bail!( - "did not find package '{}' without using pre-releases.", - format_requirement(requirement) - ); - } else { - bail!("did not find package '{}'", format_requirement(requirement)); - } - } else { - if output != CommandOutput::Quiet { - echo!("Available package versions:"); - for pkg in all_matches { - echo!( - " {} ({}) requires Python {}", - pkg.name, - pkg.version.unwrap_or_default(), - pkg.link - .as_ref() - .and_then(|x| x.requires_python.as_ref()) - .map_or("unknown", |x| x as &str) - ); - } - echo!("A possible solution is to raise the version in `requires-python` in `pyproject.toml`."); - } - bail!( - "did not find a version of package '{}' compatible with this version of Python.", - format_requirement(requirement) - ); - } - } - let m = matches.into_iter().next().unwrap(); - if m.version.is_some() && requirement.version_or_url.is_none() { - let version = Version::from_str(m.version.as_ref().unwrap()) - .map_err(|msg| anyhow!("invalid version: {}", msg))?; - requirement.version_or_url = Some(VersionOrUrl::VersionSpecifier( - VersionSpecifiers::from_iter(Some( - VersionSpecifier::new( - // local versions or versions with only one component cannot - // use ~= but need to use ==. - match *default_operator { - _ if version.is_local() => Operator::Equal, - Operator::TildeEqual if version.release.len() < 2 => { - Operator::GreaterThanEqual - } - ref other => other.clone(), - }, - Version::from_str(m.version.as_ref().unwrap()) - .map_err(|msg| anyhow!("invalid version: {}", msg))?, - false, - ) - .map_err(|msg| anyhow!("invalid version specifier: {}", msg))?, - )), - )); - } - requirement.name = m.name; - Ok(()) -} - -fn find_best_matches_with_unearth( - pyproject: &PyProject, - python_path: &PathBuf, - py_ver: Option<&PythonVersion>, - requirement: &Requirement, - pre: bool, -) -> Result, Error> { - let mut unearth = Command::new(python_path); - let sources = ExpandedSources::from_sources(&pyproject.sources()?)?; - - unearth - .arg("-c") - .arg(PACKAGE_FINDER_SCRIPT) - .arg(match py_ver { - Some(ver) => ver.format_simple(), - None => "".into(), - }) - .arg(format_requirement(requirement).to_string()) - .arg(serde_json::to_string(&sources)?); - if pre { - unearth.arg("--pre"); - } - set_proxy_variables(&mut unearth); - let unearth = unearth.stdout(Stdio::piped()).output()?; - if unearth.status.success() { - Ok(serde_json::from_slice(&unearth.stdout)?) - } else { - let log = String::from_utf8_lossy(&unearth.stderr); - bail!( - "failed to resolve package {}\n{}", - format_requirement(requirement), - log - ); - } -} - fn resolve_requirements_with_uv( pyproject_toml: &PyProject, py_ver: &PythonVersion, diff --git a/rye/src/cli/build.rs b/rye/src/cli/build.rs index 0d312fde13..3950ca7c7b 100644 --- a/rye/src/cli/build.rs +++ b/rye/src/cli/build.rs @@ -7,7 +7,6 @@ use clap::Parser; use console::style; use crate::bootstrap::{fetch, FetchOptions}; -use crate::config::Config; use crate::platform::get_toolchain_python_bin; use crate::pyproject::{locate_projects, PyProject}; @@ -65,7 +64,6 @@ pub fn execute(cmd: Args) -> Result<(), Error> { } } - let use_uv = Config::current().use_uv(); let projects = locate_projects(project, cmd.all, &cmd.package[..])?; let all_virtual = projects.iter().all(|p| p.is_virtual()); @@ -91,9 +89,6 @@ pub fn execute(cmd: Args) -> Result<(), Error> { uv_venv.write_marker()?; uv_venv.bootstrap()?; - // Respect the output level for the actual builds. - let uv = uv.with_output(output); - for project in projects { // skip over virtual packages on build if project.is_virtual() { @@ -114,14 +109,17 @@ pub fn execute(cmd: Args) -> Result<(), Error> { .arg(&out) .arg(&*project.root_path()); - if use_uv { - let uv_dir = uv - .uv_bin() - .parent() - .ok_or_else(|| anyhow!("Could not find uv binary in self venv: empty path"))?; - build_cmd.env("PATH", prepend_path_to_path_env(uv_dir)?); - build_cmd.arg("--installer=uv"); - } + // we need to ensure uv is available to use without installing it into self_venv + let uv = UvBuilder::new() + .with_output(output) + .ensure_exists()? + .with_output(output); + let uv_dir = uv + .uv_bin() + .parent() + .ok_or_else(|| anyhow!("Could not find uv binary in self venv: empty path"))?; + build_cmd.env("PATH", prepend_path_to_path_env(uv_dir)?); + build_cmd.arg("--installer=uv"); if cmd.wheel { build_cmd.arg("--wheel"); diff --git a/rye/src/cli/list.rs b/rye/src/cli/list.rs index 1620b1e289..bd7c2c46e4 100644 --- a/rye/src/cli/list.rs +++ b/rye/src/cli/list.rs @@ -1,12 +1,9 @@ use std::path::PathBuf; -use std::process::Command; -use anyhow::{bail, Error}; +use anyhow::Error; use clap::Parser; use crate::bootstrap::ensure_self_venv; -use crate::config::Config; -use crate::consts::VENV_BIN; use crate::pyproject::PyProject; use crate::utils::{get_venv_python_bin, CommandOutput}; use crate::uv::{UvBuilder, UvWithVenv}; @@ -25,36 +22,21 @@ pub fn execute(cmd: Args) -> Result<(), Error> { if !python.is_file() { return Ok(()); } - let self_venv = ensure_self_venv(CommandOutput::Normal)?; + let _ = ensure_self_venv(CommandOutput::Normal)?; - if Config::current().use_uv() { - let uv = UvBuilder::new() - .with_output(CommandOutput::Normal) - .ensure_exists()?; - if !project.rye_managed() { - UvWithVenv::new(uv, &project.venv_path(), &project.venv_python_version()?).freeze()?; - } else { - uv.venv( - &project.venv_path(), - &python, - &project.venv_python_version()?, - None, - )? - .freeze()?; - } + let uv = UvBuilder::new() + .with_output(CommandOutput::Normal) + .ensure_exists()?; + if !project.rye_managed() { + UvWithVenv::new(uv, &project.venv_path(), &project.venv_python_version()?).freeze()?; } else { - let status = Command::new(self_venv.join(VENV_BIN).join("pip")) - .arg("--python") - .arg(&python) - .arg("freeze") - .env("PYTHONWARNINGS", "ignore") - .env("PIP_DISABLE_PIP_VERSION_CHECK", "1") - .status()?; - - if !status.success() { - bail!("failed to print dependencies via pip"); - } - }; - + uv.venv( + &project.venv_path(), + &python, + &project.venv_python_version()?, + None, + )? + .freeze()?; + } Ok(()) } diff --git a/rye/src/cli/mod.rs b/rye/src/cli/mod.rs index 502000da81..ee5ece42b4 100644 --- a/rye/src/cli/mod.rs +++ b/rye/src/cli/mod.rs @@ -122,6 +122,13 @@ pub fn execute() -> Result<(), Error> { unreachable!() }; + // Add this to warn about the deprecated use of pip-tools + if !Config::current().use_uv() { + warn!( + "The `use-uv` setting is deprecated, as `pip-tools` support was removed in rye 0.40.0" + ); + } + match cmd { Command::Add(cmd) => add::execute(cmd), Command::Build(cmd) => build::execute(cmd), @@ -181,6 +188,6 @@ fn print_version() -> Result<(), Error> { ); } echo!("symlink support: {}", symlinks_supported()); - echo!("uv enabled: {}", Config::current().use_uv()); + echo!("uv enabled: {}", true); Ok(()) } diff --git a/rye/src/cli/rye.rs b/rye/src/cli/rye.rs index e1891297d7..87299b89a1 100644 --- a/rye/src/cli/rye.rs +++ b/rye/src/cli/rye.rs @@ -612,23 +612,6 @@ fn perform_install( return Err(QuietExit(1).into()); } - // Use uv? - if config_doc - .get("behavior") - .and_then(|x| x.get("use-uv")) - .is_none() - { - let use_uv = matches!(mode, InstallMode::NoPrompts) - || dialoguer::Select::with_theme(tui_theme()) - .with_prompt("Select the preferred package installer") - .item("uv (fast, recommended)") - .item("pip-tools (slow, higher compatibility)") - .default(0) - .interact()? - == 0; - toml::ensure_table(config_doc, "behavior")["use-uv"] = toml_edit::value(use_uv); - } - // If the global-python flag is not in the settings, ask the user if they want to turn // on global shims upon installation. if config_doc diff --git a/rye/src/cli/toolchain.rs b/rye/src/cli/toolchain.rs index e35066ea0d..3e144a2bf7 100644 --- a/rye/src/cli/toolchain.rs +++ b/rye/src/cli/toolchain.rs @@ -13,7 +13,6 @@ use serde::Deserialize; use serde::Serialize; use crate::installer::list_installed_tools; -use crate::piptools::get_pip_tools_venv_path; use crate::platform::{get_app_dir, get_canonical_py_path, list_known_toolchains}; use crate::pyproject::read_venv_marker; use crate::sources::py::{iter_downloadable, PythonVersion}; @@ -113,12 +112,10 @@ fn register(cmd: RegisterCommand) -> Result<(), Error> { fn check_in_use(ver: &PythonVersion) -> Result<(), Error> { // Check if used by rye itself. let app_dir = get_app_dir(); - for venv in &[app_dir.join("self"), get_pip_tools_venv_path(ver)] { - let venv_marker = read_venv_marker(venv); - if let Some(ref venv_marker) = venv_marker { - if &venv_marker.python == ver { - bail!("toolchain {} is still in use by rye itself", ver); - } + let venv_marker = read_venv_marker(app_dir.join("self").as_path()); + if let Some(ref venv_marker) = venv_marker { + if &venv_marker.python == ver { + bail!("toolchain {} is still in use by rye itself", ver); } } diff --git a/rye/src/config.rs b/rye/src/config.rs index dd173268d6..de0073a086 100644 --- a/rye/src/config.rs +++ b/rye/src/config.rs @@ -258,10 +258,12 @@ impl Config { .get("behavior") .and_then(|x| x.get("autosync")) .and_then(|x| x.as_bool()) - .unwrap_or_else(|| self.use_uv()) + .unwrap_or(true) } - /// Indicates if uv should be used instead of pip-tools. + /// Indicates if uv should be used. + /// + /// This setting is deprecated, as pip-tools support was removed in Rye 0.40. pub fn use_uv(&self) -> bool { self.doc .get("behavior") @@ -409,12 +411,4 @@ author = "John Doe ""#, .iter() .any(|src| src.name == "default" && src.url == "https://pypi.org/simple/")); } - - #[test] - fn test_use_uv() { - let (cfg_path, _temp_dir) = setup_config("[behavior]\nuse-uv = true"); - let cfg = Config::from_path(&cfg_path).expect("Failed to load config"); - // Assuming cfg!(windows) is false in this test environment - assert!(cfg.use_uv()); - } } diff --git a/rye/src/installer.rs b/rye/src/installer.rs index d34fa9d60c..51b66e8220 100644 --- a/rye/src/installer.rs +++ b/rye/src/installer.rs @@ -143,61 +143,26 @@ pub fn install( requirement.name.as_str(), )?; - if Config::current().use_uv() { - let result = UvBuilder::new() - .with_output(output.quieter()) - .with_sources(sources) - .ensure_exists()? - .venv(&target_venv_path, &py, &py_ver, None)? - .with_output(output) - .install( - &requirement, - UvInstallOptions { - importlib_workaround: py_ver.major == 3 && py_ver.minor == 7, - extras: extra_requirements.to_vec(), - refresh: force, - keyring_provider, - }, - ); - if result.is_err() { - uninstall_helper(&target_venv_path, &shim_dir)?; - return result; - } - } else { - let mut cmd = Command::new(self_venv.join(VENV_BIN).join("pip")); - cmd.arg("--python") - .arg(&py) - .arg("install") - .env("PYTHONWARNINGS", "ignore") - .env("PIP_DISABLE_PIP_VERSION_CHECK", "1"); - - sources.add_as_pip_args(&mut cmd); - if output == CommandOutput::Verbose { - cmd.arg("--verbose"); - } else { - if output == CommandOutput::Quiet { - cmd.arg("-q"); - } - cmd.env("PYTHONWARNINGS", "ignore"); - } - cmd.arg("--").arg(requirement.to_string()); - - // we don't support versions below 3.7, but for 3.7 we need importlib-metadata - // to be installed - if py_ver.major == 3 && py_ver.minor == 7 { - cmd.arg("importlib-metadata==6.6.0"); - } - - for extra in extra_requirements { - cmd.arg(extra.to_string()); - } + let result = UvBuilder::new() + .with_output(output.quieter()) + .with_sources(sources) + .ensure_exists()? + .venv(&target_venv_path, &py, &py_ver, None)? + .with_output(output) + .install( + &requirement, + UvInstallOptions { + importlib_workaround: py_ver.major == 3 && py_ver.minor == 7, + extras: extra_requirements.to_vec(), + refresh: force, + keyring_provider, + }, + ); + if result.is_err() { + uninstall_helper(&target_venv_path, &shim_dir)?; + return result; + } - let status = cmd.status()?; - if !status.success() { - uninstall_helper(&target_venv_path, &shim_dir)?; - bail!("tool installation failed"); - } - }; let out = Command::new(py) .arg("-c") .arg(FIND_SCRIPT_SCRIPT) diff --git a/rye/src/lock.rs b/rye/src/lock.rs index fc97bc9063..5348ebf524 100644 --- a/rye/src/lock.rs +++ b/rye/src/lock.rs @@ -6,7 +6,7 @@ use std::process::Command; use std::sync::Arc; use std::{env, fmt, fs}; -use anyhow::{anyhow, bail, Context, Error}; +use anyhow::{anyhow, Context, Error}; use clap::ValueEnum; use minijinja::render; use once_cell::sync::Lazy; @@ -16,13 +16,11 @@ use serde::Serialize; use tempfile::NamedTempFile; use url::Url; -use crate::config::Config; -use crate::piptools::{get_pip_compile, get_pip_tools_version, PipToolsVersion}; use crate::pyproject::{ normalize_package_name, DependencyKind, ExpandedSources, PyProject, Workspace, }; use crate::sources::py::PythonVersion; -use crate::utils::{set_proxy_variables, CommandOutput, IoPathContext}; +use crate::utils::{CommandOutput, IoPathContext}; use crate::uv::{UvBuilder, UvPackageUpgrade}; static FILE_EDITABLE_RE: Lazy = Lazy::new(|| Regex::new(r"^-e (file://.*?)\s*$").unwrap()); @@ -409,105 +407,43 @@ fn generate_lockfile( sources: &ExpandedSources, lock_options: &LockOptions, exclusions: &HashSet, - no_deps: bool, + _no_deps: bool, keyring_provider: KeyringProvider, ) -> Result<(), Error> { - let use_uv = Config::current().use_uv(); let scratch = tempfile::tempdir()?; let requirements_file = scratch.path().join("requirements.txt"); if lockfile.is_file() { fs::copy(lockfile, &requirements_file) .path_context(&requirements_file, "unable to restore requirements file")?; - } else if !use_uv { - fs::write(&requirements_file, b"").path_context( - &requirements_file, - "unable to write empty requirements file", - )?; }; - if use_uv { - let upgrade = { - if lock_options.update_all { - UvPackageUpgrade::All - } else if !lock_options.update.is_empty() { - UvPackageUpgrade::Packages(lock_options.update.clone()) - } else { - UvPackageUpgrade::Nothing - } - }; - - UvBuilder::new() - .with_output(output.quieter()) - .with_sources(sources.clone()) - .with_workdir(workspace_path) - .ensure_exists()? - .lockfile( - py_ver, - requirements_file_in, - &requirements_file, - lock_options.pre, - env::var("__RYE_UV_EXCLUDE_NEWER").ok(), - upgrade, - keyring_provider, - lock_options.generate_hashes, - lock_options.universal, - )?; - } else { - if keyring_provider != KeyringProvider::Disabled { - bail!("`--keyring-provider` option requires the uv backend"); - } - let mut cmd = Command::new(get_pip_compile(py_ver, output)?); - // legacy pip tools requires some extra parameters - if get_pip_tools_version(py_ver) == PipToolsVersion::Legacy { - cmd.arg("--resolver=backtracking"); - } - cmd.arg("--strip-extras") - .arg("--allow-unsafe") - .arg("--no-header") - .arg("--annotate") - .arg("--pip-args") - .arg(format!( - "--python-version=\"{}.{}.{}\"{}", - py_ver.major, - py_ver.minor, - py_ver.patch, - if no_deps { " --no-deps" } else { "" } - )); - if lock_options.pre { - cmd.arg("--pre"); - } - if lock_options.generate_hashes { - cmd.arg("--generate-hashes"); - cmd.arg("--reuse-hashes"); - } - - cmd.arg(if output == CommandOutput::Verbose { - "--verbose" - } else { - "-q" - }) - .arg("-o") - .arg(&requirements_file) - .arg(requirements_file_in) - .current_dir(workspace_path) - .env("PYTHONWARNINGS", "ignore") - .env("PROJECT_ROOT", make_project_root_fragment(workspace_path)); - - for pkg in &lock_options.update { - cmd.arg("--upgrade-package"); - cmd.arg(pkg); - } + let upgrade = { if lock_options.update_all { - cmd.arg("--upgrade"); + UvPackageUpgrade::All + } else if !lock_options.update.is_empty() { + UvPackageUpgrade::Packages(lock_options.update.clone()) + } else { + UvPackageUpgrade::Nothing } - sources.add_as_pip_args(&mut cmd); - set_proxy_variables(&mut cmd); - let status = cmd.status().context("unable to run pip-compile")?; - if !status.success() { - bail!("failed to generate lockfile"); - }; }; + UvBuilder::new() + .with_output(output.quieter()) + .with_sources(sources.clone()) + .with_workdir(workspace_path) + .ensure_exists()? + .lockfile( + py_ver, + requirements_file_in, + &requirements_file, + lock_options.pre, + env::var("__RYE_UV_EXCLUDE_NEWER").ok(), + upgrade, + keyring_provider, + lock_options.generate_hashes, + lock_options.universal, + )?; + finalize_lockfile( &requirements_file, lockfile, diff --git a/rye/src/main.rs b/rye/src/main.rs index 0a4fb23ee2..6eb2fe754a 100644 --- a/rye/src/main.rs +++ b/rye/src/main.rs @@ -12,7 +12,6 @@ mod config; mod consts; mod installer; mod lock; -mod piptools; mod platform; mod pyproject; mod sources; diff --git a/rye/src/piptools.rs b/rye/src/piptools.rs deleted file mode 100644 index 23e2a70da9..0000000000 --- a/rye/src/piptools.rs +++ /dev/null @@ -1,104 +0,0 @@ -use std::fs; -use std::path::PathBuf; -use std::process::Command; - -use anyhow::{bail, Context, Error}; - -use crate::bootstrap::ensure_self_venv; -use crate::consts::VENV_BIN; -use crate::platform::get_app_dir; -use crate::sources::py::PythonVersion; -use crate::sync::create_virtualenv; -use crate::utils::{get_venv_python_bin, CommandOutput, IoPathContext}; - -// When changing these, also update `SELF_VERSION` in bootstrap.rs to ensure -// that the internals are re-created. -pub const LATEST_PIP: &str = "pip==24.2.0"; -const PIP_TOOLS_LATEST_REQ: &[&str] = &[LATEST_PIP, "pip-tools==7.3.0"]; -const PIP_TOOLS_LEGACY_REQ: &[&str] = &["pip==22.2.0", "pip-tools==6.14.0"]; - -#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)] -/// Which version of piptools are in use? -pub enum PipToolsVersion { - Latest, - Legacy, -} - -impl PipToolsVersion { - fn requirements(&self) -> &'static [&'static str] { - match *self { - PipToolsVersion::Latest => PIP_TOOLS_LATEST_REQ, - PipToolsVersion::Legacy => PIP_TOOLS_LEGACY_REQ, - } - } -} - -fn get_pip_tools_bin(py_ver: &PythonVersion, output: CommandOutput) -> Result { - let self_venv = ensure_self_venv(output)?; - let venv = get_pip_tools_venv_path(py_ver); - - let py = get_venv_python_bin(&venv); - let version = get_pip_tools_version(py_ver); - - // if we have a python interpreter in the given path, let's use it - if venv.join(&py).is_file() { - return Ok(venv); - } - - // if however for some reason the virtualenv itself is already a folder - // it usually means that the symlink to the python is bad now. This can - // happen if someone wiped the toolchain of the pip-tools version. In - // that case wipe it first. - if venv.is_dir() { - fs::remove_dir_all(&venv) - .path_context(&venv, "unable to wipe old virtualenv for pip-tools")?; - } - - echo!(if output, "Creating virtualenv for pip-tools"); - create_virtualenv(output, &self_venv, py_ver, &venv, "pip-tools")?; - - let mut cmd = Command::new(self_venv.join(VENV_BIN).join("pip")); - cmd.arg("--python") - .arg(&py) - .arg("install") - .arg("--upgrade") - .args(version.requirements()) - .arg("-q") - .env("PIP_DISABLE_PIP_VERSION_CHECK", "1"); - if output == CommandOutput::Verbose { - cmd.arg("--verbose"); - } else { - cmd.arg("--quiet"); - cmd.env("PYTHONWARNINGS", "ignore"); - } - let status = cmd.status().context("unable to install pip-tools")?; - if !status.success() { - bail!("failed to initialize pip-tools venv (install dependencies)"); - } - Ok(venv) -} - -pub fn get_pip_tools_version(py_ver: &PythonVersion) -> PipToolsVersion { - if py_ver.major == 3 && py_ver.minor == 7 { - PipToolsVersion::Legacy - } else { - PipToolsVersion::Latest - } -} - -pub fn get_pip_tools_venv_path(py_ver: &PythonVersion) -> PathBuf { - let key = format!("{}@{}.{}", py_ver.name, py_ver.major, py_ver.minor); - get_app_dir().join("pip-tools").join(key) -} - -pub fn get_pip_sync(py_ver: &PythonVersion, output: CommandOutput) -> Result { - Ok(get_pip_tools_bin(py_ver, output)? - .join(VENV_BIN) - .join("pip-sync")) -} - -pub fn get_pip_compile(py_ver: &PythonVersion, output: CommandOutput) -> Result { - Ok(get_pip_tools_bin(py_ver, output)? - .join(VENV_BIN) - .join("pip-compile")) -} diff --git a/rye/src/sync.rs b/rye/src/sync.rs index 2f4ef59d01..d888ac2071 100644 --- a/rye/src/sync.rs +++ b/rye/src/sync.rs @@ -1,28 +1,20 @@ +use std::fs; use std::path::{Path, PathBuf}; -use std::process::Command; -use std::{env, fs}; use anyhow::{bail, Context, Error}; use console::style; use same_file::is_same_file; use serde::{Deserialize, Serialize}; -use tempfile::tempdir; -use crate::bootstrap::{ensure_self_venv, fetch, get_pip_module, FetchOptions}; -use crate::config::Config; -use crate::consts::VENV_BIN; +use crate::bootstrap::{ensure_self_venv, fetch, FetchOptions}; use crate::lock::{ - make_project_root_fragment, update_single_project_lockfile, update_workspace_lockfile, - KeyringProvider, LockMode, LockOptions, + update_single_project_lockfile, update_workspace_lockfile, KeyringProvider, LockMode, + LockOptions, }; -use crate::piptools::{get_pip_sync, get_pip_tools_venv_path}; use crate::platform::get_toolchain_python_bin; -use crate::pyproject::{read_venv_marker, write_venv_marker, ExpandedSources, PyProject}; +use crate::pyproject::{read_venv_marker, ExpandedSources, PyProject}; use crate::sources::py::PythonVersion; -use crate::utils::{ - get_venv_python_bin, set_proxy_variables, symlink_dir, update_venv_sync_marker, CommandOutput, - IoPathContext, -}; +use crate::utils::{get_venv_python_bin, CommandOutput, IoPathContext}; use crate::uv::{UvBuilder, UvSyncOptions}; /// Controls the sync mode @@ -259,65 +251,18 @@ pub fn sync(mut cmd: SyncOptions) -> Result<(), Error> { lockfile }; - let tempdir = tempdir()?; let py_path = get_venv_python_bin(&venv); - if Config::current().use_uv() { - let uv_options = UvSyncOptions { - keyring_provider: cmd.keyring_provider, - }; - UvBuilder::new() - .with_output(output.quieter()) - .with_workdir(&pyproject.workspace_path()) - .with_sources(sources) - .ensure_exists()? - .venv(&venv, &py_path, &py_ver, None)? - .with_output(output) - .sync(&target_lockfile, uv_options)?; - } else { - let mut pip_sync_cmd = Command::new(get_pip_sync(&py_ver, output)?); - let root = pyproject.workspace_path(); - - // we need to run this after we have run the `get_pip_sync` command - // as this is what bootstraps or updates the pip tools installation. - // This is needed as on unix platforms we need to search the module path. - symlink_dir( - get_pip_module(&get_pip_tools_venv_path(&py_ver)) - .context("could not locate pip")?, - tempdir.path().join("pip"), - ) - .context("failed linking pip module into for pip-sync")?; - - pip_sync_cmd - .env("PROJECT_ROOT", make_project_root_fragment(&root)) - .env("PYTHONPATH", tempdir.path()) - .current_dir(&root) - .arg("--python-executable") - .arg(&py_path) - .arg("--pip-args") - .arg("--no-deps"); - - if output != CommandOutput::Quiet { - pip_sync_cmd.env("PYTHONWARNINGS", "ignore"); - } else if output == CommandOutput::Verbose && env::var("PIP_VERBOSE").is_err() { - pip_sync_cmd.env("PIP_VERBOSE", "2"); - } - - sources.add_as_pip_args(&mut pip_sync_cmd); - - pip_sync_cmd.arg(&target_lockfile); - - if output == CommandOutput::Verbose { - pip_sync_cmd.arg("--verbose"); - } else if output == CommandOutput::Quiet { - pip_sync_cmd.arg("-q"); - } - set_proxy_variables(&mut pip_sync_cmd); - let status = pip_sync_cmd.status().context("unable to run pip-sync")?; - - if !status.success() { - bail!("Installation of dependencies failed"); - } + let uv_options = UvSyncOptions { + keyring_provider: cmd.keyring_provider, }; + UvBuilder::new() + .with_output(output.quieter()) + .with_workdir(&pyproject.workspace_path()) + .with_sources(sources) + .ensure_exists()? + .venv(&venv, &py_path, &py_ver, None)? + .with_output(output) + .sync(&target_lockfile, uv_options)?; }; } @@ -356,50 +301,22 @@ pub fn autosync( pub fn create_virtualenv( output: CommandOutput, - self_venv: &Path, + _self_venv: &Path, py_ver: &PythonVersion, venv: &Path, prompt: &str, ) -> Result<(), Error> { let py_bin = get_toolchain_python_bin(py_ver)?; - if Config::current().use_uv() { - // try to kill the empty venv if there is one as uv can't work otherwise. - fs::remove_dir(venv).ok(); - let uv = UvBuilder::new() - .with_output(output.quieter()) - .ensure_exists()? - .venv(venv, &py_bin, py_ver, Some(prompt)) - .context("failed to initialize virtualenv")?; - uv.write_marker()?; - uv.sync_marker(); - } else { - // create the venv folder first so we can manipulate some flags on it. - fs::create_dir_all(venv).path_context(venv, "unable to create virtualenv folder")?; - - update_venv_sync_marker(output, venv); - let mut venv_cmd = Command::new(self_venv.join(VENV_BIN).join("virtualenv")); - if output == CommandOutput::Verbose { - venv_cmd.arg("--verbose"); - } else { - venv_cmd.arg("-q"); - venv_cmd.env("PYTHONWARNINGS", "ignore"); - } - venv_cmd.arg("-p"); - venv_cmd.arg(&py_bin); - venv_cmd.arg("--no-seed"); - venv_cmd.arg("--prompt"); - venv_cmd.arg(prompt); - venv_cmd.arg("--").arg(venv); - let status = venv_cmd - .status() - .context("unable to invoke virtualenv command")?; - if !status.success() { - bail!("failed to initialize virtualenv"); - } - - write_venv_marker(venv, py_ver)?; - }; + // try to kill the empty venv if there is one as uv can't work otherwise. + fs::remove_dir(venv).ok(); + let uv = UvBuilder::new() + .with_output(output.quieter()) + .ensure_exists()? + .venv(venv, &py_bin, py_ver, Some(prompt)) + .context("failed to initialize virtualenv")?; + uv.write_marker()?; + uv.sync_marker(); // On UNIX systems Python is unable to find the tcl config that is placed // outside of the virtualenv. It also sometimes is entirely unable to find diff --git a/rye/src/utils/mod.rs b/rye/src/utils/mod.rs index fc431a98c7..9c567212d8 100644 --- a/rye/src/utils/mod.rs +++ b/rye/src/utils/mod.rs @@ -16,7 +16,7 @@ use sha2::{Digest, Sha256}; static ENV_VAR_RE: Lazy = Lazy::new(|| Regex::new(r"\$\{([A-Z0-9_]+)\}").unwrap()); #[cfg(unix)] -pub use std::os::unix::fs::{symlink as symlink_file, symlink as symlink_dir}; +pub use std::os::unix::fs::symlink as symlink_file; #[cfg(windows)] pub use std::os::windows::fs::symlink_file; diff --git a/rye/src/uv.rs b/rye/src/uv.rs index 4523c0dea1..d20d0370af 100644 --- a/rye/src/uv.rs +++ b/rye/src/uv.rs @@ -1,6 +1,5 @@ use crate::bootstrap::{download_url, SELF_REQUIREMENTS}; use crate::lock::{make_project_root_fragment, KeyringProvider}; -use crate::piptools::LATEST_PIP; use crate::platform::get_app_dir; use crate::pyproject::{read_venv_marker, write_venv_marker, ExpandedSources}; use crate::sources::py::PythonVersion; @@ -446,34 +445,9 @@ impl UvWithVenv { } } - /// Updates the venv to the given pip version and requirements. - pub fn update(&self, pip_version: &str, requirements: &str) -> Result<(), Error> { - self.update_pip(pip_version)?; - self.update_requirements(requirements)?; - Ok(()) - } - /// Install the bootstrap requirements in the venv. pub fn bootstrap(&self) -> Result<(), Error> { - self.update(LATEST_PIP, SELF_REQUIREMENTS)?; - Ok(()) - } - - /// Updates the pip version in the venv. - pub fn update_pip(&self, pip_version: &str) -> Result<(), Error> { - self.venv_cmd() - .arg("pip") - .arg("install") - .arg("--upgrade") - .arg(pip_version) - .status() - .with_context(|| { - format!( - "unable to update pip in venv at {}", - self.venv_path.display() - ) - })?; - + self.update_requirements(SELF_REQUIREMENTS)?; Ok(()) } From ce3c91a8353044b3fb978162b90cb7c1b1a89868 Mon Sep 17 00:00:00 2001 From: Ben Rometsch Date: Wed, 21 Aug 2024 13:59:27 +0200 Subject: [PATCH 19/19] Fix Docker code example (#1345) The Dockerfile code example was broken for me - this PR fixes this error. --- docs/guide/docker.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guide/docker.md b/docs/guide/docker.md index 84fa595a63..3f1a8447b8 100644 --- a/docs/guide/docker.md +++ b/docs/guide/docker.md @@ -23,7 +23,7 @@ This guide requires some familiarity with Docker and Dockerfiles. WORKDIR /app COPY requirements.lock ./ - uv pip install --no-cache -r requirements.lock + RUN uv pip install --no-cache --system -r requirements.lock COPY src . CMD python main.py