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

fix: Use correct dependency location for pixi upgrade #2472

Merged
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Remove commented code and update implementation
Hofer-Julian committed Dec 2, 2024
commit e0eae34b79335e60f692eb65652d136c3a1cf46b
9 changes: 3 additions & 6 deletions crates/pixi_manifest/src/manifests/source.rs
Original file line number Diff line number Diff line change
@@ -195,9 +195,6 @@ impl ManifestSource {
platform: Option<Platform>,
feature_name: &FeatureName,
) -> Result<(), TomlError> {
// let dependency_table =
// self.get_or_insert_toml_table(platform, feature_name, spec_type.name())?;

let dependency_table = TableName::new()
.with_prefix(self.table_prefix())
.with_platform(platform.as_ref())
@@ -208,8 +205,6 @@ impl ManifestSource {
.get_or_insert_nested_table(dependency_table.to_string().as_str())
.map(|t| t.insert(name.as_normalized(), Item::Value(spec.to_toml_value())))?;

// dependency_table.insert(name.as_normalized(),
// Item::Value(spec.to_toml_value()));
Ok(())
}

@@ -280,7 +275,9 @@ impl ManifestSource {
.push(requirement.to_string());
Ok(())
};
if feature_name.is_default() {
if feature_name.is_default()
|| matches!(location, Some(PypiDependencyLocation::Dependencies))
{
add_requirement(self, "project", "dependencies")?
} else if matches!(location, Some(PypiDependencyLocation::OptionalDependencies)) {
add_requirement(