From 1eda5693b0780725ec2cf8074567decaba150ed0 Mon Sep 17 00:00:00 2001
From: Kevin Bates <kbates4@gmail.com>
Date: Fri, 6 Dec 2019 12:11:45 -0800
Subject: [PATCH] Pull ipykernel from GH to fix Windows tests on 3.8

---
 .github/workflows/main.yml |  6 +++++-
 appveyor.yml               | 34 +++++++++++++++++++++-------------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 32f2e1b759..e7f793e68e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
         python-version: [ '3.5', '3.6', '3.7', '3.8' ]
     steps:
     - name: Checkout
@@ -24,6 +24,10 @@ jobs:
     - name: Install the Python dependencies
       run: |
         pip install -e .[test]
+    - name: ipykernel fix on windows 3.8
+      if: matrix.os == 'windows-latest' && matrix.python-version == '3.8'
+      run: |
+        pip install --upgrade git+https://github.com/ipython/ipykernel.git
     - name: Run the tests
       run: |
         pytest
diff --git a/appveyor.yml b/appveyor.yml
index d1bd53c9f4..79c6e6dddc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,17 +4,19 @@ matrix:
 
 environment:
   matrix:
-    # - CONDA_PY: 35
-    #   CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
-    # - CONDA_PY: 36
-    #   CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
-    # - CONDA_PY: 37
-    #   CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
-    - PYTHON: "C:\\Miniconda38-x64"
-      PYTHON_VERSION: "3.8"
-      ZIP_VERSION: "cp38"
-      PYTHON_ARCH: "64"
-      TARGET: "x86_64-pc-windows-msvc"
+    - CONDA_PY: 35
+      CONDA_PY_SPEC: 3.5
+      CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
+    - CONDA_PY: 36
+      CONDA_PY_SPEC: 3.6
+      CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
+    - CONDA_PY: 37
+      CONDA_PY_SPEC: 3.7
+      CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
+    - CONDA_PY: 38
+      CONDA_PY_SPEC: 3.8
+      # appveyor doesn't come with this directory, so use 37's since we're creating an env anyway
+      CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
 
 platform:
   - x64
@@ -23,11 +25,17 @@ build: off
 
 install:
   - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
+  - cmd: set CONDA_PY=%CONDA_PY%
+  - cmd: set CONDA_PY_SPEC=%CONDA_PY_SPEC%
   - cmd: conda config --set show_channel_urls true
   - cmd: conda config --add channels conda-forge
-  #- cmd: conda update --yes --quiet conda
-  - cmd: conda install -y pyzmq tornado jupyter_client nbformat nbconvert ipykernel pip nose
+  - cmd: conda update --yes --quiet conda
+  - cmd: conda info -a
+  - cmd: conda create -y -q -n test-env-%CONDA_PY% python=%CONDA_PY_SPEC% pyzmq tornado jupyter_client nbformat nbconvert ipykernel pip nose
+  - cmd: conda activate test-env-%CONDA_PY%
   - cmd: pip install .[test]
+# FIXME: Use patch for python 3.8, windows issues (https://github.com/ipython/ipykernel/pull/456) - remove once released
+  - IF %CONDA_PY% == 38 pip install --upgrade git+https://github.com/ipython/ipykernel.git
 
 test_script:
   - pytest