From d7580ad5561b767dc94afb2dc19687731fec61ab Mon Sep 17 00:00:00 2001
From: wiredfool <eric-github@soroos.net>
Date: Wed, 27 Dec 2017 14:43:53 +0000
Subject: [PATCH 1/4] Run tests with pytest

---
 Pillow    | 2 +-
 config.sh | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Pillow b/Pillow
index 13d849937..c96c72bb4 160000
--- a/Pillow
+++ b/Pillow
@@ -1 +1 @@
-Subproject commit 13d84993717cffd64a2e1d7e3e6edb185973d559
+Subproject commit c96c72bb4c3cb2e1b8b58455f10d3c19f710b055
diff --git a/config.sh b/config.sh
index 2a25519b7..0e71a0527 100644
--- a/config.sh
+++ b/config.sh
@@ -43,11 +43,7 @@ function pre_build {
 
 function run_tests_in_repo {
     # Run Pillow tests from within source repo
-    if [ -f test-installed.py ]; then
-        python test-installed.py -s -v Tests/test_*.py
-    else
-        python Tests/run.py --installed
-    fi
+    pytest
 }
 
 EXP_CODECS="jpg jpg_2000 libtiff zlib"
@@ -55,8 +51,6 @@ EXP_MODULES="freetype2 littlecms2 pil tkinter webp"
 
 function run_tests {
     # Runs tests on installed distribution from an empty directory
-    export NOSE_PROCESS_TIMEOUT=600
-    export NOSE_PROCESSES=0
     (cd ../Pillow && run_tests_in_repo)
     # Show supported codecs and modules
     local codecs=$(python -c 'from PIL.features import *; print(" ".join(sorted(get_supported_codecs())))')

From c2f1d238f8e2bee51b0ceb47e415d2dc390454db Mon Sep 17 00:00:00 2001
From: wiredfool <eric-github@soroos.net>
Date: Wed, 27 Dec 2017 18:58:58 +0000
Subject: [PATCH 2/4] Updated TEST_DEPENDS

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9cf7606e6..ef6e9b02c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ env:
       - PLAT=x86_64
       - UNICODE_WIDTH=32
       - BUILD_DEPENDS=""
-      - TEST_DEPENDS="nose numpy scipy"
+      - TEST_DEPENDS="pytest pytest-cov numpy scipy"
       - WHEELHOUSE_UPLOADER_USERNAME=travis-worker
       # Following generated with
       # travis encrypt -r python-pillow/pillow-wheels WHEELHOUSE_UPLOADER_SECRET=<the api key>

From 7be01dbdb23956cff5d67df0a264b9e0e9d81168 Mon Sep 17 00:00:00 2001
From: wiredfool <eric-github@soroos.net>
Date: Wed, 27 Dec 2017 19:24:36 +0000
Subject: [PATCH 3/4] Remove python 3.3 wheel

---
 .travis.yml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ef6e9b02c..1e6c4200c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,9 +32,7 @@ matrix:
     - os: osx
       language: generic
       env:
-        - MB_PYTHON_VERSION=3.3
-        # Last numpy / scipy version built for Python 3.3
-        - TEST_DEPENDS="nose numpy==1.11.0 scipy==0.17.1"
+        - MB_PYTHON_VERSION=3.4
 
     - os: linux
       env:
@@ -59,11 +57,11 @@ matrix:
     - os: osx
       language: generic
       env:
-        - MB_PYTHON_VERSION=3.4
+        - MB_PYTHON_VERSION=3.5
     - os: osx
       language: generic
       env:
-        - MB_PYTHON_VERSION=3.5
+        - MB_PYTHON_VERSION=3.6
 
     - os: linux
       env:
@@ -84,10 +82,6 @@ matrix:
         - MB_PYTHON_VERSION=3.6
         - PLAT=i686
 
-    - os: osx
-      language: generic
-      env:
-        - MB_PYTHON_VERSION=3.6
 
 before_install:
     - source multibuild/common_utils.sh

From 6b1f4d8c7018a69d4af12c7515592b8ebc59547d Mon Sep 17 00:00:00 2001
From: wiredfool <eric-github@soroos.net>
Date: Thu, 28 Dec 2017 12:26:20 +0000
Subject: [PATCH 4/4] added src-reorg + pytest

---
 Pillow | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Pillow b/Pillow
index c96c72bb4..faa69f9a5 160000
--- a/Pillow
+++ b/Pillow
@@ -1 +1 @@
-Subproject commit c96c72bb4c3cb2e1b8b58455f10d3c19f710b055
+Subproject commit faa69f9a5938715e9dbed75c1136e8dc166b034a