зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1864106 - Make raptor.py Python 3.11 compatible. r=perftest-reviewers,kshampur
The global flag of regular expression has to be head from 3.11. Differential Revision: https://phabricator.services.mozilla.com/D193267
This commit is contained in:
Родитель
f1ca9e618f
Коммит
9c00b13451
|
@ -49,11 +49,11 @@ RaptorErrorList = (
|
|||
{"regex": re.compile(r"""run-as: Package '.*' is unknown"""), "level": DEBUG},
|
||||
{"substr": r"""raptorDebug""", "level": DEBUG},
|
||||
{
|
||||
"regex": re.compile(r"""^raptor[a-zA-Z-]*( - )?( )?(?i)error(:)?"""),
|
||||
"regex": re.compile(r"""(?i)^raptor[a-z-]*( - )?( )?error(:)?"""),
|
||||
"level": ERROR,
|
||||
},
|
||||
{
|
||||
"regex": re.compile(r"""^raptor[a-zA-Z-]*( - )?( )?(?i)critical(:)?"""),
|
||||
"regex": re.compile(r"""(?i)^raptor[a-z-]*( - )?( )?critical(:)?"""),
|
||||
"level": CRITICAL,
|
||||
},
|
||||
{
|
||||
|
@ -1189,11 +1189,11 @@ class Raptor(
|
|||
else: # python version >= 3.8
|
||||
modules.extend(
|
||||
[
|
||||
"numpy==1.22.0",
|
||||
"Pillow==9.0.0",
|
||||
"scipy==1.7.3",
|
||||
"numpy==1.23.5",
|
||||
"Pillow==9.2.0",
|
||||
"scipy==1.9.3",
|
||||
"pyssim==0.4",
|
||||
"opencv-python==4.5.4.60",
|
||||
"opencv-python==4.7.0.72",
|
||||
]
|
||||
)
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@ class RaptorRunner(MozbuildObject):
|
|||
3. Run mozharness
|
||||
"""
|
||||
# Validate that the user is using a supported python version before doing anything else
|
||||
max_py_major, max_py_minor = 3, 10
|
||||
max_py_major, max_py_minor = 3, 11
|
||||
sys_maj, sys_min = sys.version_info.major, sys.version_info.minor
|
||||
if sys_min > max_py_minor:
|
||||
raise PythonVersionException(
|
||||
|
|
|
@ -58,9 +58,10 @@ OPENCV_VERSION = "4.5.4.60"
|
|||
|
||||
py3_minor = sys.version_info.minor
|
||||
if py3_minor > 7:
|
||||
SCIPY_VERSION = "1.7.3"
|
||||
NUMPY_VERSION = "1.22.0"
|
||||
PILLOW_VERSION = "9.0.0"
|
||||
SCIPY_VERSION = "1.9.3"
|
||||
NUMPY_VERSION = "1.23.5"
|
||||
PILLOW_VERSION = "9.2.0"
|
||||
OPENCV_VERSION = "4.7.0.72"
|
||||
|
||||
MIN_NODE_VERSION = "16.0.0"
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче