Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Scons] Ignore missing pytest with minimal python module #1364

Merged
merged 1 commit into from
Aug 12, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -1563,21 +1563,6 @@ if env['python_package'] != 'none':
"is required.")
sys.exit(1)

pytest_version = versions.get("pytest")
if not check_for_pytest:
pass
elif not pytest_version:
logger.error(
f"pytest was not found. {pytest_min_version} or newer "
"is required.")
sys.exit(1)
elif pytest_version < pytest_min_version:
logger.error(
"pytest is an incompatible version: Found "
f"{pytest_version}, but {pytest_min_version} or newer "
"is required.")
sys.exit(1)

python_version = versions["python"]
if warn_no_python:
if env["python_package"] == "default":
Expand Down Expand Up @@ -1645,6 +1630,21 @@ if env['python_package'] != 'none':
else:
logger.info(f"Using Cython version {cython_version}")

pytest_version = versions.get("pytest")
if not check_for_pytest:
pass
elif not pytest_version:
logger.error(
f"pytest was not found. {pytest_min_version} or newer "
"is required.")
sys.exit(1)
elif pytest_version < pytest_min_version:
logger.error(
"pytest is an incompatible version: Found "
f"{pytest_version}, but {pytest_min_version} or newer "
"is required.")
sys.exit(1)

if warn_no_full_package:
msg = ("Unable to build the full Python package because compatible "
"versions of Numpy and/or Cython could not be found.")
Expand Down