Cherrypick mods from nodejs/gyp-next#201

nodejs · Sep 14, 2023 · 3b10136 · 3b10136
1 parent 7aad092
commit 3b10136
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/gyp/pylib/gyp/input.py b/gyp/pylib/gyp/input.py
@@ -16,7 +16,7 @@
 import sys
 import threading
 import traceback
-from distutils.version import StrictVersion
+from packaging.version import Version
 from gyp.common import GypError
 from gyp.common import OrderedSet
 
@@ -1183,7 +1183,7 @@ def EvalSingleCondition(cond_expr, true_dict, false_dict, phase, variables, buil
         else:
             ast_code = compile(cond_expr_expanded, "<string>", "eval")
             cached_conditions_asts[cond_expr_expanded] = ast_code
-        env = {"__builtins__": {}, "v": StrictVersion}
+        env = {"__builtins__": {}, "v": Version}
         if eval(ast_code, env, variables):
             return true_dict
         return false_dict

diff --git a/gyp/pyproject.toml b/gyp/pyproject.toml
@@ -26,6 +26,7 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
 ]
+dependencies = ["packaging"]
 
 [project.optional-dependencies]
 dev = ["flake8", "pytest"]