Skip to content

Commit 3b260ba

Browse files
committed
Simplify pyzmq install test
1 parent 54c8fff commit 3b260ba

File tree

1 file changed

+23
-6
lines changed

1 file changed

+23
-6
lines changed

tests/test_verify_build.py

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# Copyright 2025 Broadcom.
12
# Copyright 2022-2024 VMware, Inc.
23
# SPDX-License-Identifier: Apache-2
34
"""
@@ -331,13 +332,20 @@ def test_pip_install_salt_w_package_requirements(
331332
# assert script.exists()
332333

333334

334-
@pytest.mark.parametrize("pyzmq_version", ["23.2.0", "25.1.2", "26.2.0"])
335+
@pytest.mark.parametrize(
336+
"pyzmq_version",
337+
[
338+
"23.2.0",
339+
"25.1.2",
340+
"26.2.0",
341+
],
342+
)
335343
def test_pip_install_pyzmq(pipexec, pyzmq_version, build_version, arch):
336344

337345
if pyzmq_version == "23.2.0" and "3.12" in build_version:
338346
pytest.xfail(f"{pyzmq_version} does not install on 3.12")
339347

340-
if pyzmq_version == "23.2.0" and sys.platform == "darwin" and arch == "arm64":
348+
if pyzmq_version == "23.2.0" and sys.platform == "darwin":
341349
pytest.xfail("pyzmq 23.2.0 fails on macos arm64")
342350

343351
if sys.platform == "win32" and pyzmq_version == "25.1.2":
@@ -356,11 +364,20 @@ def test_pip_install_pyzmq(pipexec, pyzmq_version, build_version, arch):
356364
pytest.xfail(f"{pyzmq_version} does not install on 3.13")
357365

358366
env = os.environ.copy()
367+
368+
p = subprocess.run(
369+
[
370+
str(pipexec),
371+
"install",
372+
"--upgrade",
373+
"pip",
374+
"setuptools",
375+
],
376+
env=env,
377+
)
378+
379+
env["ZMQ_PREFIX"] = "bundled"
359380
env["RELENV_BUILDENV"] = "yes"
360-
env["USE_STATIC_REQUIREMENTS"] = "1"
361-
env[
362-
"CFLAGS"
363-
] = f"{env.get('CFLAGS', '')} -DCMAKE_OSX_ARCHITECTURES='arm64' -DZMQ_HAVE_CURVE=0"
364381
p = subprocess.run(
365382
[
366383
str(pipexec),

0 commit comments

Comments
 (0)