Skip to content

Commit a695ffe

Browse files
committed
Update CI settings
1 parent 3a0425c commit a695ffe

File tree

2 files changed

+22
-35
lines changed

2 files changed

+22
-35
lines changed

appveyor.yml

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,31 +13,21 @@ environment:
1313
# appropriate libxml headers. As a result, make pip use binary packages.
1414
PIP_ONLY_BINARY: lxml
1515
matrix:
16-
17-
- TOXENV: 'py27-notebook'
18-
TOXPYTHON: C:\Python27\python.exe
19-
PYTHON_HOME: C:\Python27
20-
PYTHON_VERSION: '2.7'
21-
PYTHON_ARCH: '32'
22-
23-
- TOXENV: 'py36-notebook44'
24-
TOXPYTHON: C:\Python36\python.exe
25-
PYTHON_HOME: C:\Python36
16+
- TOXENV: 'py36-notebook57'
17+
TOXPYTHON: C:\Python36-x64\python.exe
18+
PYTHON_HOME: C:\Python36-x64
2619
PYTHON_VERSION: '3.6'
27-
PYTHON_ARCH: '32'
28-
29-
- TOXENV: 'py36-notebook54'
30-
TOXPYTHON: C:\Python36\python.exe
31-
PYTHON_HOME: C:\Python36
20+
PYTHON_ARCH: '64'
21+
- TOXENV: 'py36-notebook64'
22+
TOXPYTHON: C:\Python36-x64\python.exe
23+
PYTHON_HOME: C:\Python36-x64
3224
PYTHON_VERSION: '3.6'
33-
PYTHON_ARCH: '32'
34-
35-
- TOXENV: 'py36-notebook55'
36-
TOXPYTHON: C:\Python36\python.exe
37-
PYTHON_HOME: C:\Python36
25+
PYTHON_ARCH: '64'
26+
- TOXENV: 'py36-notebook'
27+
TOXPYTHON: C:\Python36-x64\python.exe
28+
PYTHON_HOME: C:\Python36-x64
3829
PYTHON_VERSION: '3.6'
39-
PYTHON_ARCH: '32'
40-
30+
PYTHON_ARCH: '64'
4131
init:
4232
- ps: echo $env:TOXENV
4333
- ps: ls C:\Python*
@@ -53,7 +43,7 @@ install:
5343
# about it being out of date.
5444
- 'python -m pip install --disable-pip-version-check --user --upgrade pip'
5545
# install tox
56-
- pip install tox
46+
- python -m pip install tox
5747
# install of the actual project is handled by tox in tests
5848
test_script:
5949
# run tox tests

tox.ini

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,19 @@ envlist =
66
clean,
77
check,
88
lint,
9-
{py27,py36}-notebook{44,54,55},
9+
py36-notebook{57,64},
1010
report,
1111

1212
[testenv]
1313
basepython =
1414
pypy: {env:TOXPYTHON:pypy}
15-
py27: {env:TOXPYTHON:python2.7}
1615
py36: {env:TOXPYTHON:python3.6}
17-
py37: {env:TOXPYTHON:python3.7}
18-
{spell}: {env:TOXPYTHON:python2.7}
19-
{appveyorartifacts,lint,check}: {env:TOXPYTHON:python3}
20-
{condarecipe}: {env:TOXPYTHON:python3}
21-
{clean,codecov,coveralls,report}: {env:TOXPYTHON:python3}
22-
{docs,docs_build,docs_linkcheck}: {env:TOXPYTHON:python3}
23-
{bump,pypi_build,pypi_upload}: {env:TOXPYTHON:python3}
16+
{spell}: {env:TOXPYTHON:python3.6}
17+
{appveyorartifacts,lint,check}: {env:TOXPYTHON:python3.6}
18+
{condarecipe}: {env:TOXPYTHON:python3.6}
19+
{clean,codecov,coveralls,report}: {env:TOXPYTHON:python3.6}
20+
{docs,docs_build,docs_linkcheck}: {env:TOXPYTHON:python3.6}
21+
{bump,pypi_build,pypi_upload}: {env:TOXPYTHON:python3.6}
2422
setenv =
2523
PYTHONPATH={toxinidir}/tests
2624
PYTHONUNBUFFERED=yes
@@ -32,9 +30,8 @@ deps =
3230
jupyter_latex_envs>=1.3.4
3331
mock
3432
nose
35-
notebook44: https://github.com/jupyter/notebook/archive/4.4.0.zip
36-
notebook54: https://github.com/jupyter/notebook/archive/5.4.0.zip
37-
notebook55: https://github.com/jupyter/notebook/archive/5.5.0.zip
33+
notebook57: notebook==5.7
34+
notebook64: notebook==6.4
3835
notebookmaster: https://github.com/jupyter/notebook/archive/master.zip
3936
notebook: notebook
4037
commands =

0 commit comments

Comments
 (0)