Skip to content

Commit c6efec5

Browse files
committed
Revert "Add dev dependencies"
This reverts commit b660f5e.
1 parent c312f5f commit c6efec5

File tree

8 files changed

+3
-84
lines changed

8 files changed

+3
-84
lines changed

crates/pixi/tests/integration_rust/common/builders.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,6 @@ pub trait HasDependencyConfig: Sized {
168168
self.dependency_config().host = false;
169169
self.dependency_config().build = true;
170170
}
171-
SpecType::Dev => {
172-
self.dependency_config().host = false;
173-
self.dependency_config().build = false;
174-
}
175171
SpecType::Run => {
176172
self.dependency_config().host = false;
177173
self.dependency_config().build = false;
Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
22
/// What kind of dependency spec do we have
33
pub enum SpecType {
4-
/// Dev dependencies are used during development of the package itself
5-
Dev,
64
/// Host dependencies are used that are needed by the host environment when
75
/// running the project
86
Host,
@@ -17,7 +15,6 @@ impl SpecType {
1715
/// Convert to a name used in the manifest
1816
pub fn name(&self) -> &'static str {
1917
match self {
20-
SpecType::Dev => "dev-dependencies",
2118
SpecType::Host => "host-dependencies",
2219
SpecType::Build => "build-dependencies",
2320
SpecType::Run => "dependencies",
@@ -26,12 +23,6 @@ impl SpecType {
2623

2724
/// Returns all the variants of the enum
2825
pub fn all() -> impl Iterator<Item = SpecType> {
29-
[
30-
SpecType::Run,
31-
SpecType::Dev,
32-
SpecType::Host,
33-
SpecType::Build,
34-
]
35-
.into_iter()
26+
[SpecType::Run, SpecType::Host, SpecType::Build].into_iter()
3627
}
3728
}

crates/pixi_manifest/src/target.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@ impl WorkspaceTarget {
6060
self.dependencies.get(&SpecType::Host)
6161
}
6262

63-
/// Returns the dev dependencies of the target
64-
pub fn dev_dependencies(&self) -> Option<&DependencyMap<PackageName, PixiSpec>> {
65-
self.dependencies.get(&SpecType::Dev)
66-
}
67-
6863
/// Returns the build dependencies of the target
6964
pub fn build_dependencies(&self) -> Option<&DependencyMap<PackageName, PixiSpec>> {
7065
self.dependencies.get(&SpecType::Build)
@@ -346,11 +341,6 @@ impl PackageTarget {
346341
self.dependencies.get(&SpecType::Host)
347342
}
348343

349-
/// Returns the dev dependencies of the target
350-
pub fn dev_dependencies(&self) -> Option<&DependencyMap<PackageName, PixiSpec>> {
351-
self.dependencies.get(&SpecType::Dev)
352-
}
353-
354344
/// Returns the build dependencies of the target
355345
pub fn build_dependencies(&self) -> Option<&DependencyMap<PackageName, PixiSpec>> {
356346
self.dependencies.get(&SpecType::Build)

crates/pixi_manifest/src/toml/package.rs

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ pub struct TomlPackage {
135135
pub host_dependencies: Option<PixiSpanned<UniquePackageMap>>,
136136
pub build_dependencies: Option<PixiSpanned<UniquePackageMap>>,
137137
pub run_dependencies: Option<PixiSpanned<UniquePackageMap>>,
138-
pub dev_dependencies: Option<PixiSpanned<UniquePackageMap>>,
139138
pub target: IndexMap<PixiSpanned<TargetSelector>, TomlPackageTarget>,
140139

141140
pub span: Span,
@@ -174,7 +173,6 @@ impl<'de> toml_span::Deserialize<'de> for TomlPackage {
174173
let host_dependencies = th.optional("host-dependencies");
175174
let build_dependencies = th.optional("build-dependencies");
176175
let run_dependencies = th.optional("run-dependencies");
177-
let dev_dependencies = th.optional("dev-dependencies");
178176
let build = th.required("build")?;
179177
let target = th
180178
.optional::<TomlWith<_, TomlIndexMap<_, Same>>>("target")
@@ -196,7 +194,6 @@ impl<'de> toml_span::Deserialize<'de> for TomlPackage {
196194
host_dependencies,
197195
build_dependencies,
198196
run_dependencies,
199-
dev_dependencies,
200197
build,
201198
target,
202199
span: value.span,
@@ -341,7 +338,6 @@ impl TomlPackage {
341338
run_dependencies: self.run_dependencies,
342339
host_dependencies: self.host_dependencies,
343340
build_dependencies: self.build_dependencies,
344-
dev_dependencies: self.dev_dependencies,
345341
}
346342
.into_package_target(preview)?;
347343

@@ -615,47 +611,6 @@ mod test {
615611
);
616612
}
617613

618-
#[test]
619-
fn test_dev_dependencies_parsing() {
620-
let input = r#"
621-
name = "foo"
622-
version = "1.0"
623-
624-
[build]
625-
backend = { name = "setuptools", version = "1.0" }
626-
627-
[package.dev-dependencies]
628-
serde = "1.0"
629-
"#;
630-
631-
let package = TomlPackage::from_toml_str(input).unwrap();
632-
let manifest = package
633-
.into_manifest(
634-
WorkspacePackageProperties::default(),
635-
PackageDefaults::default(),
636-
&Preview::default(),
637-
None,
638-
)
639-
.unwrap();
640-
641-
let dev_dependencies = manifest
642-
.value
643-
.targets
644-
.default()
645-
.dev_dependencies()
646-
.expect("expected dev dependencies");
647-
648-
let serde_spec = dev_dependencies
649-
.get("serde")
650-
.and_then(|specs| specs.iter().next())
651-
.expect("expected serde spec")
652-
.as_version_spec()
653-
.expect("expected version spec")
654-
.to_string();
655-
656-
assert_eq!(serde_spec, "==1.0.0");
657-
}
658-
659614
#[test]
660615
fn test_invalid_workspace_false() {
661616
let input = r#"

crates/pixi_manifest/src/toml/package_target.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ pub struct TomlPackageTarget {
1212
pub run_dependencies: Option<PixiSpanned<UniquePackageMap>>,
1313
pub host_dependencies: Option<PixiSpanned<UniquePackageMap>>,
1414
pub build_dependencies: Option<PixiSpanned<UniquePackageMap>>,
15-
pub dev_dependencies: Option<PixiSpanned<UniquePackageMap>>,
1615
}
1716

1817
impl<'de> toml_span::Deserialize<'de> for TomlPackageTarget {
@@ -21,13 +20,11 @@ impl<'de> toml_span::Deserialize<'de> for TomlPackageTarget {
2120
let run_dependencies = th.optional("run-dependencies");
2221
let host_dependencies = th.optional("host-dependencies");
2322
let build_dependencies = th.optional("build-dependencies");
24-
let dev_dependencies = th.optional("dev-dependencies");
2523
th.finalize(None)?;
2624
Ok(TomlPackageTarget {
2725
run_dependencies,
2826
host_dependencies,
2927
build_dependencies,
30-
dev_dependencies,
3128
})
3229
}
3330
}
@@ -38,7 +35,6 @@ impl TomlPackageTarget {
3835
dependencies: combine_target_dependencies(
3936
[
4037
(SpecType::Run, self.run_dependencies),
41-
(SpecType::Dev, self.dev_dependencies),
4238
(SpecType::Host, self.host_dependencies),
4339
(SpecType::Build, self.build_dependencies),
4440
],

crates/pixi_manifest/src/toml/snapshots/pixi_manifest__toml__manifest__test__run_dependencies_in_feature.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
source: crates/pixi_manifest/src/toml/manifest.rs
33
expression: "expect_parse_failure(r#\"\n [workspace]\n channels = []\n platforms = []\n\n [feature.foobar.run-dependencies]\n \"#,)"
44
---
5-
× Unexpected keys, expected only 'platforms', 'channels', 'channel-priority', 'target', 'dependencies', 'dev-dependencies', 'host-dependencies', 'build-dependencies', 'pypi-dependencies', 'develop', 'activation',
5+
× Unexpected keys, expected only 'platforms', 'channels', 'channel-priority', 'target', 'dependencies', 'host-dependencies', 'build-dependencies', 'pypi-dependencies', 'develop', 'activation',
66
'tasks', 'pypi-options', 'system-requirements'
77
╭─[pixi.toml:6:25]
88
5

crates/pixi_manifest/src/toml/snapshots/pixi_manifest__toml__manifest__test__schema_must_be_string.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
source: crates/pixi_manifest/src/toml/manifest.rs
33
expression: "expect_parse_failure(r#\"\n schema = false\n\n [workspace]\n channels = []\n platforms = []\n \"#,)"
44
---
5-
× Unexpected keys, expected only 'workspace', 'package', 'target', 'dependencies', 'dev-dependencies', 'host-dependencies', 'build-dependencies', 'pypi-dependencies', 'develop', 'activation', 'tasks', 'feature',
5+
× Unexpected keys, expected only 'workspace', 'package', 'target', 'dependencies', 'host-dependencies', 'build-dependencies', 'pypi-dependencies', 'develop', 'activation', 'tasks', 'feature',
66
'environments', 'pypi-options', 'system-requirements'
77
╭─[pixi.toml:2:9]
88
1

schema/model.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -333,10 +333,6 @@ class PyPIVersion(_PyPIRequirement):
333333
None,
334334
description="The build `conda` dependencies, used in the build process. See https://pixi.sh/latest/build/dependency_types/ for more information.",
335335
)
336-
DevDependenciesField = Field(
337-
None,
338-
description="The development `conda` dependencies, installed for development workflows. See https://pixi.sh/latest/build/dependency_types/ for more information.",
339-
)
340336
RunDependenciesField = Field(
341337
None,
342338
description="The `conda` dependencies required at runtime. See https://pixi.sh/latest/build/dependency_types/ for more information.",
@@ -516,7 +512,6 @@ class Target(StrictBaseModel):
516512
dependencies: Dependencies = DependenciesField
517513
host_dependencies: Dependencies = HostDependenciesField
518514
build_dependencies: Dependencies = BuildDependenciesField
519-
dev_dependencies: Dependencies = DevDependenciesField
520515
pypi_dependencies: dict[PyPIPackageName, PyPIRequirement] | None = Field(
521516
None, description="The PyPI dependencies for this target"
522517
)
@@ -556,7 +551,6 @@ class Feature(StrictBaseModel):
556551
dependencies: Dependencies = DependenciesField
557552
host_dependencies: Dependencies = HostDependenciesField
558553
build_dependencies: Dependencies = BuildDependenciesField
559-
dev_dependencies: Dependencies = DevDependenciesField
560554
pypi_dependencies: dict[PyPIPackageName, PyPIRequirement] | None = Field(
561555
None, description="The PyPI dependencies of this feature"
562556
)
@@ -726,7 +720,6 @@ class Package(StrictBaseModel):
726720

727721
host_dependencies: Dependencies = HostDependenciesField
728722
build_dependencies: Dependencies = BuildDependenciesField
729-
dev_dependencies: Dependencies = DevDependenciesField
730723
run_dependencies: Dependencies = RunDependenciesField
731724

732725
target: dict[TargetName, Target] | None = Field(
@@ -798,7 +791,6 @@ class PackageTarget(StrictBaseModel):
798791
run_dependencies: Dependencies = RunDependenciesField
799792
host_dependencies: Dependencies = HostDependenciesField
800793
build_dependencies: Dependencies = BuildDependenciesField
801-
dev_dependencies: Dependencies = DevDependenciesField
802794

803795

804796
#######################
@@ -836,7 +828,6 @@ class BaseManifest(StrictBaseModel):
836828
dependencies: Dependencies = DependenciesField
837829
host_dependencies: Dependencies = HostDependenciesField
838830
build_dependencies: Dependencies = BuildDependenciesField
839-
dev_dependencies: Dependencies = DevDependenciesField
840831
pypi_dependencies: dict[PyPIPackageName, PyPIRequirement] | None = Field(
841832
None, description="The PyPI dependencies"
842833
)

0 commit comments

Comments
 (0)