python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-15 11:56:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #73 from python-pillow/pytest

Browse Source 
Run tests with pytest
This commit is contained in:
wiredfool 2017-12-29 22:04:24 +00:00 committed by GitHub
commit 1407af2c6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.travis.yml
View File

@ -5,7 +5,7 @@ env:
- PLAT=x86_64 - PLAT=x86_64
- UNICODE_WIDTH=32 - UNICODE_WIDTH=32
- BUILD_DEPENDS="" - BUILD_DEPENDS=""
- TEST_DEPENDS="nose numpy scipy" - TEST_DEPENDS="pytest pytest-cov numpy scipy"
- WHEELHOUSE_UPLOADER_USERNAME=travis-worker - WHEELHOUSE_UPLOADER_USERNAME=travis-worker
# Following generated with # Following generated with
# travis encrypt -r python-pillow/pillow-wheels WHEELHOUSE_UPLOADER_SECRET=<the api key> # travis encrypt -r python-pillow/pillow-wheels WHEELHOUSE_UPLOADER_SECRET=<the api key>
@ -32,9 +32,7 @@ matrix:
- os: osx - os: osx
language: generic language: generic
env: env:
- MB_PYTHON_VERSION=3.3 - MB_PYTHON_VERSION=3.4
# Last numpy / scipy version built for Python 3.3
- TEST_DEPENDS="nose numpy==1.11.0 scipy==0.17.1"
- os: linux - os: linux
env: env:
@ -59,11 +57,11 @@ matrix:
- os: osx - os: osx
language: generic language: generic
env: env:
- MB_PYTHON_VERSION=3.4 - MB_PYTHON_VERSION=3.5
- os: osx - os: osx
language: generic language: generic
env: env:
- MB_PYTHON_VERSION=3.5 - MB_PYTHON_VERSION=3.6
- os: linux - os: linux
env: env:
@ -84,10 +82,6 @@ matrix:
- MB_PYTHON_VERSION=3.6 - MB_PYTHON_VERSION=3.6
- PLAT=i686 - PLAT=i686
- os: osx
language: generic
env:
- MB_PYTHON_VERSION=3.6
before_install: before_install:
- source multibuild/common_utils.sh - source multibuild/common_utils.sh

2
Pillow

@ -1 +1 @@
Subproject commit 13d84993717cffd64a2e1d7e3e6edb185973d559 Subproject commit faa69f9a5938715e9dbed75c1136e8dc166b034a

8
config.sh
View File

@ -43,11 +43,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
if [ -f test-installed.py ]; then pytest
python test-installed.py -s -v Tests/test_*.py
else
python Tests/run.py --installed
fi
} }
EXP_CODECS="jpg jpg_2000 libtiff zlib" EXP_CODECS="jpg jpg_2000 libtiff zlib"
@ -55,8 +51,6 @@ EXP_MODULES="freetype2 littlecms2 pil tkinter webp"
function run_tests { function run_tests {
# Runs tests on installed distribution from an empty directory # Runs tests on installed distribution from an empty directory
export NOSE_PROCESS_TIMEOUT=600
export NOSE_PROCESSES=0
(cd ../Pillow && run_tests_in_repo) (cd ../Pillow && run_tests_in_repo)
# Show supported codecs and modules # Show supported codecs and modules
local codecs=$(python -c 'from PIL.features import *; print(" ".join(sorted(get_supported_codecs())))') local codecs=$(python -c 'from PIL.features import *; print(" ".join(sorted(get_supported_codecs())))')