mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-11-03 05:03:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add uv- prefix to all internal crates (#7853)

Browse source 
## Summary

Brings more consistency to the repo and ensures that all crates
automatically show up in `--verbose` logging.
This commit is contained in:
Charlie Marsh 2024-10-01 20:15:32 -04:00 • committed by GitHub
parent 7b55e97909
commit 14507a1793
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
319 changed files with 1327 additions and 1317 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/uv-requirements/src/lookahead.rs
View file

@ -6,12 +6,12 @@ use rustc_hash::FxHashSet;
use thiserror::Error;
use tracing::trace;
use distribution_types::{BuiltDist, Dist, DistributionMetadata, GitSourceDist, SourceDist};
use pypi_types::{Requirement, RequirementSource};
use uv_configuration::{Constraints, Overrides};
use uv_distribution::{DistributionDatabase, Reporter};
use uv_distribution_types::{BuiltDist, Dist, DistributionMetadata, GitSourceDist, SourceDist};
use uv_git::GitUrl;
use uv_normalize::GroupName;
use uv_pypi_types::{Requirement, RequirementSource};
use uv_resolver::{InMemoryIndex, MetadataResponse, ResolverMarkers};
use uv_types::{BuildContext, HashStrategy, RequestedRequirements};
@ -24,7 +24,7 @@ pub enum LookaheadError {
#[error("Failed to build: `{0}`")]
Build(SourceDist, #[source] uv_distribution::Error),
#[error(transparent)]
UnsupportedUrl(#[from] distribution_types::Error),
UnsupportedUrl(#[from] uv_distribution_types::Error),
}
/// A resolver for resolving lookahead requirements from direct URLs.
@ -247,7 +247,7 @@ impl<'a, Context: BuildContext> LookaheadResolver<'a, Context> {
}
/// Convert a [`Requirement`] into a [`Dist`], if it is a direct URL.
fn required_dist(requirement: &Requirement) -> Result<Option<Dist>, distribution_types::Error> {
fn required_dist(requirement: &Requirement) -> Result<Option<Dist>, uv_distribution_types::Error> {
Ok(Some(match &requirement.source {
RequirementSource::Registry { .. } => return Ok(None),
RequirementSource::Url {

8
crates/uv-requirements/src/source_tree.rs
View file

@ -7,13 +7,15 @@ use futures::stream::FuturesOrdered;
use futures::TryStreamExt;
use url::Url;
use distribution_types::{BuildableSource, DirectorySourceUrl, HashPolicy, SourceUrl, VersionId};
use pep508_rs::RequirementOrigin;
use pypi_types::Requirement;
use uv_configuration::ExtrasSpecification;
use uv_distribution::{DistributionDatabase, Reporter, RequiresDist};
use uv_distribution_types::{
BuildableSource, DirectorySourceUrl, HashPolicy, SourceUrl, VersionId,
};
use uv_fs::Simplified;
use uv_normalize::{ExtraName, PackageName};
use uv_pep508::RequirementOrigin;
use uv_pypi_types::Requirement;
use uv_resolver::{InMemoryIndex, MetadataResponse};
use uv_types::{BuildContext, HashStrategy};

16
crates/uv-requirements/src/specification.rs
View file

@ -33,19 +33,19 @@ use anyhow::{Context, Result};
use rustc_hash::FxHashSet;
use tracing::instrument;
use cache_key::CanonicalUrl;
use distribution_types::{
use uv_cache_key::CanonicalUrl;
use uv_client::BaseClientBuilder;
use uv_configuration::{NoBinary, NoBuild};
use uv_distribution_types::{
FlatIndexLocation, IndexUrl, NameRequirementSpecification, UnresolvedRequirement,
UnresolvedRequirementSpecification,
};
use pep508_rs::{MarkerTree, UnnamedRequirement, UnnamedRequirementUrl};
use pypi_types::Requirement;
use pypi_types::VerbatimParsedUrl;
use requirements_txt::{RequirementsTxt, RequirementsTxtRequirement};
use uv_client::BaseClientBuilder;
use uv_configuration::{NoBinary, NoBuild};
use uv_fs::{Simplified, CWD};
use uv_normalize::{ExtraName, PackageName};
use uv_pep508::{MarkerTree, UnnamedRequirement, UnnamedRequirementUrl};
use uv_pypi_types::Requirement;
use uv_pypi_types::VerbatimParsedUrl;
use uv_requirements_txt::{RequirementsTxt, RequirementsTxtRequirement};
use uv_workspace::pyproject::PyProjectToml;
use crate::RequirementsSource;

32
crates/uv-requirements/src/unnamed.rs
View file

@ -9,16 +9,16 @@ use serde::Deserialize;
use tracing::debug;
use url::Host;
use distribution_filename::{DistExtension, SourceDistFilename, WheelFilename};
use distribution_types::{
use uv_distribution::{DistributionDatabase, Reporter};
use uv_distribution_filename::{DistExtension, SourceDistFilename, WheelFilename};
use uv_distribution_types::{
BuildableSource, DirectSourceUrl, DirectorySourceUrl, GitSourceUrl, PathSourceUrl,
RemoteSource, SourceUrl, VersionId,
};
use pep508_rs::{UnnamedRequirement, VersionOrUrl};
use pypi_types::{Metadata10, Requirement};
use pypi_types::{ParsedUrl, VerbatimParsedUrl};
use uv_distribution::{DistributionDatabase, Reporter};
use uv_normalize::PackageName;
use uv_pep508::{UnnamedRequirement, VersionOrUrl};
use uv_pypi_types::{Metadata10, Requirement};
use uv_pypi_types::{ParsedUrl, VerbatimParsedUrl};
use uv_resolver::{InMemoryIndex, MetadataResponse};
use uv_types::{BuildContext, HashStrategy};
@ -28,10 +28,10 @@ pub enum NamedRequirementsError {
Distribution(#[from] uv_distribution::Error),
#[error(transparent)]
DistributionTypes(#[from] distribution_types::Error),
DistributionTypes(#[from] uv_distribution_types::Error),
#[error(transparent)]
WheelFilename(#[from] distribution_filename::WheelFilenameError),
WheelFilename(#[from] uv_distribution_filename::WheelFilenameError),
}
/// Like [`RequirementsSpecification`], but with concrete names for all requirements.
@ -97,7 +97,7 @@ impl<'a, Context: BuildContext> NamedRequirementsResolver<'a, Context> {
hasher: &HashStrategy,
index: &InMemoryIndex,
database: &DistributionDatabase<'a, Context>,
) -> Result<pep508_rs::Requirement<VerbatimParsedUrl>, NamedRequirementsError> {
) -> Result<uv_pep508::Requirement<VerbatimParsedUrl>, NamedRequirementsError> {
// If the requirement is a wheel, extract the package name from the wheel filename.
//
// Ex) `anyio-4.3.0-py3-none-any.whl`
@ -106,7 +106,7 @@ impl<'a, Context: BuildContext> NamedRequirementsResolver<'a, Context> {
.is_some_and(|ext| ext.eq_ignore_ascii_case("whl"))
{
let filename = WheelFilename::from_str(&requirement.url.verbatim.filename()?)?;
return Ok(pep508_rs::Requirement {
return Ok(uv_pep508::Requirement {
name: filename.name,
extras: requirement.extras,
version_or_url: Some(VersionOrUrl::Url(requirement.url)),
@ -144,7 +144,7 @@ impl<'a, Context: BuildContext> NamedRequirementsResolver<'a, Context> {
requirement.url.verbatim
);
} else {
return Ok(pep508_rs::Requirement {
return Ok(uv_pep508::Requirement {
name: filename.name,
extras: requirement.extras,
version_or_url: Some(VersionOrUrl::Url(requirement.url)),
@ -168,7 +168,7 @@ impl<'a, Context: BuildContext> NamedRequirementsResolver<'a, Context> {
path = parsed_directory_url.install_path.display(),
name = metadata.name
);
return Ok(pep508_rs::Requirement {
return Ok(uv_pep508::Requirement {
name: metadata.name,
extras: requirement.extras,
version_or_url: Some(VersionOrUrl::Url(requirement.url)),
@ -190,7 +190,7 @@ impl<'a, Context: BuildContext> NamedRequirementsResolver<'a, Context> {
path = parsed_directory_url.install_path.display(),
name = project.name
);
return Ok(pep508_rs::Requirement {
return Ok(uv_pep508::Requirement {
name: project.name,
extras: requirement.extras,
version_or_url: Some(VersionOrUrl::Url(requirement.url)),
@ -208,7 +208,7 @@ impl<'a, Context: BuildContext> NamedRequirementsResolver<'a, Context> {
path = parsed_directory_url.install_path.display(),
name = name
);
return Ok(pep508_rs::Requirement {
return Ok(uv_pep508::Requirement {
name,
extras: requirement.extras,
version_or_url: Some(VersionOrUrl::Url(requirement.url)),
@ -238,7 +238,7 @@ impl<'a, Context: BuildContext> NamedRequirementsResolver<'a, Context> {
path = parsed_directory_url.install_path.display(),
name = name
);
return Ok(pep508_rs::Requirement {
return Ok(uv_pep508::Requirement {
name,
extras: requirement.extras,
version_or_url: Some(VersionOrUrl::Url(requirement.url)),
@ -319,7 +319,7 @@ impl<'a, Context: BuildContext> NamedRequirementsResolver<'a, Context> {
}
};
Ok(pep508_rs::Requirement {
Ok(uv_pep508::Requirement {
name,
extras: requirement.extras,
version_or_url: Some(VersionOrUrl::Url(requirement.url)),

2
crates/uv-requirements/src/upgrade.rs
View file

@ -2,11 +2,11 @@ use std::path::Path;
use anyhow::Result;
use requirements_txt::RequirementsTxt;
use uv_client::{BaseClientBuilder, Connectivity};
use uv_configuration::Upgrade;
use uv_fs::CWD;
use uv_git::ResolvedRepositoryReference;
use uv_requirements_txt::RequirementsTxt;
use uv_resolver::{Lock, Preference, PreferenceError};
#[derive(Debug, Default)]