Merge pull request #176 from radarhere/python3

Use python3
This commit is contained in:
Hugo van Kemenade 2020-12-26 17:12:42 +02:00 committed by GitHub
commit da43be83bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -72,7 +72,7 @@ function pre_build {
function run_tests_in_repo { function run_tests_in_repo {
# Run Pillow tests from within source repo # Run Pillow tests from within source repo
python selftest.py python3 selftest.py
pytest pytest
} }
@ -93,17 +93,17 @@ function run_tests {
(cd ../Pillow && run_tests_in_repo) (cd ../Pillow && run_tests_in_repo)
# Test against expected codecs, modules and features # Test against expected codecs, modules and features
local ret=0 local ret=0
local codecs=$(python -c 'from PIL.features import *; print(" ".join(sorted(get_supported_codecs())))') local codecs=$(python3 -c 'from PIL.features import *; print(" ".join(sorted(get_supported_codecs())))')
if [ "$codecs" != "$EXP_CODECS" ]; then if [ "$codecs" != "$EXP_CODECS" ]; then
echo "Codecs should be: '$EXP_CODECS'; but are '$codecs'" echo "Codecs should be: '$EXP_CODECS'; but are '$codecs'"
ret=1 ret=1
fi fi
local modules=$(python -c 'from PIL.features import *; print(" ".join(sorted(get_supported_modules())))') local modules=$(python3 -c 'from PIL.features import *; print(" ".join(sorted(get_supported_modules())))')
if [ "$modules" != "$EXP_MODULES" ]; then if [ "$modules" != "$EXP_MODULES" ]; then
echo "Modules should be: '$EXP_MODULES'; but are '$modules'" echo "Modules should be: '$EXP_MODULES'; but are '$modules'"
ret=1 ret=1
fi fi
local features=$(python -c 'from PIL.features import *; print(" ".join(sorted(get_supported_features())))') local features=$(python3 -c 'from PIL.features import *; print(" ".join(sorted(get_supported_features())))')
if [ "$features" != "$EXP_FEATURES" ]; then if [ "$features" != "$EXP_FEATURES" ]; then
echo "Features should be: '$EXP_FEATURES'; but are '$features'" echo "Features should be: '$EXP_FEATURES'; but are '$features'"
ret=1 ret=1