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

Move unnamed requirements to their own pep508_rs module and requirements-txt (#3186)

Browse source 
Another refactoring in preparation of using a richer requirements type.
No functional changes, only moves code around
This commit is contained in:
konsti 2024-04-22 16:02:39 +02:00 • committed by GitHub
parent f29c991e21
commit 82c4772e89
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 262 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,12 +2,14 @@ use std::path::PathBuf;
use anyhow::{Context, Result};
use rustc_hash::FxHashSet;
use tracing::{instrument, Level};
use tracing::instrument;
use cache_key::CanonicalUrl;
use distribution_types::{FlatIndexLocation, IndexUrl};
use pep508_rs::{Requirement, RequirementsTxtRequirement};
use requirements_txt::{EditableRequirement, FindLink, RequirementEntry, RequirementsTxt};
use pep508_rs::Requirement;
use requirements_txt::{
EditableRequirement, FindLink, RequirementEntry, RequirementsTxt, RequirementsTxtRequirement,
};
use uv_client::BaseClientBuilder;
use uv_configuration::{NoBinary, NoBuild};
use uv_fs::Simplified;
@ -48,7 +50,7 @@ pub struct RequirementsSpecification {
impl RequirementsSpecification {
/// Read the requirements and constraints from a source.
#[instrument(skip_all, level = Level::DEBUG, fields(source = % source))]
#[instrument(skip_all, level = tracing::Level::DEBUG, fields(source = % source))]
pub async fn from_source(
source: &RequirementsSource,
extras: &ExtrasSpecification,

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

@ -13,11 +13,9 @@ use distribution_types::{
BuildableSource, DirectSourceUrl, GitSourceUrl, PathSourceUrl, RemoteSource, SourceUrl,
VersionId,
};
use pep508_rs::{
Requirement, RequirementsTxtRequirement, Scheme, UnnamedRequirement, VersionOrUrl,
};
use pep508_rs::{Requirement, Scheme, UnnamedRequirement, VersionOrUrl};
use pypi_types::Metadata10;
use requirements_txt::RequirementEntry;
use requirements_txt::{RequirementEntry, RequirementsTxtRequirement};
use uv_client::RegistryClient;
use uv_distribution::{DistributionDatabase, Reporter};
use uv_normalize::PackageName;