Skip to content

Commit 3bfc213

Browse files
authored
Merge pull request #177 from kevin-bates/remove-py38-ipykernel-patch
Remove win-py38 ipykernel patch
2 parents 5f99e53 + 7e3eba0 commit 3bfc213

File tree

3 files changed

+1
-7
lines changed

3 files changed

+1
-7
lines changed

.github/workflows/main.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ 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' && matrix.python-version == '3.8'
29-
run: |
30-
pip install --upgrade git+https://github.com/ipython/ipykernel.git
3127
- name: Run the tests
3228
run: |
3329
pytest

appveyor.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ install:
3434
- cmd: conda create -y -q -n test-env-%CONDA_PY% python=%CONDA_PY_SPEC% pip pyzmq tornado jupyter_client nbformat nbconvert nose
3535
- cmd: conda activate test-env-%CONDA_PY%
3636
- cmd: pip install -e .[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
3937

4038
test_script:
4139
- pytest -s -v

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
],
9393
extras_require = {
9494
'test': ['nose', 'coverage', 'requests', 'nose_warnings_filters',
95-
'pytest', 'pytest-cov', 'pytest-tornasync', 'pytest-console-scripts'],
95+
'pytest==5.3.2', 'pytest-cov', 'pytest-tornasync', 'pytest-console-scripts'],
9696
'test:sys_platform == "win32"': ['nose-exclude'],
9797
},
9898
python_requires = '>=3.5',

0 commit comments

Comments
 (0)