From a90a5cba08fdf6c0ceb95101c275108a152a3aed Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:35:37 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- testing/mozbase/mozrunner/mozrunner/devices/android_device.py | 3 +-- testing/mozbase/mozrunner/setup.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'testing/mozbase/mozrunner') diff --git a/testing/mozbase/mozrunner/mozrunner/devices/android_device.py b/testing/mozbase/mozrunner/mozrunner/devices/android_device.py index 7cbec1b6f8..2db4743655 100644 --- a/testing/mozbase/mozrunner/mozrunner/devices/android_device.py +++ b/testing/mozbase/mozrunner/mozrunner/devices/android_device.py @@ -13,7 +13,6 @@ import subprocess import sys import telnetlib import time -from distutils.spawn import find_executable from enum import Enum import six @@ -942,7 +941,7 @@ def _find_sdk_exe(substs, exe, tools): if not found: # Is exe on PATH? - exe_path = find_executable(exe) + exe_path = shutil.which(exe) if exe_path: found = True else: diff --git a/testing/mozbase/mozrunner/setup.py b/testing/mozbase/mozrunner/setup.py index 72407ffd95..7233c17386 100644 --- a/testing/mozbase/mozrunner/setup.py +++ b/testing/mozbase/mozrunner/setup.py @@ -5,7 +5,7 @@ from setuptools import find_packages, setup PACKAGE_NAME = "mozrunner" -PACKAGE_VERSION = "8.3.0" +PACKAGE_VERSION = "8.3.1" desc = """Reliable start/stop/configuration of Mozilla Applications (Firefox, Thunderbird, etc.)""" @@ -15,7 +15,7 @@ deps = [ "mozinfo>=0.7,<2", "mozlog>=6.0", "mozprocess>=1.3.0,<2", - "mozprofile~=2.3", + "mozprofile~=3.0", "six>=1.13.0,<2", ] -- cgit v1.2.3