Skip to content

Commit 8162d9d

Browse files
committed
do not upgrqade setuptools unless linux
1 parent 6844130 commit 8162d9d

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

tests/test_verify_build.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,10 @@ def test_pip_install_salt_git(pipexec, build, build_dir, pyexec, build_version):
107107
if sys.platform == "darwin" and "3.13" in build_version:
108108
pytest.xfail("Salt does not work with 3.13 on macos yet")
109109

110-
subprocess.run([pipexec, "--upgrade", "install", "setuptools>=72.2.0"], check=True)
110+
# if sys.platform == "linux":
111+
# subprocess.run(
112+
# [pipexec, "--upgrade", "install", "setuptools>=72.2.0"], check=True
113+
# )
111114

112115
env = os.environ.copy()
113116
env["RELENV_BUILDENV"] = "yes"
@@ -582,8 +585,10 @@ def test_pip_install_m2crypto_system_ssl(pipexec, pyexec):
582585
],
583586
)
584587
def test_pip_install_m2crypto_relenv_ssl(
585-
m2crypto_version, pipexec, pyexec, build, minor_version
588+
m2crypto_version, pipexec, pyexec, build, build_version, minor_version
586589
):
590+
if m2crypto_version == "0.38.0" and minor_version in ["3.12", "3.13"]:
591+
pytest.xfail("Fails due to no distutils")
587592
env = os.environ.copy()
588593
env["RELENV_BUILDENV"] = "yes"
589594
env["RELENV_DEBUG"] = "yes"

0 commit comments

Comments
 (0)