From a1ef675e44ce0e2923ea61e099576568c923267c Mon Sep 17 00:00:00 2001 From: demotu Date: Tue, 29 Sep 2020 12:11:10 -0300 Subject: [PATCH 01/16] replace template_path with template_paths --- .../config_scripts/highlight_html_cfg.py | 2 +- .../config_scripts/highlight_latex_cfg.py | 2 +- src/jupyter_contrib_nbextensions/install.py | 2 +- src/jupyter_contrib_nbextensions/migrate.py | 2 +- .../nbconvert_support/exporter_inliner.py | 6 +++--- src/jupyter_contrib_nbextensions/nbconvert_support/toc2.py | 2 +- .../nbextensions/runtools/readme.md | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/jupyter_contrib_nbextensions/config_scripts/highlight_html_cfg.py b/src/jupyter_contrib_nbextensions/config_scripts/highlight_html_cfg.py index 775488f5f..cf3356c83 100644 --- a/src/jupyter_contrib_nbextensions/config_scripts/highlight_html_cfg.py +++ b/src/jupyter_contrib_nbextensions/config_scripts/highlight_html_cfg.py @@ -7,7 +7,7 @@ c = get_config() # noqa c.NbConvertApp.export_format = "html" -c.Exporter.template_path = [ +c.Exporter.template_paths = [ '.', jupyter_contrib_nbextensions.nbconvert_support.templates_directory(), os.path.join(jcnbe_dir, 'nbextensions', 'highlighter') diff --git a/src/jupyter_contrib_nbextensions/config_scripts/highlight_latex_cfg.py b/src/jupyter_contrib_nbextensions/config_scripts/highlight_latex_cfg.py index 46530cbe0..1b595dedf 100644 --- a/src/jupyter_contrib_nbextensions/config_scripts/highlight_latex_cfg.py +++ b/src/jupyter_contrib_nbextensions/config_scripts/highlight_latex_cfg.py @@ -7,7 +7,7 @@ c = get_config() # noqa c.NbConvertApp.export_format = "latex" -c.Exporter.template_path = [ +c.Exporter.template_paths = [ '.', jupyter_contrib_nbextensions.nbconvert_support.templates_directory(), os.path.join(jcnbe_dir, 'nbextensions', 'highlighter') diff --git a/src/jupyter_contrib_nbextensions/install.py b/src/jupyter_contrib_nbextensions/install.py index 920140ceb..05ea0e17f 100644 --- a/src/jupyter_contrib_nbextensions/install.py +++ b/src/jupyter_contrib_nbextensions/install.py @@ -124,7 +124,7 @@ def toggle_install_config(install, user=False, sys_prefix=False, if logger: logger.info('-- Configuring nbconvert template path') # our templates directory - _update_config_list(config, 'Exporter.template_path', [ + _update_config_list(config, 'Exporter.template_paths', [ '.', jupyter_contrib_nbextensions.nbconvert_support.templates_directory(), ], install) diff --git a/src/jupyter_contrib_nbextensions/migrate.py b/src/jupyter_contrib_nbextensions/migrate.py index a9d8b9ca9..2ff8f1ff7 100644 --- a/src/jupyter_contrib_nbextensions/migrate.py +++ b/src/jupyter_contrib_nbextensions/migrate.py @@ -128,7 +128,7 @@ def _uninstall_pre_config(logger=None): config = Config(cm.get(config_basename)) if config and logger: logger.info('- Removing old config values from {}'.format(config_path)) - _update_config_list(config, 'Exporter.template_path', [ + _update_config_list(config, 'Exporter.template_paths', [ '.', os.path.join(jupyter_data_dir(), 'templates'), ], False) _update_config_list(config, 'Exporter.preprocessors', [ diff --git a/src/jupyter_contrib_nbextensions/nbconvert_support/exporter_inliner.py b/src/jupyter_contrib_nbextensions/nbconvert_support/exporter_inliner.py index cad610734..4d105a02d 100644 --- a/src/jupyter_contrib_nbextensions/nbconvert_support/exporter_inliner.py +++ b/src/jupyter_contrib_nbextensions/nbconvert_support/exporter_inliner.py @@ -39,8 +39,8 @@ def default_config(self): templates_directory) contrib_templates_dir = templates_directory() - template_path = c.TemplateExporter.setdefault('template_path', []) - if contrib_templates_dir not in template_path: - template_path.append(contrib_templates_dir) + template_paths = c.TemplateExporter.setdefault('template_paths', []) + if contrib_templates_dir not in template_paths: + template_paths.append(contrib_templates_dir) return c diff --git a/src/jupyter_contrib_nbextensions/nbconvert_support/toc2.py b/src/jupyter_contrib_nbextensions/nbconvert_support/toc2.py index ddd28caed..15162b771 100644 --- a/src/jupyter_contrib_nbextensions/nbconvert_support/toc2.py +++ b/src/jupyter_contrib_nbextensions/nbconvert_support/toc2.py @@ -55,7 +55,7 @@ def default_config(self): templates_directory) c.merge(super(TocExporter, self).default_config) - c.TemplateExporter.template_path = [ + c.TemplateExporter.template_paths = [ '.', templates_directory(), ] diff --git a/src/jupyter_contrib_nbextensions/nbextensions/runtools/readme.md b/src/jupyter_contrib_nbextensions/nbextensions/runtools/readme.md index 7e1ba79fe..eab4f5613 100644 --- a/src/jupyter_contrib_nbextensions/nbextensions/runtools/readme.md +++ b/src/jupyter_contrib_nbextensions/nbextensions/runtools/readme.md @@ -78,7 +78,7 @@ print(templates_directory()) ``` The template needs to be in a path where nbconvert can find it. This can be your local path or specified in -`jupyter_nbconvert_config` or `jupyter_notebook_config` as `c.Exporter.template_path`, see [Jupyter docs](https://jupyter-notebook.readthedocs.io/en/latest/config.html). +`jupyter_nbconvert_config` or `jupyter_notebook_config` as `c.Exporter.template_paths`, see [Jupyter docs](https://jupyter-notebook.readthedocs.io/en/latest/config.html). For HTML export a template is provided as `nbextensions.tpl` in the `jupyter_contrib_nbextensions` templates directory. Alternatively you can create your own template: ``` From 9606d6190763e6d298ab1da6df9b4b20604b8277 Mon Sep 17 00:00:00 2001 From: demotu Date: Tue, 29 Sep 2020 17:02:28 -0300 Subject: [PATCH 02/16] replace template_path with template_paths 2 --- CHANGELOG.md | 3 +++ setup.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 196496868..39f2ddc6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,9 @@ Unreleased (aka. GitHub master) This is where each new PR to the project should add a summary of its changes, which makes it much easier to fill in each release's changelog :) +- Replace `template_path` with `template_paths` [#1532](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1532). Nbconvert 6.0 replaced `template_path` with `template_paths` (see https://nbconvert.readthedocs.io/en/latest/changelog.html#significant-changes). This change in Nbconvert 6.0 causes errors in jupyter_latex_envs and in jupyter_contrib_nbextensions (see [#1529](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/issues/1529). +- Update `install_requires` list in `setup.py` with 'nbconvert >=6.0' + 0.5.1 ----- diff --git a/setup.py b/setup.py index 0f28ee4b9..e5e1a9cb0 100755 --- a/setup.py +++ b/setup.py @@ -67,7 +67,7 @@ def main(): 'jupyter_highlight_selected_word >=0.1.1', 'jupyter_latex_envs >=1.3.8', 'jupyter_nbextensions_configurator >=0.4.0', - 'nbconvert >=4.2', + 'nbconvert >=6.0', 'notebook >=4.0', 'pyyaml', 'tornado', @@ -81,7 +81,7 @@ def main(): 'pip', 'requests', ], - 'test:python_version == "2.7"': [ + 'test:python_version == "3.8"': [ 'mock', ], }, From d26af76a76c868d7ed426d34e10c0ddd09577f94 Mon Sep 17 00:00:00 2001 From: Marcos Duarte Date: Wed, 2 Dec 2020 23:23:56 -0300 Subject: [PATCH 03/16] Update tox.ini tests for python versions: 3.6, 3.7, 3.8 tests only for notebook 6.0.0 --- tox.ini | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tox.ini b/tox.ini index 81820c963..48721a558 100644 --- a/tox.ini +++ b/tox.ini @@ -6,16 +6,15 @@ envlist = clean, check, lint, - {py27,py36}-notebook{44,54,55}, + {py36,py37,py38}-notebook{60}, report, [testenv] basepython = pypy: {env:TOXPYTHON:pypy} - py27: {env:TOXPYTHON:python2.7} py36: {env:TOXPYTHON:python3.6} py37: {env:TOXPYTHON:python3.7} - {spell}: {env:TOXPYTHON:python2.7} + {py38,spell}: {env:TOXPYTHON:python3.8} {appveyorartifacts,lint,check}: {env:TOXPYTHON:python3} {condarecipe}: {env:TOXPYTHON:python3} {clean,codecov,coveralls,report}: {env:TOXPYTHON:python3} @@ -29,12 +28,10 @@ usedevelop = false deps = coverage>=4.2 jupyter_highlight_selected_word>=0.0.5 - jupyter_latex_envs>=1.3.4 + jupyter_latex_envs>=1.4.0 mock nose - 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 + notebook60: https://github.com/jupyter/notebook/archive/6.0.0.zip notebookmaster: https://github.com/jupyter/notebook/archive/master.zip notebook: notebook commands = From bb406d13454bf77cb2ed4f07f80519336ca883f2 Mon Sep 17 00:00:00 2001 From: Marcos Duarte Date: Wed, 2 Dec 2020 23:38:38 -0300 Subject: [PATCH 04/16] Update .travis.yml part of the tests using python 3.8 and notebook 6.0.0 --- .travis.yml | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index d3ad5238a..abfc280fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ # http://travis-ci.org/#!/ipython-contrib/jupyter_contrib_nbextensions language: python -dist: trusty # required for pandoc>1.9.1 +dist: xenial sudo: false addons: apt_packages: @@ -14,46 +14,37 @@ addons: matrix: fast_finish: true # Use the built-in venv for linux builds - # 3.5 as it isn't installed by default. Let tox handle other versions. + # 3.6 as it isn't installed by default. Let tox handle other versions. include: # packaging sanity check - os: linux - python: '3.6' + python: '3.8' env: TOXENV=check # python linting - os: linux - python: '3.6' + python: '3.8' env: TOXENV=lint # check docs build correctly - os: linux - python: '3.6' + python: '3.8' env: TOXENV=docs_build # check docs links - os: linux - python: '3.6' + python: '3.8' env: TOXENV=docs_linkcheck # check that conda build/install works - os: linux - python: '3.6' + python: '3.8' env: TOXENV=condarecipe # linux, various python and notebook versions - os: linux - python: '2.7' - env: TOXENV=py27-notebook + python: '3.8' + env: TOXENV=py38-notebook60 - os: linux - python: '3.6' - env: TOXENV=py36-notebook54 + python: '3.8' + env: TOXENV=py38-notebook - os: linux - python: '3.6' - env: TOXENV=py36-notebook55 - - os: linux - python: '3.6' - env: TOXENV=py36-notebook44 - - os: linux - python: '3.6' - env: TOXENV=py36-notebook - - os: linux - python: '3.6' + python: '3.8' env: TOXENV=appveyorartifacts allow_failures: - env: TOXENV=appveyorartifacts From 6c400e52b6c4270a409aca02edb74657a68d98fd Mon Sep 17 00:00:00 2001 From: Marcos Duarte Date: Wed, 2 Dec 2020 23:45:10 -0300 Subject: [PATCH 05/16] Update setup.py drop support for python 2.x requires notebook >=6.0 --- setup.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index e5e1a9cb0..efd9e7800 100755 --- a/setup.py +++ b/setup.py @@ -6,8 +6,6 @@ # Imports # ----------------------------------------------------------------------------- -from __future__ import print_function - import os from glob import glob @@ -65,10 +63,10 @@ def main(): 'jupyter_contrib_core >=0.3.3', 'jupyter_core', 'jupyter_highlight_selected_word >=0.1.1', - 'jupyter_latex_envs >=1.3.8', + 'jupyter_latex_envs >=1.4.0', 'jupyter_nbextensions_configurator >=0.4.0', 'nbconvert >=6.0', - 'notebook >=4.0', + 'notebook >=6.0', 'pyyaml', 'tornado', 'traitlets >=4.1', From 0e89bf2a23b835af1eb4f132198a8a742fbbb645 Mon Sep 17 00:00:00 2001 From: Marcos Duarte Date: Wed, 2 Dec 2020 23:50:46 -0300 Subject: [PATCH 06/16] Update appveyor.yml drop support for python < 3.6 supports only PYTHON_ARCH: '64' --- appveyor.yml | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 654e020b3..d10548c45 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,29 +14,23 @@ environment: PIP_ONLY_BINARY: lxml matrix: - - TOXENV: 'py27-notebook' - TOXPYTHON: C:\Python27\python.exe - PYTHON_HOME: C:\Python27 - PYTHON_VERSION: '2.7' - PYTHON_ARCH: '32' - - - TOXENV: 'py36-notebook44' + - TOXENV: 'py36-notebook60' TOXPYTHON: C:\Python36\python.exe PYTHON_HOME: C:\Python36 PYTHON_VERSION: '3.6' - PYTHON_ARCH: '32' + PYTHON_ARCH: '64' - - TOXENV: 'py36-notebook54' + - TOXENV: 'py37-notebook60' TOXPYTHON: C:\Python36\python.exe - PYTHON_HOME: C:\Python36 - PYTHON_VERSION: '3.6' - PYTHON_ARCH: '32' + PYTHON_HOME: C:\Python37 + PYTHON_VERSION: '3.7' + PYTHON_ARCH: '64' - - TOXENV: 'py36-notebook55' - TOXPYTHON: C:\Python36\python.exe - PYTHON_HOME: C:\Python36 - PYTHON_VERSION: '3.6' - PYTHON_ARCH: '32' + - TOXENV: 'py38-notebook60' + TOXPYTHON: C:\Python38\python.exe + PYTHON_HOME: C:\Python38 + PYTHON_VERSION: '3.8' + PYTHON_ARCH: '64' init: - ps: echo $env:TOXENV From db64d32bfeb1f6616dcc15f7eb49c0bce3ad4860 Mon Sep 17 00:00:00 2001 From: Marcos Duarte Date: Wed, 2 Dec 2020 23:52:37 -0300 Subject: [PATCH 07/16] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39f2ddc6f..8082499e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ which makes it much easier to fill in each release's changelog :) - Replace `template_path` with `template_paths` [#1532](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1532). Nbconvert 6.0 replaced `template_path` with `template_paths` (see https://nbconvert.readthedocs.io/en/latest/changelog.html#significant-changes). This change in Nbconvert 6.0 causes errors in jupyter_latex_envs and in jupyter_contrib_nbextensions (see [#1529](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/issues/1529). - Update `install_requires` list in `setup.py` with 'nbconvert >=6.0' +- Drop support for python < 3.6 0.5.1 ----- From de13f895960f33478327fdafd2277bfd2518d994 Mon Sep 17 00:00:00 2001 From: Marcos Duarte Date: Wed, 2 Dec 2020 23:55:23 -0300 Subject: [PATCH 08/16] Update meta.yaml Drop support for python < 3.6 --- conda.recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index d13f496a6..601982dcb 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -25,10 +25,10 @@ requirements: - jupyter_contrib_core >=0.3.3 - jupyter_core - jupyter_highlight_selected_word >=0.1.1 - - jupyter_latex_envs >=1.3.8 + - jupyter_latex_envs >=1.4.0 - jupyter_nbextensions_configurator >=0.4.0 - nbconvert >=4.2 - - notebook >=4.0 + - notebook >=6.0 - pyyaml - tornado - traitlets >=4.1 From 15c5542363c5a2a953d15c49124e9ae8be10a58b Mon Sep 17 00:00:00 2001 From: Marcos Duarte Date: Wed, 2 Dec 2020 23:56:52 -0300 Subject: [PATCH 09/16] Update application.py Drop support for python < 3.6 --- src/jupyter_contrib_nbextensions/application.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/jupyter_contrib_nbextensions/application.py b/src/jupyter_contrib_nbextensions/application.py index 90b1fd0ff..14aef66df 100644 --- a/src/jupyter_contrib_nbextensions/application.py +++ b/src/jupyter_contrib_nbextensions/application.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- """App to install/remove jupyter_contrib_nbextensions.""" -from __future__ import print_function, unicode_literals - import copy import sys From cb0d5f3e9ba36fc3662ad97aa223132f5ad354da Mon Sep 17 00:00:00 2001 From: Marcos Duarte Date: Wed, 2 Dec 2020 23:57:28 -0300 Subject: [PATCH 10/16] Update install.py Drop support for python < 3.6 --- src/jupyter_contrib_nbextensions/install.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/jupyter_contrib_nbextensions/install.py b/src/jupyter_contrib_nbextensions/install.py index 05ea0e17f..b4e27cb3c 100644 --- a/src/jupyter_contrib_nbextensions/install.py +++ b/src/jupyter_contrib_nbextensions/install.py @@ -1,10 +1,6 @@ # -*- coding: utf-8 -*- """API to install/remove all jupyter_contrib_nbextensions.""" -from __future__ import ( - absolute_import, division, print_function, unicode_literals, -) - import errno import os From 37a84978d02454712680ffead661a5d192740237 Mon Sep 17 00:00:00 2001 From: demotu Date: Thu, 3 Dec 2020 00:16:38 -0300 Subject: [PATCH 11/16] trigger build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index abfc280fe..87a4e5071 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -# http://travis-ci.org/#!/ipython-contrib/jupyter_contrib_nbextensions +# http://travis-ci.org/#!/ipython-contrib/jupyter_contrib_nbextensions language: python dist: xenial sudo: false From d55e8c961270fb0b239f9284793becc6f391d5d5 Mon Sep 17 00:00:00 2001 From: demotu Date: Thu, 3 Dec 2020 00:37:28 -0300 Subject: [PATCH 12/16] trigger build --- .travis.yml | 22 +++++++++++----------- tox.ini | 3 ++- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 87a4e5071..1aade8ca0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,37 +14,37 @@ addons: matrix: fast_finish: true # Use the built-in venv for linux builds - # 3.6 as it isn't installed by default. Let tox handle other versions. + # 3.5 as it isn't installed by default. Let tox handle other versions. include: # packaging sanity check - os: linux - python: '3.8' + python: '3.7' env: TOXENV=check # python linting - os: linux - python: '3.8' + python: '3.7' env: TOXENV=lint # check docs build correctly - os: linux - python: '3.8' + python: '3.7' env: TOXENV=docs_build # check docs links - os: linux - python: '3.8' + python: '3.7' env: TOXENV=docs_linkcheck # check that conda build/install works - os: linux - python: '3.8' + python: '3.7' env: TOXENV=condarecipe # linux, various python and notebook versions - os: linux - python: '3.8' - env: TOXENV=py38-notebook60 + python: '3.7' + env: TOXENV=py37-notebook60 - os: linux - python: '3.8' - env: TOXENV=py38-notebook + python: '3.7' + env: TOXENV=py37-notebook - os: linux - python: '3.8' + python: '3.7' env: TOXENV=appveyorartifacts allow_failures: - env: TOXENV=appveyorartifacts diff --git a/tox.ini b/tox.ini index 48721a558..142a096b1 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,8 @@ basepython = pypy: {env:TOXPYTHON:pypy} py36: {env:TOXPYTHON:python3.6} py37: {env:TOXPYTHON:python3.7} - {py38,spell}: {env:TOXPYTHON:python3.8} + py38: {env:TOXPYTHON:python3.8} + {spell}: {env:TOXPYTHON:python3.7} {appveyorartifacts,lint,check}: {env:TOXPYTHON:python3} {condarecipe}: {env:TOXPYTHON:python3} {clean,codecov,coveralls,report}: {env:TOXPYTHON:python3} From 42b3b6597f4e86785840cca019b359ffd2dcb1bc Mon Sep 17 00:00:00 2001 From: demotu Date: Thu, 3 Dec 2020 01:02:10 -0300 Subject: [PATCH 13/16] python 3.6 --- .travis.yml | 31 ++++++++++++++++++------------- tox.ini | 5 +++-- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1aade8ca0..e880bdc9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,33 +18,36 @@ matrix: include: # packaging sanity check - os: linux - python: '3.7' + python: '3.6' env: TOXENV=check # python linting - os: linux - python: '3.7' + python: '3.6' env: TOXENV=lint # check docs build correctly - os: linux - python: '3.7' + python: '3.6' env: TOXENV=docs_build # check docs links - os: linux - python: '3.7' + python: '3.6' env: TOXENV=docs_linkcheck # check that conda build/install works - os: linux - python: '3.7' + python: '3.6' env: TOXENV=condarecipe # linux, various python and notebook versions - os: linux - python: '3.7' - env: TOXENV=py37-notebook60 + python: '3.6' + env: TOXENV=py36-notebook55 + - os: linux + python: '3.6' + env: TOXENV=py36-notebook60 - os: linux - python: '3.7' - env: TOXENV=py37-notebook + python: '3.6' + env: TOXENV=py36-notebook - os: linux - python: '3.7' + python: '3.6' env: TOXENV=appveyorartifacts allow_failures: - env: TOXENV=appveyorartifacts @@ -55,9 +58,11 @@ env: - LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so - SEGFAULT_SIGNALS=all before_install: - - uname -a - - id -un - - id -Gn + # - uname -a + # - id -un + # - id -Gn + - python --version + - pip install -U pip # stuff for conda recipe - 'if [[ ${TOXENV} == "condarecipe" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; fi' - 'if [[ ${TOXENV} == "condarecipe" ]]; then bash miniconda.sh -b -p $HOME/miniconda; fi' diff --git a/tox.ini b/tox.ini index 142a096b1..81b043314 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ envlist = clean, check, lint, - {py36,py37,py38}-notebook{60}, + {py36,py37,py38}-notebook{55,60}, report, [testenv] @@ -15,7 +15,7 @@ basepython = py36: {env:TOXPYTHON:python3.6} py37: {env:TOXPYTHON:python3.7} py38: {env:TOXPYTHON:python3.8} - {spell}: {env:TOXPYTHON:python3.7} + {spell}: {env:TOXPYTHON:python3.6} {appveyorartifacts,lint,check}: {env:TOXPYTHON:python3} {condarecipe}: {env:TOXPYTHON:python3} {clean,codecov,coveralls,report}: {env:TOXPYTHON:python3} @@ -32,6 +32,7 @@ deps = jupyter_latex_envs>=1.4.0 mock nose + notebook55: https://github.com/jupyter/notebook/archive/5.5.0.zip notebook60: https://github.com/jupyter/notebook/archive/6.0.0.zip notebookmaster: https://github.com/jupyter/notebook/archive/master.zip notebook: notebook From 3fe40f7f99430dcb816362a85a4c7cb1095b6838 Mon Sep 17 00:00:00 2001 From: demotu Date: Thu, 3 Dec 2020 01:19:02 -0300 Subject: [PATCH 14/16] python 3.6 --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e880bdc9b..44e61b43c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,10 +58,9 @@ env: - LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so - SEGFAULT_SIGNALS=all before_install: - # - uname -a - # - id -un - # - id -Gn - - python --version + - uname -a + - id -un + - id -Gn - pip install -U pip # stuff for conda recipe - 'if [[ ${TOXENV} == "condarecipe" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; fi' From 23b7922a6af02690d7963331cb380f991ec71e37 Mon Sep 17 00:00:00 2001 From: demotu Date: Thu, 3 Dec 2020 01:24:04 -0300 Subject: [PATCH 15/16] python 3.6 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 44e61b43c..7fc3fe8c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ matrix: - os: linux python: '3.6' env: TOXENV=py36-notebook55 - - os: linux + - os: linux python: '3.6' env: TOXENV=py36-notebook60 - os: linux @@ -61,7 +61,6 @@ before_install: - uname -a - id -un - id -Gn - - pip install -U pip # stuff for conda recipe - 'if [[ ${TOXENV} == "condarecipe" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; fi' - 'if [[ ${TOXENV} == "condarecipe" ]]; then bash miniconda.sh -b -p $HOME/miniconda; fi' From 8e14f4aa734ac36e8907bac8085cf3f396fa2342 Mon Sep 17 00:00:00 2001 From: demotu Date: Thu, 3 Dec 2020 01:34:14 -0300 Subject: [PATCH 16/16] version 0.5.2 --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index efd9e7800..e332119ad 100755 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ def main(): `the repository issues page `_ if you encounter any problems, and create a new issue if needed! """, # noqa: E501 - version='0.5.1', + version='0.5.2', author='ipython-contrib and jupyter-contrib developers', author_email='jupytercontrib@gmail.com', url=('https://github.com/' @@ -79,7 +79,7 @@ def main(): 'pip', 'requests', ], - 'test:python_version == "3.8"': [ + 'test:python_version == "3.6"': [ 'mock', ], },