Skip to content

Commit 033b34c

Browse files
committed
Pull ipykernel from GH to fix Windows tests on 3.8
1 parent 17ca448 commit 033b34c

File tree

2 files changed

+26
-14
lines changed

2 files changed

+26
-14
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
os: [ubuntu-latest, macos-latest]
14+
os: [ubuntu-latest, macos-latest, windows-latest]
1515
python-version: [ '3.5', '3.6', '3.7', '3.8' ]
1616
steps:
1717
- name: Checkout
@@ -24,6 +24,10 @@ jobs:
2424
- name: Install the Python dependencies
2525
run: |
2626
pip install -e .[test]
27+
- name: ipykernel fix on windows 3.8
28+
if: ${{ matrix.os }} == 'windows-latest' and ${{ matrix.python-version }} == '3.8'
29+
run: |
30+
pip install --upgrade git+https://github.com/ipython/ipykernel.git
2731
- name: Run the tests
2832
run: |
2933
pytest

appveyor.yml

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,19 @@ matrix:
44

55
environment:
66
matrix:
7-
# - CONDA_PY: 35
8-
# CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
9-
# - CONDA_PY: 36
10-
# CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
11-
# - CONDA_PY: 37
12-
# CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
13-
- PYTHON: "C:\\Miniconda38-x64"
14-
PYTHON_VERSION: "3.8"
15-
ZIP_VERSION: "cp38"
16-
PYTHON_ARCH: "64"
17-
TARGET: "x86_64-pc-windows-msvc"
7+
- CONDA_PY: 35
8+
CONDA_PY_SPEC: 3.5
9+
CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
10+
- CONDA_PY: 36
11+
CONDA_PY_SPEC: 3.6
12+
CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
13+
- CONDA_PY: 37
14+
CONDA_PY_SPEC: 3.7
15+
CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
16+
- CONDA_PY: 38
17+
CONDA_PY_SPEC: 3.8
18+
# appveyor doesn't come with this directory, so use 37's since we're creating an env anyway
19+
CONDA_INSTALL_LOCN: "C:\\Miniconda37-x64"
1820

1921
platform:
2022
- x64
@@ -23,11 +25,17 @@ build: off
2325

2426
install:
2527
- cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
28+
- cmd: set CONDA_PY=%CONDA_PY%
29+
- cmd: set CONDA_PY_SPEC=%CONDA_PY_SPEC%
2630
- cmd: conda config --set show_channel_urls true
2731
- cmd: conda config --add channels conda-forge
28-
#- cmd: conda update --yes --quiet conda
29-
- cmd: conda install -y pyzmq tornado jupyter_client nbformat nbconvert ipykernel pip nose
32+
- cmd: conda update --yes --quiet conda
33+
- cmd: conda info -a
34+
- cmd: conda create -y -q -n test-env-%CONDA_PY% python=%CONDA_PY_SPEC% pyzmq tornado jupyter_client nbformat nbconvert ipykernel pip nose
35+
- cmd: conda activate test-env-%CONDA_PY%
3036
- cmd: pip install .[test]
37+
# FIXME: Use patch for python 3.8, windows issues (https://github.com/ipython/ipykernel/pull/456) - remove once released
38+
- IF %CONDA_PY% == 38 pip install --upgrade git+https://github.com/ipython/ipykernel.git
3139

3240
test_script:
3341
- pytest

0 commit comments

Comments
 (0)