Make sure pyzmq tests use current setuptools

Author: dwoz

CHANGELOG.md

@@ -9,6 +9,10 @@
 * Update gdbm to 1.25
 * Include libstdc++ in relenv lib
 * Update environment with buildenv when RELENV_BUILDENV environment is set.
+* Include libstdc++ in relenv's lib directory instead of passing
+  -static-libstdc++
+* Clean up duplicate options in sysconfig data.
+* Work with setuptools >= 72.2.0
 
 
 0.18.1

relenv/build/linux.py

@@ -103,7 +103,7 @@ def build_bzip2(env, dirs, logfp):
             f"CC={env['CC']}",
             f"LDFLAGS={env['LDFLAGS']}",
             "BUILD=x86_64-linux-gnu",
-            "HOST={env['RELENV_HOST']}",
+            f"HOST={env['RELENV_HOST']}",
         ],
         env=env,
         stderr=logfp,
@@ -268,7 +268,7 @@ def build_libffi(env, dirs, logfp):
             f"--prefix={dirs.prefix}",
             "--disable-multi-os-directory",
             f"--build={env['RELENV_BUILD']}",
-            "--host={env['RELENV_HOST']}",
+            f"--host={env['RELENV_HOST']}",
         ],
         env=env,
         stderr=logfp,
@@ -328,11 +328,11 @@ def build_krb(env, dirs, logfp):
     runcmd(
         [
             "./configure",
-            "--prefix={dirs.prefix}",
+            f"--prefix={dirs.prefix}",
             "--without-system-verto",
             "--without-libedit",
-            "--build={env['RELENV_BUILD']}",
-            "--host={env['RELENV_HOST']}",
+            f"--build={env['RELENV_BUILD']}",
+            f"--host={env['RELENV_HOST']}",
         ],
         env=env,
         stderr=logfp,

tests/test_verify_build.py

@@ -107,6 +107,8 @@ def test_pip_install_salt_git(pipexec, build, build_dir, pyexec, build_version):
     if sys.platform == "darwin" and "3.13" in build_version:
         pytest.xfail("Salt does not work with 3.13 on macos yet")
 
+    subprocess.run([pipexec, "--upgrade", "install", "setuptools>=72.2.0"], check=True)
+
     env = os.environ.copy()
     env["RELENV_BUILDENV"] = "yes"
     if sys.platform == "linux" and shutil.which("git"):