pep723: Pass through inputs inline script metadata in the metadata …

…verbatim
pyproject-nix · Jan 11, 2025 · 64fedca · 64fedca
1 parent 6251dce
commit 64fedca
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 1 deletion.
diff --git a/lib/pep723.nix b/lib/pep723.nix
@@ -111,6 +111,7 @@ in
       {
         requires-python = pep440.parseVersionConds (metadata.requires-python or "");
         dependencies = map pep508.parseString (metadata.dependencies or [ ]);
+        inherit metadata;
       }
     else
       default;

diff --git a/lib/scripts.nix b/lib/scripts.nix
@@ -53,7 +53,7 @@ fix (self: {
     fix (scriptSelf: {
       name = normalizePackageName name;
       script = script';
-      metadata = pep723.parseScript script';
+      metadata = parseScript script';
       renderWithPackages =
         {
           # Python interpreter

diff --git a/lib/test_pep723.nix b/lib/test_pep723.nix
@@ -29,6 +29,13 @@ in
         print("Hello world")
       '';
       expected = {
+        metadata = {
+          dependencies = [
+            "requests<3"
+            "rich"
+          ];
+          requires-python = ">=3.11";
+        };
         requires-python = requiresPython;
         dependencies = [
           requests
@@ -54,6 +61,13 @@ in
           requests
           rich
         ];
+        metadata = {
+          dependencies = [
+            "requests<3"
+            "rich"
+          ];
+          requires-python = ">=3.11";
+        };
       };
     };
 
@@ -77,6 +91,9 @@ in
         # ///
       '';
       expected = {
+        metadata = {
+          dependencies = [ "rich" ];
+        };
         requires-python = [ ];
         dependencies = [ rich ];
       };
@@ -89,11 +106,34 @@ in
         # ///
       '';
       expected = {
+        metadata = {
+          requires-python = ">=3.11";
+        };
         requires-python = requiresPython;
         dependencies = [ ];
       };
     };
 
+    testTool = {
+      expr = pep723.parseScript ''
+        # /// script
+        # [tool.uv]
+        # no-binary = true
+        # ///
+      '';
+      expected = {
+        requires-python = [ ];
+        dependencies = [ ];
+        metadata = {
+          tool = {
+            uv = {
+              no-binary = true;
+            };
+          };
+        };
+      };
+    };
+
     # A script with a shebang and a script section offset from the initial comment block
     testOffsetScript = {
       expr = pep723.parseScript ''
@@ -108,6 +148,13 @@ in
         # ///
       '';
       expected = {
+        metadata = {
+          dependencies = [
+            "requests<3"
+            "rich"
+          ];
+          requires-python = ">=3.11";
+        };
         requires-python = requiresPython;
         dependencies = [
           requests
@@ -134,6 +181,13 @@ in
           requests
           rich
         ];
+        metadata = {
+          dependencies = [
+            "requests<3"
+            "rich"
+          ];
+          requires-python = ">=3.11";
+        };
       };
     };
   };