Start to impl

Author: charliermarsh

crates/uv-distribution-types/src/resolution.rs

@@ -19,7 +19,7 @@ pub struct Resolution {
 }
 
 impl Resolution {
-    /// Create a new resolution from the given pinned packages.
+    /// Create a [`Resolution`] from the given pinned packages.
     pub fn new(graph: petgraph::graph::DiGraph<Node, Edge>) -> Self {
         Self {
             graph,
@@ -208,17 +208,6 @@ pub enum Edge {
     Dev(GroupName, MarkerTree),
 }
 
-impl Edge {
-    /// Return the [`MarkerTree`] for this edge.
-    pub fn marker(&self) -> &MarkerTree {
-        match self {
-            Self::Prod(marker) => marker,
-            Self::Optional(_, marker) => marker,
-            Self::Dev(_, marker) => marker,
-        }
-    }
-}
-
 impl From<&ResolvedDist> for RequirementSource {
     fn from(resolved_dist: &ResolvedDist) -> Self {
         match resolved_dist {

crates/uv-requirements/src/sources.rs

@@ -13,6 +13,8 @@ pub enum RequirementsSource {
     Package(RequirementsTxtRequirement),
     /// An editable path was provided on the command line (e.g., `pip install -e ../flask`).
     Editable(RequirementsTxtRequirement),
+    /// Dependencies were provided via a `pylock.toml` file.
+    PylockToml(PathBuf),
     /// Dependencies were provided via a `requirements.txt` file (e.g., `pip install -r requirements.txt`).
     RequirementsTxt(PathBuf),
     /// Dependencies were provided via a `pyproject.toml` file (e.g., `pip-compile pyproject.toml`).
@@ -27,6 +29,12 @@ pub enum RequirementsSource {
     EnvironmentYml(PathBuf),
 }
 
+/// Returns `true` if a file name matches the `pylock.toml` pattern defined in PEP 751.
+#[allow(clippy::case_sensitive_file_extension_comparisons)]
+fn is_pylock_toml(file_name: &str) -> bool {
+    file_name.starts_with("pylock.") && file_name.ends_with(".toml")
+}
+
 impl RequirementsSource {
     /// Parse a [`RequirementsSource`] from a [`PathBuf`]. The file type is determined by the file
     /// extension.
@@ -39,19 +47,32 @@ impl RequirementsSource {
             Self::SetupCfg(path)
         } else if path.ends_with("environment.yml") {
             Self::EnvironmentYml(path)
+        } else if path
+            .file_name()
+            .is_some_and(|file_name| file_name.to_str().is_some_and(is_pylock_toml))
+        {
+            Self::PylockToml(path)
         } else {
             Self::RequirementsTxt(path)
         }
     }
 
     /// Parse a [`RequirementsSource`] from a `requirements.txt` file.
     pub fn from_requirements_txt(path: PathBuf) -> Self {
-        for filename in ["pyproject.toml", "setup.py", "setup.cfg"] {
-            if path.ends_with(filename) {
+        for file_name in ["pyproject.toml", "setup.py", "setup.cfg"] {
+            if path.ends_with(file_name) {
                 warn_user!(
                     "The file `{}` appears to be a `{}` file, but requirements must be specified in `requirements.txt` format.",
                     path.user_display(),
-                    filename
+                    file_name
+                );
+            }
+        }
+        if let Some(file_name) = path.file_name() {
+            if file_name.to_str().is_some_and(is_pylock_toml) {
+                warn_user!(
+                    "The file `{}` appears to be a `pylock.toml` file, but requirements must be specified in `requirements.txt` format.",
+                    path.user_display(),
                 );
             }
         }
@@ -60,12 +81,20 @@ impl RequirementsSource {
 
     /// Parse a [`RequirementsSource`] from a `constraints.txt` file.
     pub fn from_constraints_txt(path: PathBuf) -> Self {
-        for filename in ["pyproject.toml", "setup.py", "setup.cfg"] {
-            if path.ends_with(filename) {
+        for file_name in ["pyproject.toml", "setup.py", "setup.cfg"] {
+            if path.ends_with(file_name) {
                 warn_user!(
                     "The file `{}` appears to be a `{}` file, but constraints must be specified in `requirements.txt` format.",
                     path.user_display(),
-                    filename
+                    file_name
+                );
+            }
+        }
+        if let Some(file_name) = path.file_name() {
+            if file_name.to_str().is_some_and(is_pylock_toml) {
+                warn_user!(
+                    "The file `{}` appears to be a `pylock.toml` file, but constraints must be specified in `requirements.txt` format.",
+                    path.user_display(),
                 );
             }
         }
@@ -74,12 +103,20 @@ impl RequirementsSource {
 
     /// Parse a [`RequirementsSource`] from an `overrides.txt` file.
     pub fn from_overrides_txt(path: PathBuf) -> Self {
-        for filename in ["pyproject.toml", "setup.py", "setup.cfg"] {
-            if path.ends_with(filename) {
+        for file_name in ["pyproject.toml", "setup.py", "setup.cfg"] {
+            if path.ends_with(file_name) {
                 warn_user!(
                     "The file `{}` appears to be a `{}` file, but overrides must be specified in `requirements.txt` format.",
                     path.user_display(),
-                    filename
+                    file_name
+                );
+            }
+        }
+        if let Some(file_name) = path.file_name() {
+            if file_name.to_str().is_some_and(is_pylock_toml) {
+                warn_user!(
+                    "The file `{}` appears to be a `pylock.toml` file, but overrides must be specified in `requirements.txt` format.",
+                    path.user_display(),
                 );
             }
         }
@@ -110,7 +147,10 @@ impl RequirementsSource {
 
         // Similarly, if the user provided a `pyproject.toml` file without `-r` (as in
         // `uv pip install pyproject.toml`), prompt them to correct it.
-        if (name == "pyproject.toml" || name == "setup.py" || name == "setup.cfg")
+        if (name == "pyproject.toml"
+            || name == "setup.py"
+            || name == "setup.cfg"
+            || is_pylock_toml(name))
             && Path::new(&name).is_file()
         {
             let term = Term::stderr();
@@ -155,7 +195,10 @@ impl RequirementsSource {
 
         // Similarly, if the user provided a `pyproject.toml` file without `--with-requirements` (as in
         // `uvx --with pyproject.toml ruff`), prompt them to correct it.
-        if (name == "pyproject.toml" || name == "setup.py" || name == "setup.cfg")
+        if (name == "pyproject.toml"
+            || name == "setup.py"
+            || name == "setup.cfg"
+            || is_pylock_toml(name))
             && Path::new(&name).is_file()
         {
             let term = Term::stderr();
@@ -217,7 +260,8 @@ impl std::fmt::Display for RequirementsSource {
         match self {
             Self::Package(package) => write!(f, "{package:?}"),
             Self::Editable(path) => write!(f, "-e {path:?}"),
-            Self::RequirementsTxt(path)
+            Self::PylockToml(path)
+            | Self::RequirementsTxt(path)
             | Self::PyprojectToml(path)
             | Self::SetupPy(path)
             | Self::SetupCfg(path)

crates/uv-requirements/src/specification.rs

@@ -61,6 +61,8 @@ pub struct RequirementsSpecification {
     pub constraints: Vec<NameRequirementSpecification>,
     /// The overrides for the project.
     pub overrides: Vec<UnresolvedRequirementSpecification>,
+    /// The `pylock.toml` file from which to extract the resolution.
+    pub pylock: Option<PathBuf>,
     /// The source trees from which to extract requirements.
     pub source_trees: Vec<PathBuf>,
     /// The groups to use for `source_trees`
@@ -190,6 +192,16 @@ impl RequirementsSpecification {
                     ..Self::default()
                 }
             }
+            RequirementsSource::PylockToml(path) => {
+                if !path.is_file() {
+                    return Err(anyhow::anyhow!("File not found: `{}`", path.user_display()));
+                }
+
+                Self {
+                    pylock: Some(path.clone()),
+                    ..Self::default()
+                }
+            }
             RequirementsSource::SourceTree(path) => {
                 if !path.is_dir() {
                     return Err(anyhow::anyhow!(
@@ -231,7 +243,66 @@ impl RequirementsSpecification {
     ) -> Result<Self> {
         let mut spec = Self::default();
 
-        // Resolve sources into specifications so we know their `source_tree`s∂
+        // Disallow `pylock.toml` files as constraints.
+        if let Some(pylock_toml) = constraints.iter().find_map(|source| {
+            if let RequirementsSource::PylockToml(path) = source {
+                Some(path)
+            } else {
+                None
+            }
+        }) {
+            return Err(anyhow::anyhow!(
+                "Cannot use `{}` as a constraint file",
+                pylock_toml.user_display()
+            ));
+        }
+
+        // Disallow `pylock.toml` files as overrides.
+        if let Some(pylock_toml) = overrides.iter().find_map(|source| {
+            if let RequirementsSource::PylockToml(path) = source {
+                Some(path)
+            } else {
+                None
+            }
+        }) {
+            return Err(anyhow::anyhow!(
+                "Cannot use `{}` as an override file",
+                pylock_toml.user_display()
+            ));
+        }
+
+        // If we have a `pylock.toml`, don't allow additional requirements, constraints, or
+        // overrides.
+        if requirements
+            .iter()
+            .any(|source| matches!(source, RequirementsSource::PylockToml(..)))
+        {
+            if requirements
+                .iter()
+                .any(|source| !matches!(source, RequirementsSource::PylockToml(..)))
+            {
+                return Err(anyhow::anyhow!(
+                    "Cannot specify additional requirements alongside a `pylock.toml` file",
+                ));
+            }
+            if !constraints.is_empty() {
+                return Err(anyhow::anyhow!(
+                    "Cannot specify additional requirements with a `pylock.toml` file"
+                ));
+            }
+            if !overrides.is_empty() {
+                return Err(anyhow::anyhow!(
+                    "Cannot specify constraints with a `pylock.toml` file"
+                ));
+            }
+            if !groups.is_empty() {
+                return Err(anyhow::anyhow!(
+                    "Cannot specify groups with a `pylock.toml` file"
+                ));
+            }
+        }
+
+        // Resolve sources into specifications so we know their `source_tree`.
         let mut requirement_sources = Vec::new();
         for source in requirements {
             let source = Self::from_source(source, client_builder).await?;
@@ -301,6 +372,18 @@ impl RequirementsSpecification {
             spec.extras.extend(source.extras);
             spec.source_trees.extend(source.source_trees);
 
+            // Allow at most one `pylock.toml`.
+            if let Some(pylock) = source.pylock {
+                if let Some(existing) = spec.pylock {
+                    return Err(anyhow::anyhow!(
+                        "Multiple `pylock.toml` files specified: `{}` vs. `{}`",
+                        existing.user_display(),
+                        pylock.user_display()
+                    ));
+                }
+                spec.pylock = Some(pylock);
+            }
+
             // Use the first project name discovered.
             if spec.project.is_none() {
                 spec.project = source.project;