Skip to content

Commit d830683

Browse files
authored
Merge pull request #1598 from juhasch/fix_ci
Fix ci
2 parents 8ce83e7 + d5af0ba commit d830683

File tree

2 files changed

+24
-22
lines changed

2 files changed

+24
-22
lines changed

appveyor.yml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,21 @@ environment:
1313
# appropriate libxml headers. As a result, make pip use binary packages.
1414
PIP_ONLY_BINARY: lxml
1515
matrix:
16-
- TOXENV: 'py37-notebook60'
17-
TOXPYTHON: C:\Python36\python.exe
18-
PYTHON_HOME: C:\Python37
19-
PYTHON_VERSION: '3.7'
16+
- TOXENV: 'py36-notebook57'
17+
TOXPYTHON: C:\Python36-x64\python.exe
18+
PYTHON_HOME: C:\Python36-x64
19+
PYTHON_VERSION: '3.6'
2020
PYTHON_ARCH: '64'
21-
22-
- TOXENV: 'py38-notebook60'
23-
TOXPYTHON: C:\Python38\python.exe
24-
PYTHON_HOME: C:\Python38
25-
PYTHON_VERSION: '3.8'
21+
- TOXENV: 'py36-notebook64'
22+
TOXPYTHON: C:\Python36-x64\python.exe
23+
PYTHON_HOME: C:\Python36-x64
24+
PYTHON_VERSION: '3.6'
25+
PYTHON_ARCH: '64'
26+
- TOXENV: 'py36-notebook'
27+
TOXPYTHON: C:\Python36-x64\python.exe
28+
PYTHON_HOME: C:\Python36-x64
29+
PYTHON_VERSION: '3.6'
2630
PYTHON_ARCH: '64'
27-
2831
init:
2932
- ps: echo $env:TOXENV
3033
- ps: ls C:\Python*
@@ -40,7 +43,7 @@ install:
4043
# about it being out of date.
4144
- 'python -m pip install --disable-pip-version-check --user --upgrade pip'
4245
# install tox
43-
- pip install tox
46+
- python -m pip install tox
4447
# install of the actual project is handled by tox in tests
4548
test_script:
4649
# run tox tests

tox.ini

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,19 @@ envlist =
77
clean,
88
check,
99
lint,
10-
{py37,py38}-notebook{60,63},
10+
py36-notebook{57,64},
1111
report,
1212

1313
[testenv]
1414
basepython =
1515
pypy: {env:TOXPYTHON:pypy}
16-
py37: {env:TOXPYTHON:python3.7}
17-
py38: {env:TOXPYTHON:python3.8}
18-
{spell}: {env:TOXPYTHON:python3.8}
19-
{appveyorartifacts,lint,check}: {env:TOXPYTHON:python3.8}
20-
{condarecipe}: {env:TOXPYTHON:python3}
21-
{clean,codecov,coveralls,report}: {env:TOXPYTHON:python3.8}
22-
{docs,docs_build,docs_linkcheck}: {env:TOXPYTHON:python3.8}
23-
{bump,pypi_build,pypi_upload}: {env:TOXPYTHON:python3.8}
16+
py36: {env:TOXPYTHON:python3.6}
17+
{spell}: {env:TOXPYTHON:python3.6}
18+
{appveyorartifacts,lint,check}: {env:TOXPYTHON:python3.6}
19+
{condarecipe}: {env:TOXPYTHON:python3.6}
20+
{clean,codecov,coveralls,report}: {env:TOXPYTHON:python3.6}
21+
{docs,docs_build,docs_linkcheck}: {env:TOXPYTHON:python3.6}
22+
{bump,pypi_build,pypi_upload}: {env:TOXPYTHON:python3.6}
2423
setenv =
2524
PYTHONPATH={toxinidir}/tests
2625
PYTHONUNBUFFERED=yes
@@ -32,8 +31,8 @@ deps =
3231
jupyter_latex_envs>=1.4.0
3332
mock
3433
nose
35-
notebook60: https://github.com/jupyter/notebook/archive/6.0.0.zip
36-
notebook63: https://github.com/jupyter/notebook/archive/6.3.0.zip
34+
notebook57: notebook==5.7
35+
notebook64: notebook==6.4
3736
notebookmaster: https://github.com/jupyter/notebook/archive/master.zip
3837
notebook: notebook
3938
commands =

0 commit comments

Comments
 (0)