Skip to content

Commit

Permalink
Don't constrain importlib-metadata in noxfile.py
Browse files Browse the repository at this point in the history
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
  • Loading branch information
s0undt3ch committed Jul 26, 2023
1 parent 30956f5 commit e72fd82
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def tests(session):
# Always have the wheel package installed
session.install("wheel", silent=PIP_INSTALL_SILENT)
session.install(COVERAGE_VERSION_REQUIREMENT, silent=PIP_INSTALL_SILENT)
salt_requirements = ["importlib-metadata<5.0.0"]
salt_requirements = []
salt_requirements.append(SALT_REQUIREMENT)
if session.python is not False and system_service is False:
session.install(
Expand All @@ -126,15 +126,15 @@ def tests(session):
)
pytest_version_requirement = os.environ.get("PYTEST_VERSION_REQUIREMENT") or None
if pytest_version_requirement:
pytest_requirements = ["importlib-metadata<5.0.0"]
pytest_requirements = []
if not pytest_version_requirement.startswith("pytest"):
pytest_version_requirement = f"pytest{pytest_version_requirement}"
pytest_requirements.append(pytest_version_requirement)
session.install(*pytest_requirements, silent=PIP_INSTALL_SILENT)
if system_service:
session.install("importlib-metadata<5.0.0", ".", silent=PIP_INSTALL_SILENT)
session.install(".", silent=PIP_INSTALL_SILENT)
else:
session.install("importlib-metadata<5.0.0", "-e", ".", silent=PIP_INSTALL_SILENT)
session.install("-e", ".", silent=PIP_INSTALL_SILENT)
pip_list = session_run_always(
session, "pip", "list", "--format=json", silent=True, log=False, stderr=None
)
Expand Down

0 comments on commit e72fd82

Please sign in to comment.