mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-04 19:08:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Allow local index references in requirements.txt files (#4525)

Browse source 
## Summary

We currently accept `--index-url /path/to/index` on the command line,
but confusingly, not in `requirements.txt`. This PR just brings the two
in sync.

## Test Plan

New snapshot tests.
This commit is contained in:
Charlie Marsh 2024-06-25 14:06:37 -04:00 • committed by GitHub
parent e39f5f72fe
commit 904957bf80
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 212 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

28
crates/distribution-types/src/index_url.rs
View file

@ -100,32 +100,18 @@ pub enum IndexUrlError {
Url(#[from] ParseError),
#[error(transparent)]
VerbatimUrl(#[from] VerbatimUrlError),
#[error("Index URL must be a valid base URL")]
CannotBeABase,
}
impl FromStr for IndexUrl {
type Err = IndexUrlError;
fn from_str(s: &str) -> Result<Self, Self::Err> {
if let Ok(path) = Path::new(s).canonicalize() {
let url = VerbatimUrl::from_path(path)?.with_given(s.to_owned());
Ok(Self::Path(url))
let url = if let Ok(path) = Path::new(s).canonicalize() {
VerbatimUrl::from_path(path)?
} else {
let url = Url::parse(s)?;
if url.cannot_be_a_base() {
Err(IndexUrlError::CannotBeABase)
} else {
let url = VerbatimUrl::from_url(url).with_given(s.to_owned());
if *url.raw() == *PYPI_URL {
Ok(Self::Pypi(url))
} else if url.scheme() == "file" {
Ok(Self::Path(url))
} else {
Ok(Self::Url(url))
}
}
}
VerbatimUrl::parse_url(s)?
};
Ok(Self::from(url.with_given(s)))
}
}
@ -150,7 +136,9 @@ impl<'de> serde::de::Deserialize<'de> for IndexUrl {
impl From<VerbatimUrl> for IndexUrl {
fn from(url: VerbatimUrl) -> Self {
if *url.raw() == *PYPI_URL {
if url.scheme() == "file" {
Self::Path(url)
} else if *url.raw() == *PYPI_URL {
Self::Pypi(url)
} else {
Self::Url(url)