Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't warn when --output-file is empty #9417

Merged
merged 1 commit into from
Nov 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion crates/uv-requirements-txt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ uv-client = { workspace = true }
uv-fs = { workspace = true }
uv-normalize = { workspace = true }
uv-configuration = { workspace = true }
uv-warnings = { workspace = true }

fs-err = { workspace = true }
regex = { workspace = true }
Expand Down
11 changes: 0 additions & 11 deletions crates/uv-requirements-txt/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ use uv_distribution_types::{UnresolvedRequirement, UnresolvedRequirementSpecific
use uv_fs::Simplified;
use uv_pep508::{expand_env_vars, Pep508Error, RequirementOrigin, VerbatimUrl};
use uv_pypi_types::{Requirement, VerbatimParsedUrl};
use uv_warnings::warn_user;

use crate::requirement::EditableError;
pub use crate::requirement::RequirementsTxtRequirement;
Expand Down Expand Up @@ -219,16 +218,6 @@ impl RequirementsTxt {
file: requirements_txt.to_path_buf(),
error: err,
})?;
if data == Self::default() {
if requirements_txt == Path::new("-") {
warn_user!("No dependencies found in stdin");
} else {
warn_user!(
"Requirements file {} does not contain any dependencies",
requirements_txt.user_display()
);
}
}

Ok(data)
}
Expand Down
13 changes: 13 additions & 0 deletions crates/uv-requirements/src/specification.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ use uv_pep508::{MarkerTree, UnnamedRequirement, UnnamedRequirementUrl};
use uv_pypi_types::Requirement;
use uv_pypi_types::VerbatimParsedUrl;
use uv_requirements_txt::{RequirementsTxt, RequirementsTxtRequirement};
use uv_warnings::warn_user;
use uv_workspace::pyproject::PyProjectToml;

use crate::RequirementsSource;
Expand Down Expand Up @@ -113,6 +114,18 @@ impl RequirementsSpecification {
}

let requirements_txt = RequirementsTxt::parse(path, &*CWD, client_builder).await?;

if requirements_txt == RequirementsTxt::default() {
if path == Path::new("-") {
warn_user!("No dependencies found in stdin");
} else {
warn_user!(
"Requirements file `{}` does not contain any dependencies",
path.user_display()
);
}
}

Self {
requirements: requirements_txt
.requirements
Expand Down
31 changes: 30 additions & 1 deletion crates/uv/tests/it/pip_compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ fn missing_venv() -> Result<()> {
# uv pip compile --cache-dir [CACHE_DIR] requirements.in

----- stderr -----
warning: Requirements file requirements.in does not contain any dependencies
warning: Requirements file `requirements.in` does not contain any dependencies
Resolved in [TIME]
"###
);
Expand All @@ -142,6 +142,35 @@ fn missing_venv() -> Result<()> {
Ok(())
}

#[test]
fn empty_output() -> Result<()> {
let context = TestContext::new("3.12");
context
.temp_dir
.child("requirements.in")
.write_str("iniconfig==1.1.1")?;
context.temp_dir.child("requirements.txt").touch()?;

uv_snapshot!(context.filters(), context.pip_compile()
.arg("requirements.in")
.arg("--output-file")
.arg("requirements.txt"), @r###"
success: true
exit_code: 0
----- stdout -----
# This file was autogenerated by uv via the following command:
# uv pip compile --cache-dir [CACHE_DIR] requirements.in --output-file requirements.txt
iniconfig==1.1.1
# via -r requirements.in

----- stderr -----
Resolved 1 package in [TIME]
"###
);

Ok(())
}

/// Resolve a specific version of `anyio` from a `pyproject.toml` file.
#[test]
fn compile_pyproject_toml() -> Result<()> {
Expand Down
2 changes: 1 addition & 1 deletion crates/uv/tests/it/pip_install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ fn empty_requirements_txt() -> Result<()> {
----- stdout -----

----- stderr -----
warning: Requirements file requirements.txt does not contain any dependencies
warning: Requirements file `requirements.txt` does not contain any dependencies
Audited in [TIME]
"###
);
Expand Down
6 changes: 3 additions & 3 deletions crates/uv/tests/it/pip_sync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ fn pip_sync_empty() -> Result<()> {
----- stdout -----

----- stderr -----
warning: Requirements file requirements.txt does not contain any dependencies
warning: Requirements file `requirements.txt` does not contain any dependencies
No requirements found (hint: use `--allow-empty-requirements` to clear the environment)
"###
);
Expand All @@ -373,7 +373,7 @@ fn pip_sync_empty() -> Result<()> {
----- stdout -----

----- stderr -----
warning: Requirements file requirements.txt does not contain any dependencies
warning: Requirements file `requirements.txt` does not contain any dependencies
Resolved in [TIME]
Audited in [TIME]
"###
Expand All @@ -397,7 +397,7 @@ fn pip_sync_empty() -> Result<()> {
----- stdout -----

----- stderr -----
warning: Requirements file requirements.txt does not contain any dependencies
warning: Requirements file `requirements.txt` does not contain any dependencies
Resolved in [TIME]
Uninstalled 1 package in [TIME]
- iniconfig==2.0.0
Expand Down
4 changes: 2 additions & 2 deletions crates/uv/tests/it/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1751,7 +1751,7 @@ fn run_empty_requirements_txt() -> Result<()> {
+ foo==1.0.0 (from file://[TEMP_DIR]/)
+ idna==3.6
+ sniffio==1.3.1
warning: Requirements file requirements.txt does not contain any dependencies
warning: Requirements file `requirements.txt` does not contain any dependencies
"###);

// Then reused in subsequent invocations
Expand All @@ -1763,7 +1763,7 @@ fn run_empty_requirements_txt() -> Result<()> {
----- stderr -----
Resolved 6 packages in [TIME]
Audited 4 packages in [TIME]
warning: Requirements file requirements.txt does not contain any dependencies
warning: Requirements file `requirements.txt` does not contain any dependencies
"###);

Ok(())
Expand Down
Loading