From d2de3b591d53a2d273fbb23b3c9dd969438f7d12 Mon Sep 17 00:00:00 2001
From: Christoph Gohlke <cjgohlke@gmail.com>
Date: Wed, 11 Oct 2017 13:07:54 -0700
Subject: [PATCH 1/2] TST: remove Python 3.5 from Appveyor

---
 .appveyor.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index e9d977b47f8c..9e047712b360 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -33,12 +33,6 @@ environment:
       PYTHON_VERSION: "2.7"
       TEST_ALL: "no"
       CONDA_INSTALL_LOCN: "C:\\Miniconda-x64"
-    - TARGET_ARCH: "x64"
-      CONDA_PY: "35"
-      CONDA_NPY: "110"
-      PYTHON_VERSION: "3.5"
-      CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
-      TEST_ALL: "no"
     - TARGET_ARCH: "x64"
       CONDA_PY: "36"
       PYTHON_VERSION: "3.6"

From d37eb904dd552b32caa72b01364e1a523cf78309 Mon Sep 17 00:00:00 2001
From: Christoph Gohlke <cjgohlke@gmail.com>
Date: Wed, 11 Oct 2017 13:15:04 -0700
Subject: [PATCH 2/2] TST: disable faulthandler on Python 3.6.3 on Windows

---
 lib/matplotlib/__init__.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
index 00488a134097..cf13064f481c 100644
--- a/lib/matplotlib/__init__.py
+++ b/lib/matplotlib/__init__.py
@@ -1347,12 +1347,15 @@ def tk_window_focus():
 
 
 def _init_tests():
-    try:
-        import faulthandler
-    except ImportError:
-        pass
-    else:
-        faulthandler.enable()
+    # work around https://bugs.python.org/issue31701
+    # faulthandler dumps 'Windows fatal exception: code 0xe06d7363'
+    if not (sys.platform == 'win32' and sys.version_info[:3] == (3, 6, 3)):
+        try:
+            import faulthandler
+        except ImportError:
+            pass
+        else:
+            faulthandler.enable()
 
     # The version of FreeType to install locally for running the
     # tests.  This must match the value in `setupext.py`