mirror of
https://github.com/astral-sh/uv.git
synced 2025-07-07 21:35:00 +00:00
Error if --all-extras
is used without a pyproject.toml
source (#292)
Closes https://github.com/astral-sh/puffin/issues/260
This commit is contained in:
parent
aa9882eee8
commit
cbfd6af125
2 changed files with 56 additions and 0 deletions
|
@ -42,6 +42,17 @@ pub(crate) async fn pip_compile(
|
||||||
) -> Result<ExitStatus> {
|
) -> Result<ExitStatus> {
|
||||||
let start = std::time::Instant::now();
|
let start = std::time::Instant::now();
|
||||||
|
|
||||||
|
// If the user requests `extras` but does not provide a pyproject toml source
|
||||||
|
if !matches!(extras, ExtrasSpecification::None)
|
||||||
|
&& !requirements
|
||||||
|
.iter()
|
||||||
|
.any(|source| matches!(source, RequirementsSource::PyprojectToml(_)))
|
||||||
|
{
|
||||||
|
return Err(anyhow!(
|
||||||
|
"Requesting extras requires a pyproject.toml input file."
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
// Read all requirements from the provided sources.
|
// Read all requirements from the provided sources.
|
||||||
let RequirementsSpecification {
|
let RequirementsSpecification {
|
||||||
project,
|
project,
|
||||||
|
|
|
@ -460,6 +460,51 @@ optional-dependencies.foo = [
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Request extras when using a `requirements.in` file which does not support extras.
|
||||||
|
#[test]
|
||||||
|
fn compile_requirements_file_extra() -> Result<()> {
|
||||||
|
let temp_dir = assert_fs::TempDir::new()?;
|
||||||
|
let cache_dir = assert_fs::TempDir::new()?;
|
||||||
|
let venv = temp_dir.child(".venv");
|
||||||
|
|
||||||
|
Command::new(get_cargo_bin(BIN_NAME))
|
||||||
|
.arg("venv")
|
||||||
|
.arg(venv.as_os_str())
|
||||||
|
.arg("--cache-dir")
|
||||||
|
.arg(cache_dir.path())
|
||||||
|
.current_dir(&temp_dir)
|
||||||
|
.assert()
|
||||||
|
.success();
|
||||||
|
venv.assert(predicates::path::is_dir());
|
||||||
|
|
||||||
|
let requirements_in = temp_dir.child("requirements.in");
|
||||||
|
requirements_in.touch()?;
|
||||||
|
requirements_in.write_str("django==5.0b1")?;
|
||||||
|
|
||||||
|
insta::with_settings!({
|
||||||
|
filters => INSTA_FILTERS.to_vec()
|
||||||
|
}, {
|
||||||
|
assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
|
||||||
|
.arg("pip-compile")
|
||||||
|
.arg("requirements.in")
|
||||||
|
.arg("--cache-dir")
|
||||||
|
.arg(cache_dir.path())
|
||||||
|
.arg("--all-extras")
|
||||||
|
.env("VIRTUAL_ENV", venv.as_os_str())
|
||||||
|
.current_dir(&temp_dir),
|
||||||
|
@r###"
|
||||||
|
success: false
|
||||||
|
exit_code: 2
|
||||||
|
----- stdout -----
|
||||||
|
|
||||||
|
----- stderr -----
|
||||||
|
error: Requesting extras requires a pyproject.toml input file.
|
||||||
|
"###);
|
||||||
|
});
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
/// Request an extra with a name that does not conform to the specification.
|
/// Request an extra with a name that does not conform to the specification.
|
||||||
#[test]
|
#[test]
|
||||||
fn invalid_extra_name() -> Result<()> {
|
fn invalid_extra_name() -> Result<()> {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue