saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix workaround in order not to break nox

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-09-27 21:24:41 +01:00 • committed by Pedro Algarvio
parent 686f1d2fa9
commit dae70dab94
1 changed files with 70 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
noxfile.py
View file

@ -13,7 +13,6 @@ import os
import pathlib
import shutil
import sqlite3
import subprocess
import sys
import tarfile
import tempfile
@ -332,6 +331,73 @@ def _install_coverage_requirement(session):
)
def _downgrade_importlib_metadata(session):
distro_data = session_run_always(
session,
"python",
"-c",
"import distro, json, sys; print(json.dumps(distro.linux_distribution()), file=sys.stdout, flush=True)",
stderr=None,
silent=True,
log=False,
)
distro_info = tuple(json.loads(distro_data.strip()))
session.log("Linux Distribution Details: {}".format(distro_info))
if (
("amazon" in distro_info[0].lower() and distro_info[1] == "2")
or ("debian" in distro_info[0].lower() and distro_info[1] == "10")
or ("centos" in distro_info[0].lower() and distro_info[1] == "7")
):
session.log("Downgrading importlib-metadata ...")
# Workaround for installing and running classic packages from 3005.1
# They can only run with importlib-metadata<5.0.0.
with tempfile.NamedTemporaryFile(suffix=".txt") as tfile:
with open(tfile.name, "w") as wfh:
wfh.write("importlib-metadata<5.0.0\n")
# We need to upgrade pip to be able to use `--use-feature`
session_run_always(
session,
"/usr/bin/python3",
"-m",
"pip",
"--version",
)
session_run_always(
session,
"/usr/bin/python3",
"-m",
"pip",
"install",
"--constraint={}".format(tfile.name),
"-U",
"pip>=21.0",
silent=False,
log=True,
external=True,
)
session_run_always(
session,
"/usr/bin/python3",
"-m",
"pip",
"--version",
)
# Properly downgrade importlib-metadata without breaking nox
session_run_always(
session,
"/usr/bin/python3",
"-m",
"pip",
"install",
"--constraint={}".format(tfile.name),
"-U",
"nox",
silent=False,
log=True,
external=True,
)
def _run_with_coverage(session, *test_cmd, env=None, on_rerun=False):
_install_coverage_requirement(session)
if on_rerun is False:
@ -1892,9 +1958,9 @@ def ci_test_onedir_pkgs(session):
if chunk in ("upgrade-classic", "downgrade-classic"):
cmd_args.append("--classic")
# Workaround for installing and running classic packages from 3005.1
# They can only run with importlib-metadata<5.0.0.
subprocess.run(["pip3", "install", "importlib-metadata==4.13.0"], check=False)
if IS_LINUX:
_downgrade_importlib_metadata(session)
pytest_args = (
cmd_args[:]