From f3bcaf9f88aad2c423ebcd61121562f9834187d4 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 8 Apr 2024 17:11:27 +0200 Subject: Merging upstream version 115.8.0esr. Signed-off-by: Daniel Baumann --- tools/browsertime/mach_commands.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/browsertime') diff --git a/tools/browsertime/mach_commands.py b/tools/browsertime/mach_commands.py index 4850c82b75..68e9e3d5e7 100644 --- a/tools/browsertime/mach_commands.py +++ b/tools/browsertime/mach_commands.py @@ -81,9 +81,9 @@ def silence(): def node_path(command_context): import platform - from distutils.version import StrictVersion from mozbuild.nodeutil import find_node_executable + from packaging.version import Version state_dir = command_context._mach_context.state_dir cache_path = os.path.join(state_dir, "browsertime", "node-16") @@ -97,7 +97,7 @@ def node_path(command_context): ) # Check standard locations first - node_exe = find_node_executable(min_version=StrictVersion(MIN_NODE_VERSION)) + node_exe = find_node_executable(min_version=Version(MIN_NODE_VERSION)) if node_exe and (node_exe[0] is not None): return os.path.abspath(node_exe[0]) if not os.path.exists(cache_path): -- cgit v1.2.3