Skip to content

Commit 56ad189

Browse files
author
Juergen Hasch
committed
Update CI config to newer versions
1 parent 6af8e5e commit 56ad189

File tree

3 files changed

+37
-68
lines changed

3 files changed

+37
-68
lines changed

.travis.yml

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ matrix:
1818
include:
1919
# packaging sanity check
2020
- os: linux
21-
python: '3.4'
21+
python: '3.6'
2222
env: TOXENV=check
2323
# python linting
2424
- os: linux
25-
python: '3.4'
25+
python: '3.6'
2626
env: TOXENV=lint
2727
# check docs build correctly
2828
- os: linux
29-
python: '3.4'
29+
python: '3.6'
3030
env: TOXENV=docs_build
3131
# check docs links
3232
- os: linux
33-
python: '3.4'
33+
python: '3.6'
3434
env: TOXENV=docs_linkcheck
3535
# check that conda build/install works
3636
- os: linux
@@ -44,31 +44,22 @@ matrix:
4444
python: '3.3'
4545
env: TOXENV=py33-notebook
4646
- os: linux
47-
python: '3.4'
48-
env: TOXENV=py34-notebook40
49-
- os: linux
50-
python: '3.4'
51-
env: TOXENV=py34-notebook41
52-
- os: linux
53-
python: '3.4'
54-
env: TOXENV=py34-notebook42
55-
- os: linux
56-
python: '3.4'
57-
env: TOXENV=py34-notebook43
47+
python: '3.6'
48+
env: TOXENV=py36-notebook54
5849
- os: linux
59-
python: '3.4'
60-
env: TOXENV=py34-notebook44
50+
python: '3.6'
51+
env: TOXENV=py36-notebook55
6152
- os: linux
62-
python: '3.4'
63-
env: TOXENV=py34-notebook4x
53+
python: '3.6'
54+
env: TOXENV=py36-notebook44
6455
- os: linux
6556
python: '3.5'
6657
env: TOXENV=py35-notebook
6758
- os: linux
6859
python: '3.6'
6960
env: TOXENV=py36-notebook
7061
- os: linux
71-
python: '3.4'
62+
python: '3.6'
7263
env: TOXENV=appveyorartifacts
7364
allow_failures:
7465
- env: TOXENV=appveyorartifacts

appveyor.yml

Lines changed: 22 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -20,52 +20,34 @@ environment:
2020
PYTHON_VERSION: '2.7'
2121
PYTHON_ARCH: '32'
2222

23-
- TOXENV: 'py33-notebook'
24-
TOXPYTHON: C:\Python33\python.exe
25-
PYTHON_HOME: C:\Python33
26-
PYTHON_VERSION: '3.3'
23+
- TOXENV: 'py36-notebook40'
24+
TOXPYTHON: C:\Python36\python.exe
25+
PYTHON_HOME: C:\Python36
26+
PYTHON_VERSION: '3.6'
2727
PYTHON_ARCH: '32'
2828

29-
- TOXENV: 'py34-notebook40'
30-
TOXPYTHON: C:\Python34\python.exe
31-
PYTHON_HOME: C:\Python34
32-
PYTHON_VERSION: '3.4'
29+
- TOXENV: 'py36-notebook44'
30+
TOXPYTHON: C:\Python36\python.exe
31+
PYTHON_HOME: C:\Python36
32+
PYTHON_VERSION: '3.6'
3333
PYTHON_ARCH: '32'
3434

35-
- TOXENV: 'py34-notebook41'
36-
TOXPYTHON: C:\Python34\python.exe
37-
PYTHON_HOME: C:\Python34
38-
PYTHON_VERSION: '3.4'
35+
- TOXENV: 'py36-notebook54'
36+
TOXPYTHON: C:\Python36\python.exe
37+
PYTHON_HOME: C:\Python36
38+
PYTHON_VERSION: '3.6'
3939
PYTHON_ARCH: '32'
4040

41-
- TOXENV: 'py34-notebook42'
42-
TOXPYTHON: C:\Python34\python.exe
43-
PYTHON_HOME: C:\Python34
44-
PYTHON_VERSION: '3.4'
41+
- TOXENV: 'py36-notebook55'
42+
TOXPYTHON: C:\Python36\python.exe
43+
PYTHON_HOME: C:\Python36
44+
PYTHON_VERSION: '3.6'
4545
PYTHON_ARCH: '32'
4646

47-
- TOXENV: 'py34-notebook43'
48-
TOXPYTHON: C:\Python34\python.exe
49-
PYTHON_HOME: C:\Python34
50-
PYTHON_VERSION: '3.4'
51-
PYTHON_ARCH: '32'
52-
53-
- TOXENV: 'py34-notebook44'
54-
TOXPYTHON: C:\Python34\python.exe
55-
PYTHON_HOME: C:\Python34
56-
PYTHON_VERSION: '3.4'
57-
PYTHON_ARCH: '32'
58-
59-
- TOXENV: 'py34-notebook4x'
60-
TOXPYTHON: C:\Python34\python.exe
61-
PYTHON_HOME: C:\Python34
62-
PYTHON_VERSION: '3.4'
63-
PYTHON_ARCH: '32'
64-
65-
- TOXENV: 'py35-notebook'
66-
TOXPYTHON: C:\Python35\python.exe
67-
PYTHON_HOME: C:\Python35
68-
PYTHON_VERSION: '3.5'
47+
- TOXENV: 'py37-notebook'
48+
TOXPYTHON: C:\Python37\python.exe
49+
PYTHON_HOME: C:\Python37
50+
PYTHON_VERSION: '3.7'
6951
PYTHON_ARCH: '32'
7052

7153
init:
@@ -77,8 +59,8 @@ install:
7759
# parent CMD process).
7860
- "SET PATH=%PYTHON_HOME%;%PYTHON_HOME%\\Scripts;%PATH%"
7961
# Check that we have the expected version and architecture for Python
80-
- "python --version"
81-
- "python -c \"import struct; print(struct.calcsize('P') * 8)\""
62+
- "%TOXPYTHON --version"
63+
- "%TOXPYTHON% -c \"import struct; print(struct.calcsize('P') * 8)\""
8264
# Upgrade to the latest version of pip to avoid it displaying warnings
8365
# about it being out of date.
8466
- 'pip install --disable-pip-version-check --user --upgrade pip'

tox.ini

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ envlist =
66
clean,
77
check,
88
lint,
9-
{py27,py34}-notebook{40,41,42,4x},
9+
{py27,py36}-notebook{44,54,55},
1010
report,
1111

1212
[testenv]
@@ -34,13 +34,9 @@ deps =
3434
jupyter_latex_envs>=1.3.4
3535
mock
3636
nose
37-
notebook40: notebook>=4.0,<4.1
38-
notebook41: notebook>=4.1,<4.2
39-
notebook42: notebook>=4.2,<4.3
40-
notebook43: notebook>=4.3,<4.4
41-
notebook44: notebook>=4.4,<4.5
42-
notebook4x: https://github.com/jupyter/notebook/archive/4.x.zip
43-
notebook50: https://github.com/jupyter/notebook/archive/5.0.0b1.zip
37+
notebook44: https://github.com/jupyter/notebook/archive/4.4.0.zip
38+
notebook54: https://github.com/jupyter/notebook/archive/5.4.0.zip
39+
notebook55: https://github.com/jupyter/notebook/archive/5.5.0.zip
4440
notebookmaster: https://github.com/jupyter/notebook/archive/master.zip
4541
notebook: notebook
4642
commands =

0 commit comments

Comments
 (0)