diff --git a/crates/uv-installer/src/compile.rs b/crates/uv-installer/src/compile.rs index f9d531b1c..6ca78f8ba 100644 --- a/crates/uv-installer/src/compile.rs +++ b/crates/uv-installer/src/compile.rs @@ -19,6 +19,8 @@ use uv_static::EnvVars; use uv_warnings::warn_user; const COMPILEALL_SCRIPT: &str = include_str!("pip_compileall.py"); +/// This is longer than any compilation should ever take. +const DEFAULT_COMPILE_TIMEOUT: Duration = Duration::from_secs(60); #[derive(Debug, Error)] pub enum CompileError { @@ -89,7 +91,17 @@ pub async fn compile_tree( let tempdir = tempdir_in(cache).map_err(CompileError::TempFile)?; let pip_compileall_py = tempdir.path().join("pip_compileall.py"); - if let Some(duration) = compile_bytecode_timeout { + let timeout = if let Some(timeout) = compile_bytecode_timeout { + if timeout.is_zero() { + None + } else { + Some(timeout) + } + } else { + Some(DEFAULT_COMPILE_TIMEOUT) + }; + + if let Some(duration) = timeout { debug!( "Using bytecode compilation timeout of {}s", duration.as_secs() @@ -108,7 +120,7 @@ pub async fn compile_tree( python_executable.to_path_buf(), pip_compileall_py.clone(), receiver.clone(), - compile_bytecode_timeout, + timeout, ); // Spawn each worker on a dedicated thread. diff --git a/crates/uv-installer/src/lib.rs b/crates/uv-installer/src/lib.rs index 0f45f9bdf..09140f108 100644 --- a/crates/uv-installer/src/lib.rs +++ b/crates/uv-installer/src/lib.rs @@ -1,3 +1,5 @@ +extern crate core; + pub use compile::{CompileError, compile_tree}; pub use installer::{Installer, Reporter as InstallReporter}; pub use plan::{Plan, Planner}; diff --git a/crates/uv-settings/src/lib.rs b/crates/uv-settings/src/lib.rs index e5a9be0d8..7386299c8 100644 --- a/crates/uv-settings/src/lib.rs +++ b/crates/uv-settings/src/lib.rs @@ -15,9 +15,6 @@ pub use crate::settings::*; mod combine; mod settings; -/// This is longer than any compilation should ever take. -const DEFAULT_COMPILE_BYTECODE_TIMEOUT: Duration = Duration::from_secs(60); - /// The [`Options`] as loaded from a configuration file on disk. #[derive(Debug, Clone)] pub struct FilesystemOptions(Options); @@ -615,9 +612,7 @@ impl EnvironmentOptions { compile_bytecode_timeout: parse_integer_environment_variable( EnvVars::UV_COMPILE_BYTECODE_TIMEOUT, )? - .map(Duration::from_secs) - .or(Some(DEFAULT_COMPILE_BYTECODE_TIMEOUT)) - .filter(|&v| v != Duration::from_secs(0)), + .map(Duration::from_secs), python_install_bin: parse_boolish_environment_variable(EnvVars::UV_PYTHON_INSTALL_BIN)?, python_install_registry: parse_boolish_environment_variable( EnvVars::UV_PYTHON_INSTALL_REGISTRY, diff --git a/crates/uv/tests/it/show_settings.rs b/crates/uv/tests/it/show_settings.rs index 4e20c5e28..b3e3bb859 100644 --- a/crates/uv/tests/it/show_settings.rs +++ b/crates/uv/tests/it/show_settings.rs @@ -237,9 +237,7 @@ fn resolve_uv_toml() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -441,9 +439,7 @@ fn resolve_uv_toml() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -646,9 +642,7 @@ fn resolve_uv_toml() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -883,9 +877,7 @@ fn resolve_pyproject_toml() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -1055,9 +1047,7 @@ fn resolve_pyproject_toml() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -1273,9 +1263,7 @@ fn resolve_pyproject_toml() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -1535,9 +1523,7 @@ fn resolve_index_url() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -1809,9 +1795,7 @@ fn resolve_index_url() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -2038,9 +2022,7 @@ fn resolve_find_links() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -2232,9 +2214,7 @@ fn resolve_top_level() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -2486,9 +2466,7 @@ fn resolve_top_level() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -2723,9 +2701,7 @@ fn resolve_top_level() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -2916,9 +2892,7 @@ fn resolve_user_configuration() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -3093,9 +3067,7 @@ fn resolve_user_configuration() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -3270,9 +3242,7 @@ fn resolve_user_configuration() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -3449,9 +3419,7 @@ fn resolve_user_configuration() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -3580,9 +3548,7 @@ fn resolve_tool() -> anyhow::Result<()> { Clone, ), compile_bytecode: None, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, no_sources: None, upgrade: None, reinstall: None, @@ -3634,9 +3600,7 @@ fn resolve_tool() -> anyhow::Result<()> { upgrade: None, }, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, reinstall: None, }, force: false, @@ -3840,9 +3804,7 @@ fn resolve_poetry_toml() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -4085,9 +4047,7 @@ fn resolve_both() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -4335,9 +4295,7 @@ fn resolve_both_special_fields() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -4664,9 +4622,7 @@ fn resolve_config_file() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -4934,9 +4890,7 @@ fn resolve_skip_empty() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -5114,9 +5068,7 @@ fn resolve_skip_empty() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -5313,9 +5265,7 @@ fn allow_insecure_host() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -5573,9 +5523,7 @@ fn index_priority() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -5812,9 +5760,7 @@ fn index_priority() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -6057,9 +6003,7 @@ fn index_priority() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -6297,9 +6241,7 @@ fn index_priority() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -6544,9 +6486,7 @@ fn index_priority() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -6784,9 +6724,7 @@ fn index_priority() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -6968,9 +6906,7 @@ fn verify_hashes() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -7138,9 +7074,7 @@ fn verify_hashes() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: None, upgrade: None, @@ -7306,9 +7240,7 @@ fn verify_hashes() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Require, @@ -7476,9 +7408,7 @@ fn verify_hashes() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: None, upgrade: None, @@ -7644,9 +7574,7 @@ fn verify_hashes() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: None, upgrade: None, @@ -7813,9 +7741,7 @@ fn verify_hashes() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -7953,9 +7879,7 @@ fn preview_features() { upgrade: None, }, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, reinstall: None, }, } @@ -8070,9 +7994,7 @@ fn preview_features() { upgrade: None, }, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, reinstall: None, }, } @@ -8187,9 +8109,7 @@ fn preview_features() { upgrade: None, }, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, reinstall: None, }, } @@ -8304,9 +8224,7 @@ fn preview_features() { upgrade: None, }, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, reinstall: None, }, } @@ -8421,9 +8339,7 @@ fn preview_features() { upgrade: None, }, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, reinstall: None, }, } @@ -8540,9 +8456,7 @@ fn preview_features() { upgrade: None, }, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, reinstall: None, }, } @@ -8722,9 +8636,7 @@ fn upgrade_pip_cli_config_interaction() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -8900,9 +8812,7 @@ fn upgrade_pip_cli_config_interaction() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -9101,9 +9011,7 @@ fn upgrade_pip_cli_config_interaction() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -9277,9 +9185,7 @@ fn upgrade_pip_cli_config_interaction() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -9447,9 +9353,7 @@ fn upgrade_pip_cli_config_interaction() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -9618,9 +9522,7 @@ fn upgrade_pip_cli_config_interaction() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -10619,9 +10521,7 @@ fn build_isolation_override() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, @@ -10798,9 +10698,7 @@ fn build_isolation_override() -> anyhow::Result<()> { annotation_style: Split, link_mode: Clone, compile_bytecode: false, - compile_bytecode_timeout: Some( - [TIME], - ), + compile_bytecode_timeout: None, sources: Enabled, hash_checking: Some( Verify, diff --git a/crates/uv/tests/it/tool_install.rs b/crates/uv/tests/it/tool_install.rs index f3e9da7f6..ced7a7782 100644 --- a/crates/uv/tests/it/tool_install.rs +++ b/crates/uv/tests/it/tool_install.rs @@ -88,7 +88,6 @@ fn tool_install() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -174,7 +173,6 @@ fn tool_install() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); } @@ -390,7 +388,6 @@ fn tool_install_with_compatible_build_constraints() -> Result<()> { [tool.options] exclude-newer = "2024-05-04T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -575,7 +572,6 @@ fn tool_install_version() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -659,7 +655,6 @@ fn tool_install_editable() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -701,7 +696,6 @@ fn tool_install_editable() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -746,7 +740,6 @@ fn tool_install_editable() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); } @@ -795,7 +788,6 @@ fn tool_install_remove_on_empty() -> Result<()> { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -887,7 +879,6 @@ fn tool_install_remove_on_empty() -> Result<()> { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -965,7 +956,6 @@ fn tool_install_editable_from() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -1119,7 +1109,6 @@ fn tool_install_already_installed() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -1156,7 +1145,6 @@ fn tool_install_already_installed() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -1448,7 +1436,6 @@ fn tool_install_force() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -1487,7 +1474,6 @@ fn tool_install_force() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -1817,7 +1803,6 @@ fn tool_install_unnamed_package() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -1933,7 +1918,6 @@ fn tool_install_unnamed_from() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -2028,7 +2012,6 @@ fn tool_install_unnamed_with() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -2108,7 +2091,6 @@ fn tool_install_with_dependencies_from_script() -> Result<()> { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "#); }); @@ -2163,7 +2145,6 @@ fn tool_install_with_dependencies_from_script() -> Result<()> { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "#); }); @@ -2225,7 +2206,6 @@ fn tool_install_requirements_txt() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -2271,7 +2251,6 @@ fn tool_install_requirements_txt() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); } @@ -2336,7 +2315,6 @@ fn tool_install_requirements_txt_arguments() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -2451,7 +2429,6 @@ fn tool_install_upgrade() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -2486,7 +2463,6 @@ fn tool_install_upgrade() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -2527,7 +2503,6 @@ fn tool_install_upgrade() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -2568,7 +2543,6 @@ fn tool_install_upgrade() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); } @@ -3037,7 +3011,6 @@ fn tool_install_malformed_dist_info() { [tool.options] exclude-newer = "2025-01-18T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); } @@ -3119,7 +3092,6 @@ fn tool_install_settings() { [tool.options] resolution = "lowest-direct" exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -3153,7 +3125,6 @@ fn tool_install_settings() { [tool.options] resolution = "highest" exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -3194,7 +3165,6 @@ fn tool_install_settings() { [tool.options] resolution = "highest" exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); } @@ -3244,7 +3214,6 @@ fn tool_install_at_version() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -3311,7 +3280,6 @@ fn tool_install_at_latest() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); } @@ -3357,7 +3325,6 @@ fn tool_install_from_at_latest() { [tool.options] exclude-newer = "2025-01-18T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); } @@ -3403,7 +3370,6 @@ fn tool_install_from_at_version() { [tool.options] exclude-newer = "2025-01-18T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); } @@ -3454,7 +3420,6 @@ fn tool_install_at_latest_upgrade() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -3489,7 +3454,6 @@ fn tool_install_at_latest_upgrade() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -3527,7 +3491,6 @@ fn tool_install_at_latest_upgrade() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); } @@ -3590,7 +3553,6 @@ fn tool_install_constraints() -> Result<()> { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -3698,7 +3660,6 @@ fn tool_install_overrides() -> Result<()> { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); @@ -3873,7 +3834,6 @@ fn tool_install_credentials() { [tool.options] index = [{ url = "https://pypi-proxy.fly.dev/basic-auth/simple", explicit = false, default = false, format = "simple", authenticate = "auto" }] exclude-newer = "2025-01-18T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "#); }); } @@ -3962,7 +3922,6 @@ fn tool_install_default_credentials() -> Result<()> { [tool.options] index = [{ url = "https://pypi-proxy.fly.dev/basic-auth/simple", explicit = false, default = true, format = "simple", authenticate = "always" }] exclude-newer = "2025-01-18T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "#); }); @@ -4074,7 +4033,6 @@ fn tool_install_with_executables_from() { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); }); diff --git a/crates/uv/tests/it/tool_list.rs b/crates/uv/tests/it/tool_list.rs index c6f413c8e..3d77f0178 100644 --- a/crates/uv/tests/it/tool_list.rs +++ b/crates/uv/tests/it/tool_list.rs @@ -224,7 +224,6 @@ fn tool_list_deprecated() -> Result<()> { [tool.options] exclude-newer = "2024-03-25T00:00:00Z" - compile-bytecode-timeout = { secs = 60, nanos = 0 } "###); });