Skip to content

Commit 116cf6e

Browse files
authored
CI - fix failing test with Python 3.13 (#6996)
* CI - disable failing test with Python 3.13 Related to #6995 * Revert "CI - disable failing test with Python 3.13" This reverts commit 8d22846. * Install setuptools for Python 3.13 CI test * Fail early if `python dev_tools/modules.py` fails Exit `check/pytest` early if PYTHONPATH is not reliably set.
1 parent 785fd1c commit 116cf6e

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

dev_tools/pypath

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,11 @@ if ! python --version | grep -q -F "Python 3."; then
3636
fi
3737

3838
_PYPATH_PREFIX="${_PYPATH_BASE_DIR}$(
39+
set -o pipefail
3940
cd "${_PYPATH_BASE_DIR}" &&
4041
env PYTHONPATH=. python dev_tools/modules.py list --mode folder |
4142
xargs printf ":${_PYPATH_BASE_DIR}/%s"
42-
)"
43+
)" || return $?
4344

4445
[[ $PYTHONPATH == ${_PYPATH_PREFIX}* ]] ||
4546
export PYTHONPATH="${_PYPATH_PREFIX}${PYTHONPATH:+:}${PYTHONPATH}"

dev_tools/requirements/dev-np2.env.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
-r ../../cirq-google/requirements.txt
1111
-r ../../cirq-core/cirq/contrib/requirements.txt
1212

13+
# setuptools so we can import dev_tools.modules
14+
15+
setuptools
16+
1317
# pytest-minimal.env.txt without cirq-all-no-contrib.txt ---------------------
1418

1519
-r deps/pytest.txt

0 commit comments

Comments
 (0)