@@ -31,9 +31,6 @@ set -o xtrace
3131AUTH=${AUTH:- noauth}
3232SSL=${SSL:- nossl}
3333TEST_ARGS=" ${*: 1} "
34- PYTHON=$( which python)
35- # TODO: Remove when we drop PyPy 3.8 support.
36- OLD_PYPY=$( python -c " import sys; print(sys.implementation.name.lower() == 'pypy' and sys.implementation.version < (7, 3, 12))" )
3734
3835export PIP_QUIET=1 # Quiet by default
3936export PIP_PREFER_BINARY=1 # Prefer binary dists by default
113110
114111if [ " $COMPRESSORS " = " snappy" ]; then
115112 python -m pip install ' .[snappy]'
116- if [ " $OLD_PYPY " == " True" ]; then
117- pip install " python-snappy<0.7.0"
118- fi
119- PYTHON=python
120113elif [ " $COMPRESSORS " = " zstd" ]; then
121114 python -m pip install zstandard
122115fi
@@ -237,7 +230,7 @@ if [ -n "$PERF_TEST" ]; then
237230 TEST_ARGS=" test/performance/perf_test.py"
238231fi
239232
240- echo " Running $AUTH tests over $SSL with python $PYTHON "
233+ echo " Running $AUTH tests over $SSL with python $( which python ) "
241234python -c ' import sys; print(sys.version)'
242235
243236
@@ -246,7 +239,7 @@ python -c 'import sys; print(sys.version)'
246239
247240# Run the tests with coverage if requested and coverage is installed.
248241# Only cover CPython. PyPy reports suspiciously low coverage.
249- PYTHON_IMPL=$( $PYTHON -c " import platform; print(platform.python_implementation())" )
242+ PYTHON_IMPL=$( python -c " import platform; print(platform.python_implementation())" )
250243if [ -n " $COVERAGE " ] && [ " $PYTHON_IMPL " = " CPython" ]; then
251244 # Keep in sync with combine-coverage.sh.
252245 # coverage >=5 is needed for relative_files=true.
0 commit comments