merge a year of master into winbuild

.landscape.yaml

@@ -0,0 +1,2 @@
+strictness: medium
+test-warnings: yes

.travis.yml

@@ -3,25 +3,26 @@ language: python
 notifications:
   irc: "chat.freenode.net#pil"
 
-env: MAX_CONCURRENCY=4
-
+# Run slow PyPy* first, to give them a headstart and reduce waiting time.
+# Run latest 3.x and 2.x next, to get quick compatibility results.
+# Then run the remainder.
 python:
   - "pypy"
   - "pypy3"
-  - 2.6
+  - 3.4
   - 2.7
+  - 2.6
   - "2.7_with_system_site_packages" # For PyQt4
   - 3.2
   - 3.3
-  - 3.4
 
 install:
-  - "sudo apt-get -qq install libfreetype6-dev liblcms2-dev python-qt4 ghostscript libffi-dev libjpeg-turbo-progs cmake imagemagick lcov"
-  - "pip install cffi"
-  - "pip install coveralls nose coveralls-merge"
-  - "gem install coveralls-lcov"
-  - travis_retry pip install pyroma
-  - if [ "$TRAVIS_PYTHON_VERSION" == "2.6" ]; then pip install unittest2; fi
+  - "travis_retry sudo apt-get -qq install libfreetype6-dev liblcms2-dev python-qt4 ghostscript libffi-dev libjpeg-turbo-progs cmake imagemagick"
+  - "travis_retry pip install cffi"
+  - "travis_retry pip install coverage nose"
+  - "travis_retry pip install pyroma"
+
+  - if [ "$TRAVIS_PYTHON_VERSION" == "2.6" ]; then travis_retry pip install unittest2; fi
 
   # webp
   - pushd depends && ./install_webp.sh && popd
@@ -39,24 +40,72 @@ script:
 
 after_success:
    # gather the coverage data
+  - travis_retry sudo apt-get -qq install lcov
   - lcov --capture --directory . -b . --output-file coverage.info
    # filter to remove system headers
-  - lcov --remove coverage.info '/usr/*' -o coverage.filtered.info     
+  - lcov --remove coverage.info '/usr/*' -o coverage.filtered.info
    # convert to json
+  - travis_retry gem install coveralls-lcov
   - coveralls-lcov -v -n coverage.filtered.info > coverage.c.json
 
   - coverage report
+  - travis_retry pip install coveralls-merge
   - coveralls-merge coverage.c.json
 
-
-  - pip install pep8 pyflakes
+  - travis_retry pip install pep8 pyflakes
   - pep8 --statistics --count PIL/*.py
   - pep8  --statistics --count Tests/*.py
+  - pyflakes *.py       | tee >(wc -l)
   - pyflakes PIL/*.py   | tee >(wc -l)
   - pyflakes Tests/*.py | tee >(wc -l)
 
-
     # Coverage and quality reports on just the latest diff.
     # (Installation is very slow on Py3, so just do it for Py2.)
   - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then Scripts/diffcover-install.sh; fi
   - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then Scripts/diffcover-run.sh; fi
+
+  # after_all
+  - |
+      if [ "$TRAVIS_REPO_SLUG" = "python-pillow/Pillow" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
+        curl -Lo travis_after_all.py https://raw.github.com/dmakhno/travis_after_all/master/travis_after_all.py
+        python travis_after_all.py
+        export $(cat .to_export_back)
+        if [ "$BUILD_LEADER" = "YES" ]; then
+          if [ "$BUILD_AGGREGATE_STATUS" = "others_succeeded" ]; then
+            echo "All jobs succeded! Triggering OS X build..."
+            # Trigger an OS X build at the pillow-wheels repo
+            ./build_children.sh
+          else
+            echo "Some jobs failed"
+          fi
+        fi
+      fi
+
+after_failure:
+  - |
+      if [ "$TRAVIS_REPO_SLUG" = "python-pillow/Pillow" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
+        curl -Lo travis_after_all.py https://raw.github.com/dmakhno/travis_after_all/master/travis_after_all.py
+        python travis_after_all.py
+        export $(cat .to_export_back)
+        if [ "$BUILD_LEADER" = "YES" ]; then
+          if [ "$BUILD_AGGREGATE_STATUS" = "others_failed" ]; then
+            echo "All jobs failed"
+          else
+            echo "Some jobs failed"
+          fi
+        fi
+      fi
+
+after_script:
+  - |
+      if [ "$TRAVIS_REPO_SLUG" = "python-pillow/Pillow" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
+        echo leader=$BUILD_LEADER status=$BUILD_AGGREGATE_STATUS
+      fi
+
+matrix:
+  fast_finish: true
+
+env:
+  global:
+    # travis encrypt AUTH_TOKEN=
+    secure: "Vzm7aG1Qv0SDQcqiPzZMedNLn5ZmpL7IzF0DYnqcD+/l+zmKU22SnJBcX0uVXumo+r7eZfpsShpqfcdsZvMlvmQnwz+Y6AGKQru9tCKZbTMnuRjWKKXekC+tr8Xt9CKvRVtte5PyXW31paxUI3/e+fQGBwoFjEEC+6EpEOjeRfE="