From 853a1f50a36e0406307854673f7e4d93f3c7ecca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 10 Aug 2021 14:53:33 +0200 Subject: [PATCH] Correctly determine toxenv for versioned PyPy --- smoke/venv.sh | 2 ++ tests.yml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/smoke/venv.sh b/smoke/venv.sh index 262ff13..d5da8e2 100755 --- a/smoke/venv.sh +++ b/smoke/venv.sh @@ -103,6 +103,8 @@ $PYTHON -m ensurepip --root ensurepiptestroot [[ "$TOX" != "true" ]] && exit 0 if [[ $PYTHON == python* ]]; then export TOXENV=py${VERSION/./} +elif [[ $PYTHON == pypy* ]]; then + export TOXENV=pypy${VERSION/./} else export TOXENV=$PYTHON fi diff --git a/tests.yml b/tests.yml index 3c11dde..395e7ba 100644 --- a/tests.yml +++ b/tests.yml @@ -48,7 +48,7 @@ run: VERSION=2.7 METHOD=virtualenv PYTHON=pypy ./venv.sh - smokepypy3: dir: smoke - run: VERSION=3.6 METHOD=venv PYTHON=pypy3 ./venv.sh + run: VERSION=3.7 METHOD=venv PYTHON=pypy3.7 ./venv.sh - selftest37: dir: selftest run: VERSION=3.7 X="-x test_socket -x test_asyncgen -x test_asyncio -x test_compile -x test_concurrent_futures -x test_itertools -x test_multiprocessing_fork -x test_multiprocessing_forkserver -x test_shutil -x test_time -x test_multiprocessing_spawn -x test_threading -x test_wsgiref" ./parallel.sh