Rename SitePackages::from_environment for clarity (#4497)

This commit is contained in:
Zanie Blue 2024-06-24 19:32:45 -04:00 committed by GitHub
parent 604be9ed71
commit 25cde888ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 13 additions and 13 deletions

View file

@ -195,7 +195,7 @@ impl<'a> BuildContext for BuildDispatch<'a> {
let tags = self.interpreter.tags()?;
// Determine the set of installed packages.
let site_packages = SitePackages::from_executable(venv)?;
let site_packages = SitePackages::from_environment(venv)?;
let requirements = resolution.requirements().collect::<Vec<_>>();

View file

@ -38,7 +38,7 @@ pub struct SitePackages {
impl SitePackages {
/// Build an index of installed packages from the given Python executable.
pub fn from_executable(venv: &PythonEnvironment) -> Result<SitePackages> {
pub fn from_environment(venv: &PythonEnvironment) -> Result<SitePackages> {
let mut distributions: Vec<Option<InstalledDist>> = Vec::new();
let mut by_name = FxHashMap::default();
let mut by_url = FxHashMap::default();

View file

@ -39,7 +39,7 @@ pub(crate) fn pip_check(
);
// Build the installed index.
let site_packages = SitePackages::from_executable(&environment)?;
let site_packages = SitePackages::from_environment(&environment)?;
let packages: Vec<&InstalledDist> = site_packages.iter().collect();
let s = if packages.len() == 1 { "" } else { "s" };

View file

@ -39,7 +39,7 @@ pub(crate) fn pip_freeze(
);
// Build the installed index.
let site_packages = SitePackages::from_executable(&environment)?;
let site_packages = SitePackages::from_environment(&environment)?;
for dist in site_packages
.iter()
.filter(|dist| !(exclude_editable && dist.is_editable()))

View file

@ -173,7 +173,7 @@ pub(crate) async fn pip_install(
let _lock = environment.lock()?;
// Determine the set of installed packages.
let site_packages = SitePackages::from_executable(&environment)?;
let site_packages = SitePackages::from_environment(&environment)?;
// Check if the current environment satisfies the requirements.
// Ideally, the resolver would be fast enough to let us remove this check. But right now, for large environments,

View file

@ -49,7 +49,7 @@ pub(crate) fn pip_list(
);
// Build the installed index.
let site_packages = SitePackages::from_executable(&environment)?;
let site_packages = SitePackages::from_environment(&environment)?;
// Filter if `--editable` is specified; always sort by name.
let results = site_packages

View file

@ -694,7 +694,7 @@ pub(crate) fn diagnose_environment(
venv: &PythonEnvironment,
printer: Printer,
) -> Result<(), Error> {
let site_packages = SitePackages::from_executable(venv)?;
let site_packages = SitePackages::from_environment(venv)?;
for diagnostic in site_packages.diagnostics()? {
// Only surface diagnostics that are "relevant" to the current resolution.
if resolution

View file

@ -54,7 +54,7 @@ pub(crate) fn pip_show(
);
// Build the installed index.
let site_packages = SitePackages::from_executable(&environment)?;
let site_packages = SitePackages::from_environment(&environment)?;
// Determine the markers to use for resolution.
let markers = environment.interpreter().markers();

View file

@ -256,7 +256,7 @@ pub(crate) async fn pip_sync(
);
// Determine the set of installed packages.
let site_packages = SitePackages::from_executable(&environment)?;
let site_packages = SitePackages::from_environment(&environment)?;
let options = OptionsBuilder::new()
.resolution_mode(resolution_mode)

View file

@ -42,7 +42,7 @@ pub(crate) fn pip_tree(
);
// Build the installed index.
let site_packages = SitePackages::from_executable(&environment)?;
let site_packages = SitePackages::from_environment(&environment)?;
let rendered_tree = DisplayDependencyGraph::new(&site_packages, no_dedupe)
.render()

View file

@ -104,7 +104,7 @@ pub(crate) async fn pip_uninstall(
let _lock = environment.lock()?;
// Index the current `site-packages` directory.
let site_packages = uv_installer::SitePackages::from_executable(&environment)?;
let site_packages = uv_installer::SitePackages::from_environment(&environment)?;
// Partition the requirements into named and unnamed requirements.
let (named, unnamed): (Vec<Requirement>, Vec<UnnamedRequirement<VerbatimParsedUrl>>) = spec

View file

@ -318,7 +318,7 @@ pub(crate) async fn update_environment(
RequirementsSpecification::from_sources(requirements, &[], &[], &client_builder).await?;
// Check if the current environment satisfies the requirements
let site_packages = SitePackages::from_executable(&venv)?;
let site_packages = SitePackages::from_environment(&venv)?;
if spec.source_trees.is_empty() {
match site_packages.satisfies(&spec.requirements, &spec.constraints)? {
// If the requirements are already satisfied, we're done.

View file

@ -191,7 +191,7 @@ pub(super) async fn do_sync(
preview,
);
let site_packages = SitePackages::from_executable(venv)?;
let site_packages = SitePackages::from_environment(venv)?;
// Sync the environment.
pip::operations::install(