Skip to content

Commit d786f8b

Browse files
author
Jürgen Hasch
committed
Update CI tests, update version
1 parent 72167ec commit d786f8b

File tree

8 files changed

+9
-12
lines changed

8 files changed

+9
-12
lines changed

.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ matrix:
3737
python: '3.8'
3838
env: TOXENV=condarecipe
3939
# linux, various python and notebook versions
40-
- os: linux
41-
python: '3.8'
42-
env: TOXENV=py38-notebook55
4340
- os: linux
4441
python: '3.8'
4542
env: TOXENV=py38-notebook60

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Unreleased (aka. GitHub master)
2121
This is where each new PR to the project should add a summary of its changes,
2222
which makes it much easier to fill in each release's changelog :)
2323

24-
- 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).
24+
- Replace `template_path` with `extra_template_basedirs` [#1532](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1532). Nbconvert 6.0 replaced `template_path` with `extra_template_basedirs` (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).
2525
- Update `install_requires` list in `setup.py` with 'nbconvert >=6.0'
2626
- Drop support for python < 3.6
2727

src/jupyter_contrib_nbextensions/config_scripts/highlight_html_cfg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
c = get_config() # noqa
99
c.NbConvertApp.export_format = "html"
10-
c.Exporter.template_paths = [
10+
c.Exporter.extra_template_baaedirs = [
1111
'.',
1212
jupyter_contrib_nbextensions.nbconvert_support.templates_directory(),
1313
os.path.join(jcnbe_dir, 'nbextensions', 'highlighter')

src/jupyter_contrib_nbextensions/config_scripts/highlight_latex_cfg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
c = get_config() # noqa
99
c.NbConvertApp.export_format = "latex"
10-
c.Exporter.template_paths = [
10+
c.Exporter.extra_template_basedirs = [
1111
'.',
1212
jupyter_contrib_nbextensions.nbconvert_support.templates_directory(),
1313
os.path.join(jcnbe_dir, 'nbextensions', 'highlighter')

src/jupyter_contrib_nbextensions/install.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def toggle_install_config(install, user=False, sys_prefix=False,
120120
if logger:
121121
logger.info('-- Configuring nbconvert template path')
122122
# our templates directory
123-
_update_config_list(config, 'Exporter.template_paths', [
123+
_update_config_list(config, 'Exporter.extra_template_basedirss', [
124124
'.',
125125
jupyter_contrib_nbextensions.nbconvert_support.templates_directory(),
126126
], install)

src/jupyter_contrib_nbextensions/migrate.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def _uninstall_pre_config(logger=None):
117117
# and notebook < 4.2 key server_extensions
118118
_update_config_list(
119119
config, 'NotebookApp.server_extensions', to_remove, False)
120-
_update_config_list(config, 'NotebookApp.extra_template_paths', [
120+
_update_config_list(config, 'NotebookApp.extra_template_basedirss', [
121121
os.path.join(jupyter_data_dir(), 'templates'),
122122
], False)
123123
_set_managed_config(cm, config_basename, config, logger)
@@ -128,7 +128,7 @@ def _uninstall_pre_config(logger=None):
128128
config = Config(cm.get(config_basename))
129129
if config and logger:
130130
logger.info('- Removing old config values from {}'.format(config_path))
131-
_update_config_list(config, 'Exporter.template_paths', [
131+
_update_config_list(config, 'Exporter.extra_template_basedirss', [
132132
'.', os.path.join(jupyter_data_dir(), 'templates'),
133133
], False)
134134
_update_config_list(config, 'Exporter.preprocessors', [

src/jupyter_contrib_nbextensions/nbconvert_support/toc2.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def _file_extension_default(self):
4040
return '.html'
4141

4242
def _template_file_default(self):
43-
return 'toc2'
43+
return 'toc2.tpl'
4444

4545
output_mimetype = 'text/html'
4646

@@ -55,7 +55,7 @@ def default_config(self):
5555
templates_directory)
5656
c.merge(super(TocExporter, self).default_config)
5757

58-
c.TemplateExporter.template_paths = [
58+
c.TemplateExporter.extra_template_basedirs = [
5959
'.',
6060
templates_directory(),
6161
]

src/jupyter_contrib_nbextensions/nbextensions/runtools/readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ print(templates_directory())
7878
```
7979

8080
The template needs to be in a path where nbconvert can find it. This can be your local path or specified in
81-
`jupyter_nbconvert_config` or `jupyter_notebook_config` as `c.Exporter.template_paths`, see [Jupyter docs](https://jupyter-notebook.readthedocs.io/en/latest/config.html).
81+
`jupyter_nbconvert_config` or `jupyter_notebook_config` as `c.Exporter.extra_template_basdirs`, see [Jupyter docs](https://jupyter-notebook.readthedocs.io/en/latest/config.html).
8282

8383
For HTML export a template is provided as `nbextensions.tpl` in the `jupyter_contrib_nbextensions` templates directory. Alternatively you can create your own template:
8484
```

0 commit comments

Comments
 (0)