From 2f5228e181a2992d03fd5602e46e8f0dba30ab09 Mon Sep 17 00:00:00 2001
From: nulano <nulano@nulano.eu>
Date: Fri, 20 Sep 2019 18:04:04 +0200
Subject: [PATCH 1/5] appveyor pypy3

(cherry picked from commit 593ea32ffa03f7410299bbb7b08f1d078b67ecc0)
---
 .appveyor.yml                                         | 11 ++++++++++-
 ...or_install_pypy.cmd => appveyor_install_pypy2.cmd} |  0
 winbuild/appveyor_install_pypy3.cmd                   |  3 +++
 winbuild/config.py                                    |  1 +
 4 files changed, 14 insertions(+), 1 deletion(-)
 rename winbuild/{appveyor_install_pypy.cmd => appveyor_install_pypy2.cmd} (100%)
 create mode 100644 winbuild/appveyor_install_pypy3.cmd

diff --git a/.appveyor.yml b/.appveyor.yml
index 2a4e67dc925..c5b88e9415a 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -13,6 +13,10 @@ environment:
   TEST_OPTIONS:
   DEPLOY: YES
   matrix:
+  - PYTHON: C:/vp/pypy3
+    EXECUTABLE: bin/pypy3.exe
+    PIP_DIR: bin
+    VENV: YES
   - PYTHON: C:/vp/pypy2
     EXECUTABLE: bin/pypy.exe
     PIP_DIR: bin
@@ -43,7 +47,12 @@ install:
 - ps: |
       if ($env:PYTHON -eq "c:/vp/pypy2")
       {
-        c:\pillow\winbuild\appveyor_install_pypy.cmd
+        c:\pillow\winbuild\appveyor_install_pypy2.cmd
+      }
+- ps: |
+      if ($env:PYTHON -eq "c:/vp/pypy3")
+      {
+        c:\pillow\winbuild\appveyor_install_pypy3.cmd
       }
 - ps: |
       if ($env:PYTHON -eq "c:/msys64/mingw32")
diff --git a/winbuild/appveyor_install_pypy.cmd b/winbuild/appveyor_install_pypy2.cmd
similarity index 100%
rename from winbuild/appveyor_install_pypy.cmd
rename to winbuild/appveyor_install_pypy2.cmd
diff --git a/winbuild/appveyor_install_pypy3.cmd b/winbuild/appveyor_install_pypy3.cmd
new file mode 100644
index 00000000000..896043c5f17
--- /dev/null
+++ b/winbuild/appveyor_install_pypy3.cmd
@@ -0,0 +1,3 @@
+curl -fsSL -o pypy3.zip https://bitbucket.org/pypy/pypy/downloads/pypy3.6-v7.1.1-win32.zip
+7z x pypy3.zip -oc:\
+c:\Python37\Scripts\virtualenv.exe -p c:\pypy3.6-v7.1.1-win32\pypy3.exe c:\vp\pypy3
diff --git a/winbuild/config.py b/winbuild/config.py
index debfe95270b..07e39302349 100644
--- a/winbuild/config.py
+++ b/winbuild/config.py
@@ -6,6 +6,7 @@
 pythons = {
     "27": {"compiler": 7, "vc": 2010},
     "pypy2": {"compiler": 7, "vc": 2010},
+    "pypy3": {"compiler": 7, "vc": 2010},
     "35": {"compiler": 7.1, "vc": 2015},
     "36": {"compiler": 7.1, "vc": 2015},
     "37": {"compiler": 7.1, "vc": 2015},

From d0ddb28591f826d5aefe7e9e68cb2eaf9b7a732e Mon Sep 17 00:00:00 2001
From: nulano <nulano@nulano.eu>
Date: Fri, 20 Sep 2019 19:53:31 +0200
Subject: [PATCH 2/5] pypy.exe instead of pypy3.exe

(cherry picked from commit 1ffdfd4d058b2526da247b6b3ee21e43c2589091)
---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index c5b88e9415a..42102d254dd 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -14,7 +14,7 @@ environment:
   DEPLOY: YES
   matrix:
   - PYTHON: C:/vp/pypy3
-    EXECUTABLE: bin/pypy3.exe
+    EXECUTABLE: bin/pypy.exe
     PIP_DIR: bin
     VENV: YES
   - PYTHON: C:/vp/pypy2

From 411cba61dd9052114b2c52b6c523fffb32c806af Mon Sep 17 00:00:00 2001
From: nulano <nulano@nulano.eu>
Date: Fri, 20 Sep 2019 20:29:34 +0200
Subject: [PATCH 3/5] change pypy3 compiler

(cherry picked from commit a5ca54aaa4ef081983021641639fff689a5a4ddf)
---
 winbuild/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/winbuild/config.py b/winbuild/config.py
index 07e39302349..16a1d9cadf0 100644
--- a/winbuild/config.py
+++ b/winbuild/config.py
@@ -6,9 +6,9 @@
 pythons = {
     "27": {"compiler": 7, "vc": 2010},
     "pypy2": {"compiler": 7, "vc": 2010},
-    "pypy3": {"compiler": 7, "vc": 2010},
     "35": {"compiler": 7.1, "vc": 2015},
     "36": {"compiler": 7.1, "vc": 2015},
+    "pypy3": {"compiler": 7.1, "vc": 2015},
     "37": {"compiler": 7.1, "vc": 2015},
 }
 

From 5b04a735990cece6a7c1b76b0c88ec8fdb8deb0e Mon Sep 17 00:00:00 2001
From: nulano <nulano@nulano.eu>
Date: Sat, 21 Sep 2019 15:25:57 +0200
Subject: [PATCH 4/5] use nightly pypy3

(cherry picked from commit 2d2076f2dc80a732575b1ed742cc706478804d2a)
---
 winbuild/appveyor_install_pypy3.cmd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/winbuild/appveyor_install_pypy3.cmd b/winbuild/appveyor_install_pypy3.cmd
index 896043c5f17..63659b165d4 100644
--- a/winbuild/appveyor_install_pypy3.cmd
+++ b/winbuild/appveyor_install_pypy3.cmd
@@ -1,3 +1,3 @@
-curl -fsSL -o pypy3.zip https://bitbucket.org/pypy/pypy/downloads/pypy3.6-v7.1.1-win32.zip
+curl -fsSL -o pypy3.zip http://buildbot.pypy.org/nightly/py3.6/pypy-c-jit-97588-7392d01b93d0-win32.zip
 7z x pypy3.zip -oc:\
-c:\Python37\Scripts\virtualenv.exe -p c:\pypy3.6-v7.1.1-win32\pypy3.exe c:\vp\pypy3
+c:\Python37\Scripts\virtualenv.exe -p c:\pypy-c-jit-97588-7392d01b93d0-win32\pypy3.exe c:\vp\pypy3

From 201efa8368372e479390c54a09c84102e1ac67dd Mon Sep 17 00:00:00 2001
From: nulano <nulano@nulano.eu>
Date: Sat, 21 Sep 2019 19:57:51 +0200
Subject: [PATCH 5/5] build pypy3 last

(cherry picked from commit d8c3dfdd1791675e52f66ac18c5148e5a88179dc)
---
 .appveyor.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 42102d254dd..f299794b6a2 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -13,10 +13,6 @@ environment:
   TEST_OPTIONS:
   DEPLOY: YES
   matrix:
-  - PYTHON: C:/vp/pypy3
-    EXECUTABLE: bin/pypy.exe
-    PIP_DIR: bin
-    VENV: YES
   - PYTHON: C:/vp/pypy2
     EXECUTABLE: bin/pypy.exe
     PIP_DIR: bin
@@ -34,6 +30,10 @@ environment:
     PIP_DIR: bin
     TEST_OPTIONS: --processes=0
     DEPLOY: NO
+  - PYTHON: C:/vp/pypy3
+    EXECUTABLE: bin/pypy.exe
+    PIP_DIR: bin
+    VENV: YES
 
 
 install: