Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 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
40 changes: 14 additions & 26 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ pep440_rs = "0.7.3"
pep508_rs = "0.9.2"
percent-encoding = "2.3.1"
pin-project-lite = "0.2.16"
pyproject-toml = "0.13.4"
pyproject-toml = "0.13.6"
rand = { version = "0.9.1", default-features = false }
rayon = "1.10.0"
regex = "1.11.1"
Expand Down
6 changes: 3 additions & 3 deletions crates/pixi_api/src/workspace/init/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,10 @@ pub(crate) async fn init<I: Interface>(
}

let (name, pixi_name) = match pyproject.name() {
Some(name) => (name, false),
None => (default_name.as_str(), true),
Some(name) => (name.to_string(), false),
None => (default_name.clone(), true),
};
let environments = pyproject.environments_from_extras().into_diagnostic()?;
let environments = pyproject.environments_from_groups().into_diagnostic()?;
let rv = env
.render_named_str(
consts::PYPROJECT_MANIFEST,
Expand Down
4 changes: 4 additions & 0 deletions crates/pixi_manifest/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use itertools::Itertools;
use miette::{Diagnostic, LabeledSpan, SourceOffset, SourceSpan};
use pixi_pypi_spec::Pep508ToPyPiRequirementError;
use pixi_toml::TomlDiagnostic;
use pyproject_toml::ResolveError;
use rattler_conda_types::{InvalidPackageNameError, version_spec::ParseVersionSpecError};
use thiserror::Error;
use toml_span::{DeserError, Error};
Expand Down Expand Up @@ -113,6 +114,8 @@ pub enum TomlError {
#[error(transparent)]
Conversion(#[from] Box<Pep508ToPyPiRequirementError>),
#[error(transparent)]
ResolveError(#[from] ResolveError),
#[error(transparent)]
InvalidNonPackageDependencies(#[from] InvalidNonPackageDependencies),
}

Expand Down Expand Up @@ -163,6 +166,7 @@ impl Display for TomlError {
write!(f, "Could not convert pep508 to pixi pypi requirement")
}
TomlError::InvalidNonPackageDependencies(err) => write!(f, "{err}"),
TomlError::ResolveError(err) => write!(f, "{}", err),
}
}
}
Expand Down
Loading
Loading