Merge remote-tracking branch 'origin/master'

This commit is contained in:
wiredfool 2015-04-01 14:40:48 -07:00
commit dae0b9aa7b
2 changed files with 5 additions and 3 deletions

View File

@ -2,7 +2,7 @@ language:
- objective-c
env:
# global: LATEST_TAG=1
global: PILLOW_COMMIT=latest-tag
matrix:
- VERSION=2.7.9
- VERSION=3.2.5
@ -13,7 +13,9 @@ install:
- source run_install.sh
- get_python_environment macpython $VERSION venv
- pip install delocate
- if [ -n "$LATEST_TAG" ]; then checkout_closest_tag Pillow; fi
- if [ -n "$PILLOW_COMMIT" ]; then
checkout_commit Pillow $PILLOW_COMMIT;
fi
- cd Pillow
- python setup.py bdist_wheel
- delocate-wheel dist/*.whl

@ -1 +1 @@
Subproject commit f951bba717cb68ccd89a2f8eb762e8ae58948212
Subproject commit 53c812ccbd33b02e59935a9c689f4ab773957589