pep440.parseVersionConds: Support expressions surrounded by parens

pyproject-nix · Jan 9, 2025 · c7fd60f · c7fd60f
1 parent e14a14d
commit c7fd60f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/lib/pep440.nix b/lib/pep440.nix
@@ -271,7 +271,13 @@ fix (self: {
         }
       ]
   */
-  parseVersionConds = conds: map self.parseVersionCond (splitComma conds);
+  parseVersionConds =
+    conds:
+    let
+      # If the conditions are surrounded by parens strip them away
+      parenM = match "\\((.+)\\)" conds;
+    in
+    map self.parseVersionCond (splitComma (if parenM != null then head parenM else conds));
 
   /*
     Compare two versions as parsed by `parseVersion` according to PEP-440.

diff --git a/lib/test_pep440.nix b/lib/test_pep440.nix
@@ -353,7 +353,7 @@ in
     };
   };
 
-  parseVersionConds = {
+  parseVersionConds = rec {
     testSimple = {
       expr = parseVersionConds ">=3.0.0rc1,<=4.0";
       expected = [
@@ -393,6 +393,11 @@ in
         }
       ];
     };
+
+    testParen = {
+      expr = parseVersionConds "(>=3.0.0rc1,<=4.0)";
+      inherit (testSimple) expected;
+    };
   };
 
   comparators = {