Skip to content

Small housekeeping in check/pytest #5899

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Oct 6, 2022
Merged

Small housekeeping in check/pytest #5899

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8737616
Clean up special-casing for Python 3.6 and older
pavoljuhas Oct 1, 2022
910887a
Simplify handling of parallel option in check/pytest
pavoljuhas Oct 1, 2022
4fabc75
Merge branch 'master' into simplify-check-pytest
CirqBot Oct 6, 2022
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
20 changes: 3 additions & 17 deletions check/pytest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,11 @@
cd "$(dirname "${BASH_SOURCE[0]}")"
cd "$(git rev-parse --show-toplevel)"

PYTEST_ARGS=()

PARALLEL=""
for arg in "$@"; do
if [[ "${arg}" == "-n" ]]; then
PARALLEL=1
fi
PYTEST_ARGS+=("${arg}")
done

if [ -z "${PARALLEL}" ]; then
PYTEST_ARGS+=("-n=auto")
fi
# Run in parallel by default. Pass the `-n0` option for a single-process run.
# (the last `-n` option wins)
PYTEST_ARGS=( "-n=auto" "$@" )

source dev_tools/pypath
PYTHON_VERSION=$(python -V 2>&1 | sed 's/.* \([0-9]\).\([0-9]\).*/\1\2/')
if [ "$PYTHON_VERSION" -lt "37" ]; then
PYTEST_ARGS+=("--ignore=cirq-rigetti")
fi

pytest "${PYTEST_ARGS[@]}"
RESULT=$?
Expand Down