mirror of
https://github.com/astral-sh/uv.git
synced 2025-10-29 03:02:55 +00:00
## Summary
This reverts commit 3060fd22c0.
These are now _never_ shown to users, because `tracing` isn't set up at
that point. I'm going to try and improve the solution more holistically,
but this is better than the status quo.
Closes https://github.com/astral-sh/uv/issues/7573.
This commit is contained in:
parent
2c6d353711
commit
85af2732ea
6 changed files with 35 additions and 4 deletions
|
|
@ -1,10 +1,10 @@
|
|||
use std::ops::Deref;
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
use tracing::{debug, warn};
|
||||
use tracing::debug;
|
||||
|
||||
use uv_fs::Simplified;
|
||||
use uv_warnings::owo_colors::OwoColorize;
|
||||
use uv_warnings::warn_user;
|
||||
|
||||
pub use crate::combine::*;
|
||||
pub use crate::settings::*;
|
||||
|
|
@ -74,7 +74,7 @@ impl FilesystemOptions {
|
|||
}
|
||||
Err(Error::PyprojectToml(file, err)) => {
|
||||
// If we see an invalid `pyproject.toml`, warn but continue.
|
||||
warn!(
|
||||
warn_user!(
|
||||
"Failed to parse `{}` during settings discovery:\n{}",
|
||||
file.cyan(),
|
||||
textwrap::indent(&err.to_string(), " ")
|
||||
|
|
@ -107,7 +107,7 @@ impl FilesystemOptions {
|
|||
.and_then(|content| toml::from_str::<PyProjectToml>(&content).ok())
|
||||
{
|
||||
if pyproject.tool.is_some_and(|tool| tool.uv.is_some()) {
|
||||
warn!(
|
||||
warn_user!(
|
||||
"Found both a `uv.toml` file and a `[tool.uv]` section in an adjacent `pyproject.toml`. The `[tool.uv]` section will be ignored in favor of the `uv.toml` file."
|
||||
);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue