Add dev dependencies

Author: Hofer-Julian

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

@@ -168,6 +168,10 @@ pub trait HasDependencyConfig: Sized {
                     self.dependency_config().host = false;
                     self.dependency_config().build = true;
                 }
+                SpecType::Dev => {
+                    self.dependency_config().host = false;
+                    self.dependency_config().build = false;
+                }
                 SpecType::Run => {
                     self.dependency_config().host = false;
                     self.dependency_config().build = false;

crates/pixi_manifest/src/spec_type.rs

@@ -1,6 +1,8 @@
 #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 /// What kind of dependency spec do we have
 pub enum SpecType {
+    /// Dev dependencies are used during development of the package itself
+    Dev,
     /// Host dependencies are used that are needed by the host environment when
     /// running the project
     Host,
@@ -15,6 +17,7 @@ impl SpecType {
     /// Convert to a name used in the manifest
     pub fn name(&self) -> &'static str {
         match self {
+            SpecType::Dev => "dev-dependencies",
             SpecType::Host => "host-dependencies",
             SpecType::Build => "build-dependencies",
             SpecType::Run => "dependencies",
@@ -23,6 +26,12 @@ impl SpecType {
 
     /// Returns all the variants of the enum
     pub fn all() -> impl Iterator<Item = SpecType> {
-        [SpecType::Run, SpecType::Host, SpecType::Build].into_iter()
+        [
+            SpecType::Run,
+            SpecType::Dev,
+            SpecType::Host,
+            SpecType::Build,
+        ]
+        .into_iter()
     }
 }

crates/pixi_manifest/src/target.rs

@@ -60,6 +60,11 @@ impl WorkspaceTarget {
         self.dependencies.get(&SpecType::Host)
     }
 
+    /// Returns the dev dependencies of the target
+    pub fn dev_dependencies(&self) -> Option<&DependencyMap<PackageName, PixiSpec>> {
+        self.dependencies.get(&SpecType::Dev)
+    }
+
     /// Returns the build dependencies of the target
     pub fn build_dependencies(&self) -> Option<&DependencyMap<PackageName, PixiSpec>> {
         self.dependencies.get(&SpecType::Build)
@@ -341,6 +346,11 @@ impl PackageTarget {
         self.dependencies.get(&SpecType::Host)
     }
 
+    /// Returns the dev dependencies of the target
+    pub fn dev_dependencies(&self) -> Option<&DependencyMap<PackageName, PixiSpec>> {
+        self.dependencies.get(&SpecType::Dev)
+    }
+
     /// Returns the build dependencies of the target
     pub fn build_dependencies(&self) -> Option<&DependencyMap<PackageName, PixiSpec>> {
         self.dependencies.get(&SpecType::Build)

crates/pixi_manifest/src/toml/package.rs

@@ -135,6 +135,7 @@ pub struct TomlPackage {
     pub host_dependencies: Option<PixiSpanned<UniquePackageMap>>,
     pub build_dependencies: Option<PixiSpanned<UniquePackageMap>>,
     pub run_dependencies: Option<PixiSpanned<UniquePackageMap>>,
+    pub dev_dependencies: Option<PixiSpanned<UniquePackageMap>>,
     pub target: IndexMap<PixiSpanned<TargetSelector>, TomlPackageTarget>,
 
     pub span: Span,
@@ -173,6 +174,7 @@ impl<'de> toml_span::Deserialize<'de> for TomlPackage {
         let host_dependencies = th.optional("host-dependencies");
         let build_dependencies = th.optional("build-dependencies");
         let run_dependencies = th.optional("run-dependencies");
+        let dev_dependencies = th.optional("dev-dependencies");
         let build = th.required("build")?;
         let target = th
             .optional::<TomlWith<_, TomlIndexMap<_, Same>>>("target")
@@ -194,6 +196,7 @@ impl<'de> toml_span::Deserialize<'de> for TomlPackage {
             host_dependencies,
             build_dependencies,
             run_dependencies,
+            dev_dependencies,
             build,
             target,
             span: value.span,
@@ -338,6 +341,7 @@ impl TomlPackage {
             run_dependencies: self.run_dependencies,
             host_dependencies: self.host_dependencies,
             build_dependencies: self.build_dependencies,
+            dev_dependencies: self.dev_dependencies,
         }
         .into_package_target(preview)?;
 
@@ -611,6 +615,47 @@ mod test {
         );
     }
 
+    #[test]
+    fn test_dev_dependencies_parsing() {
+        let input = r#"
+        name = "foo"
+        version = "1.0"
+
+        [build]
+        backend = { name = "setuptools", version = "1.0" }
+
+        [package.dev-dependencies]
+        serde = "1.0"
+        "#;
+
+        let package = TomlPackage::from_toml_str(input).unwrap();
+        let manifest = package
+            .into_manifest(
+                WorkspacePackageProperties::default(),
+                PackageDefaults::default(),
+                &Preview::default(),
+                None,
+            )
+            .unwrap();
+
+        let dev_dependencies = manifest
+            .value
+            .targets
+            .default()
+            .dev_dependencies()
+            .expect("expected dev dependencies");
+
+        let serde_spec = dev_dependencies
+            .get("serde")
+            .and_then(|specs| specs.iter().next())
+            .expect("expected serde spec")
+            .as_version_spec()
+            .expect("expected version spec")
+            .to_string();
+
+        assert_eq!(serde_spec, "==1.0.0");
+    }
+
     #[test]
     fn test_invalid_workspace_false() {
         let input = r#"

crates/pixi_manifest/src/toml/package_target.rs

@@ -12,6 +12,7 @@ pub struct TomlPackageTarget {
     pub run_dependencies: Option<PixiSpanned<UniquePackageMap>>,
     pub host_dependencies: Option<PixiSpanned<UniquePackageMap>>,
     pub build_dependencies: Option<PixiSpanned<UniquePackageMap>>,
+    pub dev_dependencies: Option<PixiSpanned<UniquePackageMap>>,
 }
 
 impl<'de> toml_span::Deserialize<'de> for TomlPackageTarget {
@@ -20,11 +21,13 @@ impl<'de> toml_span::Deserialize<'de> for TomlPackageTarget {
         let run_dependencies = th.optional("run-dependencies");
         let host_dependencies = th.optional("host-dependencies");
         let build_dependencies = th.optional("build-dependencies");
+        let dev_dependencies = th.optional("dev-dependencies");
         th.finalize(None)?;
         Ok(TomlPackageTarget {
             run_dependencies,
             host_dependencies,
             build_dependencies,
+            dev_dependencies,
         })
     }
 }
@@ -35,6 +38,7 @@ impl TomlPackageTarget {
             dependencies: combine_target_dependencies(
                 [
                     (SpecType::Run, self.run_dependencies),
+                    (SpecType::Dev, self.dev_dependencies),
                     (SpecType::Host, self.host_dependencies),
                     (SpecType::Build, self.build_dependencies),
                 ],

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

@@ -2,7 +2,7 @@
 source: crates/pixi_manifest/src/toml/manifest.rs
 expression: "expect_parse_failure(r#\"\n        [workspace]\n        channels = []\n        platforms = []\n\n        [feature.foobar.run-dependencies]\n        \"#,)"
 ---
-  × Unexpected keys, expected only 'platforms', 'channels', 'channel-priority', 'target', 'dependencies', 'host-dependencies', 'build-dependencies', 'pypi-dependencies', 'develop', 'activation',
+  × Unexpected keys, expected only 'platforms', 'channels', 'channel-priority', 'target', 'dependencies', 'dev-dependencies', 'host-dependencies', 'build-dependencies', 'pypi-dependencies', 'develop', 'activation',
   │ 'tasks', 'pypi-options', 'system-requirements'
    ╭─[pixi.toml:6:25]
  5 │

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

@@ -2,7 +2,7 @@
 source: crates/pixi_manifest/src/toml/manifest.rs
 expression: "expect_parse_failure(r#\"\n        schema = false\n\n        [workspace]\n        channels = []\n        platforms = []\n        \"#,)"
 ---
-  × Unexpected keys, expected only 'workspace', 'package', 'target', 'dependencies', 'host-dependencies', 'build-dependencies', 'pypi-dependencies', 'develop', 'activation', 'tasks', 'feature',
+  × Unexpected keys, expected only 'workspace', 'package', 'target', 'dependencies', 'dev-dependencies', 'host-dependencies', 'build-dependencies', 'pypi-dependencies', 'develop', 'activation', 'tasks', 'feature',
   │ 'environments', 'pypi-options', 'system-requirements'
    ╭─[pixi.toml:2:9]
  1 │

schema/model.py

@@ -333,6 +333,10 @@ class PyPIVersion(_PyPIRequirement):
     None,
     description="The build `conda` dependencies, used in the build process. See https://pixi.sh/latest/build/dependency_types/ for more information.",
 )
+DevDependenciesField = Field(
+    None,
+    description="The development `conda` dependencies, installed for development workflows. See https://pixi.sh/latest/build/dependency_types/ for more information.",
+)
 RunDependenciesField = Field(
     None,
     description="The `conda` dependencies required at runtime. See https://pixi.sh/latest/build/dependency_types/ for more information.",
@@ -512,6 +516,7 @@ class Target(StrictBaseModel):
     dependencies: Dependencies = DependenciesField
     host_dependencies: Dependencies = HostDependenciesField
     build_dependencies: Dependencies = BuildDependenciesField
+    dev_dependencies: Dependencies = DevDependenciesField
     pypi_dependencies: dict[PyPIPackageName, PyPIRequirement] | None = Field(
         None, description="The PyPI dependencies for this target"
     )
@@ -551,6 +556,7 @@ class Feature(StrictBaseModel):
     dependencies: Dependencies = DependenciesField
     host_dependencies: Dependencies = HostDependenciesField
     build_dependencies: Dependencies = BuildDependenciesField
+    dev_dependencies: Dependencies = DevDependenciesField
     pypi_dependencies: dict[PyPIPackageName, PyPIRequirement] | None = Field(
         None, description="The PyPI dependencies of this feature"
     )
@@ -720,6 +726,7 @@ class Package(StrictBaseModel):
 
     host_dependencies: Dependencies = HostDependenciesField
     build_dependencies: Dependencies = BuildDependenciesField
+    dev_dependencies: Dependencies = DevDependenciesField
     run_dependencies: Dependencies = RunDependenciesField
 
     target: dict[TargetName, Target] | None = Field(
@@ -791,6 +798,7 @@ class PackageTarget(StrictBaseModel):
     run_dependencies: Dependencies = RunDependenciesField
     host_dependencies: Dependencies = HostDependenciesField
     build_dependencies: Dependencies = BuildDependenciesField
+    dev_dependencies: Dependencies = DevDependenciesField
 
 
 #######################
@@ -828,6 +836,7 @@ class BaseManifest(StrictBaseModel):
     dependencies: Dependencies = DependenciesField
     host_dependencies: Dependencies = HostDependenciesField
     build_dependencies: Dependencies = BuildDependenciesField
+    dev_dependencies: Dependencies = DevDependenciesField
     pypi_dependencies: dict[PyPIPackageName, PyPIRequirement] | None = Field(
         None, description="The PyPI dependencies"
     )