Python
/
uv
mirror of https://github.com/astral-sh/uv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Validate environment after `pip-sync` (#629) 

Not 100% sure that we actually want to do this, it seems reasonable
though.

Closes https://github.com/astral-sh/puffin/issues/410.
This commit is contained in:
Charlie Marsh 2023-12-13 03:13:43 -05:00 committed by GitHub
parent cbfd39093e
commit ea920e22d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crates/puffin-cli/src/commands/pip_sync.rs
View File

@ -14,7 +14,7 @@ use platform_tags::Tags;
use puffin_cache::Cache; use puffin_cache::Cache;
use puffin_client::RegistryClientBuilder; use puffin_client::RegistryClientBuilder;
use puffin_dispatch::BuildDispatch; use puffin_dispatch::BuildDispatch;
use puffin_installer::{Downloader, InstallPlan, Reinstall}; use puffin_installer::{Downloader, InstallPlan, Reinstall, SitePackages};
use puffin_interpreter::Virtualenv; use puffin_interpreter::Virtualenv;
use puffin_traits::OnceMap; use puffin_traits::OnceMap;
use pypi_types::{IndexUrls, Yanked}; use pypi_types::{IndexUrls, Yanked};
@ -263,6 +263,7 @@ pub(crate) async fn sync_requirements(
)?; )?;
} }
// Report on any changes in the environment.
for event in extraneous for event in extraneous
.into_iter() .into_iter()
.chain(reinstalls.into_iter()) .chain(reinstalls.into_iter())
@ -303,5 +304,17 @@ pub(crate) async fn sync_requirements(
} }
} }
// Validate that the environment is consistent.
let site_packages = SitePackages::try_from_executable(&venv)?;
for diagnostic in site_packages.diagnostics()? {
writeln!(
printer,
"{}{} {}",
"warning".yellow().bold(),
":".bold(),
diagnostic.message().bold()
)?;
}
Ok(ExitStatus::Success) Ok(ExitStatus::Success)
} }

5
crates/puffin-cli/tests/pip_sync.rs
View File

@ -768,8 +768,9 @@ fn warn_on_yanked_version() -> Result<()> {
let requirements_in = temp_dir.child("requirements.txt"); let requirements_in = temp_dir.child("requirements.txt");
requirements_in.touch()?; requirements_in.touch()?;
// This version is yanked
requirements_in.write_str("ipython==8.13.0")?; // This version is yanked.
requirements_in.write_str("colorama==0.4.2")?;
insta::with_settings!({ insta::with_settings!({
filters => INSTA_FILTERS.to_vec() filters => INSTA_FILTERS.to_vec()

5
crates/puffin-cli/tests/snapshots/pip_sync__install_dtls_socket.snap
View File

@ -6,9 +6,9 @@ info:
- pip-sync - pip-sync
- requirements.txt - requirements.txt
- "--cache-dir" - "--cache-dir"
- /var/folders/nt/6gf2v7_s3k13zq_t3944rwz40000gn/T/.tmpcRNTPf - /var/folders/nt/6gf2v7_s3k13zq_t3944rwz40000gn/T/.tmpOX4pkP
env: env:
VIRTUAL_ENV: /var/folders/nt/6gf2v7_s3k13zq_t3944rwz40000gn/T/.tmpK40oCA/.venv VIRTUAL_ENV: /var/folders/nt/6gf2v7_s3k13zq_t3944rwz40000gn/T/.tmpCpUYiO/.venv
--- ---
success: true success: true
exit_code: 0 exit_code: 0
@ -19,4 +19,5 @@ Resolved 1 package in [TIME]
Downloaded 1 package in [TIME] Downloaded 1 package in [TIME]
Installed 1 package in [TIME] Installed 1 package in [TIME]
+ dtlssocket @ https://files.pythonhosted.org/packages/58/42/0a0442118096eb9fbc9dc70b45aee2957f7546b80545e2a05bd839380519/DTLSSocket-0.1.16.tar.gz + dtlssocket @ https://files.pythonhosted.org/packages/58/42/0a0442118096eb9fbc9dc70b45aee2957f7546b80545e2a05bd839380519/DTLSSocket-0.1.16.tar.gz
warning: The package `dtlssocket` requires `cython <3`, but it's not installed.

8
crates/puffin-cli/tests/snapshots/pip_sync__warn_on_yanked_version.snap
View File

@ -6,9 +6,9 @@ info:
- pip-sync - pip-sync
- requirements.txt - requirements.txt
- "--cache-dir" - "--cache-dir"
- /var/folders/nt/6gf2v7_s3k13zq_t3944rwz40000gn/T/.tmpR0i3bZ - /var/folders/nt/6gf2v7_s3k13zq_t3944rwz40000gn/T/.tmpQOqXCr
env: env:
VIRTUAL_ENV: /var/folders/nt/6gf2v7_s3k13zq_t3944rwz40000gn/T/.tmplFEoko/.venv VIRTUAL_ENV: /var/folders/nt/6gf2v7_s3k13zq_t3944rwz40000gn/T/.tmpyEEM5q/.venv
--- ---
success: true success: true
exit_code: 0 exit_code: 0
@ -16,8 +16,8 @@ exit_code: 0
----- stderr ----- ----- stderr -----
Resolved 1 package in [TIME] Resolved 1 package in [TIME]
warning: ipython==8.13.0 is yanked (reason: "Wrong Python Pinning"). Refresh your lockfile to pin an un-yanked version. warning: colorama==0.4.2 is yanked (reason: "Bad build, missing files, will not install"). Refresh your lockfile to pin an un-yanked version.
Downloaded 1 package in [TIME] Downloaded 1 package in [TIME]
Installed 1 package in [TIME] Installed 1 package in [TIME]
+ ipython==8.13.0 + colorama==0.4.2