diff --git a/crates/puffin/tests/pip_install_scenarios.rs b/crates/puffin/tests/pip_install_scenarios.rs index 6f7a8b5d0..ef0de7d12 100644 --- a/crates/puffin/tests/pip_install_scenarios.rs +++ b/crates/puffin/tests/pip_install_scenarios.rs @@ -624,9 +624,7 @@ fn excluded_only_compatible_version() -> Result<()> { [crates/puffin-resolver/src/pubgrub/report.rs:115] &dependency_set = Range { segments: [ ( - Included( - "1.0.0", - ), + Unbounded, Included( "1.0.0", ), @@ -635,9 +633,7 @@ fn excluded_only_compatible_version() -> Result<()> { Included( "3.0.0", ), - Included( - "3.0.0", - ), + Unbounded, ), ], } @@ -708,8 +704,8 @@ fn excluded_only_compatible_version() -> Result<()> { albatross<2.0.0 albatross>2.0.0 depends on one of: - bluebird==1.0.0 - bluebird==3.0.0 + bluebird<=1.0.0 + bluebird>=3.0.0 And because you require one of: albatross<2.0.0 @@ -2889,7 +2885,7 @@ fn package_prerelease_specified_only_final_available() -> Result<()> { ----- stdout ----- ----- stderr ----- - Resolved 1 package in 5m [TIME] + Resolved 1 package in [TIME] Downloaded 1 package in [TIME] Installed 1 package in [TIME] + albatross==0.3.0 @@ -2951,7 +2947,7 @@ fn package_prerelease_specified_only_prerelease_available() -> Result<()> { ----- stdout ----- ----- stderr ----- - Resolved 1 package in 5m [TIME] + Resolved 1 package in [TIME] Downloaded 1 package in [TIME] Installed 1 package in [TIME] + albatross==0.3.0a1 diff --git a/crates/puffin/tests/pip_sync.rs b/crates/puffin/tests/pip_sync.rs index 39926e69d..53c085e47 100644 --- a/crates/puffin/tests/pip_sync.rs +++ b/crates/puffin/tests/pip_sync.rs @@ -679,23 +679,15 @@ fn install_git_tag() -> Result<()> { .arg(cache_dir.path()) .env("VIRTUAL_ENV", venv.as_os_str()) .current_dir(&temp_dir), @r###" - success: false - exit_code: 2 + success: true + exit_code: 0 ----- stdout ----- ----- stderr ----- Resolved 1 package in [TIME] - error: Failed to download distributions - Caused by: Failed to fetch wheel: werkzeug @ git+https://github.com/pallets/werkzeug.git@2.0.0 - Caused by: Failed to build: werkzeug @ git+https://github.com/pallets/werkzeug.git@2.0.0 - Caused by: Failed to install requirements from build-system.requires (install) - Caused by: Failed to download and build distributions - Caused by: Failed to fetch wheel: wheel==0.42.0 - Caused by: Failed to extract source distribution: an upstream reader returned an error: request or response body error: error reading a body from connection: connection reset - Caused by: an upstream reader returned an error: request or response body error: error reading a body from connection: connection reset - Caused by: request or response body error: error reading a body from connection: connection reset - Caused by: error reading a body from connection: connection reset - Caused by: connection reset + Downloaded 1 package in [TIME] + Installed 1 package in [TIME] + + werkzeug==2.0.0 (from git+https://github.com/pallets/werkzeug.git@2.0.0) "###); }); @@ -1080,22 +1072,15 @@ fn install_no_binary() -> Result<()> { .arg(cache_dir.path()) .env("VIRTUAL_ENV", venv.as_os_str()) .current_dir(&temp_dir), @r###" - success: false - exit_code: 2 + success: true + exit_code: 0 ----- stdout ----- ----- stderr ----- Resolved 1 package in [TIME] - error: Failed to download distributions - Caused by: Failed to fetch wheel: markupsafe==2.1.3 - Caused by: Failed to build: markupsafe==2.1.3 - Caused by: Failed to install requirements from build-system.requires (install) - Caused by: Failed to download and build distributions - Caused by: Failed to fetch wheel: setuptools==69.0.3 - Caused by: Failed to write to the client cache - Caused by: request or response body error: error reading a body from connection: connection reset - Caused by: error reading a body from connection: connection reset - Caused by: connection reset + Downloaded 1 package in [TIME] + Installed 1 package in [TIME] + + markupsafe==2.1.3 "###); }); @@ -2929,13 +2914,12 @@ fn sync_editable_and_registry() -> Result<()> { Resolved 1 package in [TIME] Downloaded 1 package in [TIME] Installed 1 package in [TIME] - + black==24.1a1 + + black==24.1.0 warning: The package `black` requires `click >=8.0.0`, but it's not installed. warning: The package `black` requires `mypy-extensions >=0.4.3`, but it's not installed. warning: The package `black` requires `packaging >=22.0`, but it's not installed. warning: The package `black` requires `pathspec >=0.9.0`, but it's not installed. warning: The package `black` requires `platformdirs >=2`, but it's not installed. - warning: The package `black` requires `aiohttp >=3.7.4 ; sys_platform != 'win32' or (implementation_name != 'pypy' and extra == 'd')`, but it's not installed. "###); }); @@ -2976,7 +2960,7 @@ fn sync_editable_and_registry() -> Result<()> { Built 1 editable in [TIME] Uninstalled 1 package in [TIME] Installed 1 package in [TIME] - - black==24.1a1 + - black==24.1.0 + black==0.1.0+editable (from file://[WORKSPACE_DIR]/scripts/editable-installs/black_editable) "###); });