Skip to content

Commit 5d146dd

Browse files
committed
fix hpy unittest gate: defer installation to pip for better dependency management
1 parent 43537b1 commit 5d146dd

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

mx.graalpython/mx_graalpython.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -996,8 +996,9 @@ def run_hpy_unittests(python_binary, args=None, include_native=True, env=None, n
996996
mx.run_mx(["build", "--dependencies", "LLVM_TOOLCHAIN"])
997997
env.update(LLVM_TOOLCHAIN_VANILLA=mx_subst.path_substitutions.substitute('<path:LLVM_TOOLCHAIN>/bin'))
998998
mx.log("LLVM Toolchain (vanilla): {!s}".format(env["LLVM_TOOLCHAIN_VANILLA"]))
999-
mx.log("Ensure 'setuptools' is installed")
1000-
mx.run([python_binary] + args + ["-m", "ginstall", "install", "--user", "pytest"],
999+
mx.run([python_binary] + args + ["-m", "ensurepip", "--user"],
1000+
nonZeroIsFatal=nonZeroIsFatal, env=env, timeout=timeout)
1001+
mx.run([python_binary] + args + ["-m", "pip", "install", "--user", "pytest<=6.2.3", "pytest-xdist", "filelock"],
10011002
nonZeroIsFatal=nonZeroIsFatal, env=env, timeout=timeout)
10021003
if not is_collectiong_coverage():
10031004
# parallelize

0 commit comments

Comments
 (0)