Merge pull request #1342 from ipython-contrib/fixci

Update CI config to newer versions

Author: juhasch

.travis.yml

@@ -18,19 +18,19 @@ matrix:
   include:
     # packaging sanity check
     - os: linux
-      python: '3.4'
+      python: '3.6'
       env: TOXENV=check
     # python linting
     - os: linux
-      python: '3.4'
+      python: '3.6'
       env: TOXENV=lint
     # check docs build correctly
     - os: linux
-      python: '3.4'
+      python: '3.6'
       env: TOXENV=docs_build
     # check docs links
     - os: linux
-      python: '3.4'
+      python: '3.6'
       env: TOXENV=docs_linkcheck
     # check that conda build/install works
     - os: linux
@@ -41,34 +41,19 @@ matrix:
       python: '2.7'
       env: TOXENV=py27-notebook
     - os: linux
-      python: '3.3'
-      env: TOXENV=py33-notebook
-    - os: linux
-      python: '3.4'
-      env: TOXENV=py34-notebook40
-    - os: linux
-      python: '3.4'
-      env: TOXENV=py34-notebook41
-    - os: linux
-      python: '3.4'
-      env: TOXENV=py34-notebook42
-    - os: linux
-      python: '3.4'
-      env: TOXENV=py34-notebook43
-    - os: linux
-      python: '3.4'
-      env: TOXENV=py34-notebook44
+      python: '3.6'
+      env: TOXENV=py36-notebook54
     - os: linux
-      python: '3.4'
-      env: TOXENV=py34-notebook4x
+      python: '3.6'
+      env: TOXENV=py36-notebook55
     - os: linux
-      python: '3.5'
-      env: TOXENV=py35-notebook
+      python: '3.6'
+      env: TOXENV=py36-notebook44
     - os: linux
       python: '3.6'
       env: TOXENV=py36-notebook
     - os: linux
-      python: '3.4'
+      python: '3.6'
       env: TOXENV=appveyorartifacts
   allow_failures:
     - env: TOXENV=appveyorartifacts

appveyor.yml

@@ -20,52 +20,22 @@ environment:
       PYTHON_VERSION: '2.7'
       PYTHON_ARCH: '32'
 
-    - TOXENV: 'py33-notebook'
-      TOXPYTHON: C:\Python33\python.exe
-      PYTHON_HOME: C:\Python33
-      PYTHON_VERSION: '3.3'
+    - TOXENV: 'py36-notebook44'
+      TOXPYTHON: C:\Python36\python.exe
+      PYTHON_HOME: C:\Python36
+      PYTHON_VERSION: '3.6'
       PYTHON_ARCH: '32'
 
-    - TOXENV: 'py34-notebook40'
-      TOXPYTHON: C:\Python34\python.exe
-      PYTHON_HOME: C:\Python34
-      PYTHON_VERSION: '3.4'
+    - TOXENV: 'py36-notebook54'
+      TOXPYTHON: C:\Python36\python.exe
+      PYTHON_HOME: C:\Python36
+      PYTHON_VERSION: '3.6'
       PYTHON_ARCH: '32'
 
-    - TOXENV: 'py34-notebook41'
-      TOXPYTHON: C:\Python34\python.exe
-      PYTHON_HOME: C:\Python34
-      PYTHON_VERSION: '3.4'
-      PYTHON_ARCH: '32'
-
-    - TOXENV: 'py34-notebook42'
-      TOXPYTHON: C:\Python34\python.exe
-      PYTHON_HOME: C:\Python34
-      PYTHON_VERSION: '3.4'
-      PYTHON_ARCH: '32'
-
-    - TOXENV: 'py34-notebook43'
-      TOXPYTHON: C:\Python34\python.exe
-      PYTHON_HOME: C:\Python34
-      PYTHON_VERSION: '3.4'
-      PYTHON_ARCH: '32'
-
-    - TOXENV: 'py34-notebook44'
-      TOXPYTHON: C:\Python34\python.exe
-      PYTHON_HOME: C:\Python34
-      PYTHON_VERSION: '3.4'
-      PYTHON_ARCH: '32'
-
-    - TOXENV: 'py34-notebook4x'
-      TOXPYTHON: C:\Python34\python.exe
-      PYTHON_HOME: C:\Python34
-      PYTHON_VERSION: '3.4'
-      PYTHON_ARCH: '32'
-
-    - TOXENV: 'py35-notebook'
-      TOXPYTHON: C:\Python35\python.exe
-      PYTHON_HOME: C:\Python35
-      PYTHON_VERSION: '3.5'
+    - TOXENV: 'py36-notebook55'
+      TOXPYTHON: C:\Python36\python.exe
+      PYTHON_HOME: C:\Python36
+      PYTHON_VERSION: '3.6'
       PYTHON_ARCH: '32'
 
 init:
@@ -81,7 +51,7 @@ install:
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
   # Upgrade to the latest version of pip to avoid it displaying warnings
   # about it being out of date.
-  - 'pip install --disable-pip-version-check --user --upgrade pip'
+  - 'python -m pip install --disable-pip-version-check --user --upgrade pip'
   # install tox
   - pip install tox
   # install of the actual project is handled by tox in tests

tests/test_migrate.py

@@ -6,20 +6,18 @@ envlist =
     clean,
     check,
     lint,
-    {py27,py34}-notebook{40,41,42,4x},
+    {py27,py36}-notebook{44,54,55},
     report,
 
 [testenv]
 basepython =
     pypy: {env:TOXPYTHON:pypy}
     py27: {env:TOXPYTHON:python2.7}
-    py33: {env:TOXPYTHON:python3.3}
-    py34: {env:TOXPYTHON:python3.4}
-    py35: {env:TOXPYTHON:python3.5}
     py36: {env:TOXPYTHON:python3.6}
+    py37: {env:TOXPYTHON:python3.7}
     {spell}: {env:TOXPYTHON:python2.7}
     {appveyorartifacts,lint,check}: {env:TOXPYTHON:python3}
-    {condarecipe}: {env:TOXPYTHON:python3.4}
+    {condarecipe}: {env:TOXPYTHON:python3}
     {clean,codecov,coveralls,report}: {env:TOXPYTHON:python3}
     {docs,docs_build,docs_linkcheck}: {env:TOXPYTHON:python3}
     {bump,pypi_build,pypi_upload}: {env:TOXPYTHON:python3}
@@ -34,13 +32,9 @@ deps =
     jupyter_latex_envs>=1.3.4
     mock
     nose
-    notebook40: notebook>=4.0,<4.1
-    notebook41: notebook>=4.1,<4.2
-    notebook42: notebook>=4.2,<4.3
-    notebook43: notebook>=4.3,<4.4
-    notebook44: notebook>=4.4,<4.5
-    notebook4x: https://github.com/jupyter/notebook/archive/4.x.zip
-    notebook50: https://github.com/jupyter/notebook/archive/5.0.0b1.zip
+    notebook44: https://github.com/jupyter/notebook/archive/4.4.0.zip
+    notebook54: https://github.com/jupyter/notebook/archive/5.4.0.zip
+    notebook55: https://github.com/jupyter/notebook/archive/5.5.0.zip
     notebookmaster: https://github.com/jupyter/notebook/archive/master.zip
     notebook: notebook
 commands =