Update CI tests, update version

Author: Jürgen Hasch

CHANGELOG.md

@@ -21,7 +21,7 @@ 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 `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).
+- Replace `template_path` with `extra_template_paths` [#1532](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1532). Nbconvert 6.0 replaced `template_path` with `extra_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
 

setup.py

@@ -67,7 +67,7 @@ def main():
             'jupyter_nbextensions_configurator >=0.4.0',
             'nbconvert >=6.0',
             'notebook >=6.0',
-            'pyyaml',
+#            'pyyaml',
             'tornado',
             'traitlets >=4.1',
             'lxml'

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.extra_template_baaedirs = [
+c.Exporter.extra_template_paths = [
     '.',
     jupyter_contrib_nbextensions.nbconvert_support.templates_directory(),
     os.path.join(jcnbe_dir, 'nbextensions', 'highlighter')

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.extra_template_basedirs = [
+c.Exporter.extra_template_paths = [
     '.',
     jupyter_contrib_nbextensions.nbconvert_support.templates_directory(),
     os.path.join(jcnbe_dir, 'nbextensions', 'highlighter')

src/jupyter_contrib_nbextensions/install.py

@@ -120,7 +120,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.extra_template_basedirss', [
+    _update_config_list(config, 'Exporter.extra_template_pathss', [
         '.',
         jupyter_contrib_nbextensions.nbconvert_support.templates_directory(),
     ], install)

src/jupyter_contrib_nbextensions/migrate.py

@@ -117,7 +117,7 @@ def _uninstall_pre_config(logger=None):
     # and notebook < 4.2 key server_extensions
     _update_config_list(
         config, 'NotebookApp.server_extensions', to_remove, False)
-    _update_config_list(config, 'NotebookApp.extra_template_basedirss', [
+    _update_config_list(config, 'NotebookApp.extra_template_pathss', [
         os.path.join(jupyter_data_dir(), 'templates'),
     ], False)
     _set_managed_config(cm, config_basename, config, logger)
@@ -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.extra_template_basedirss', [
+    _update_config_list(config, 'Exporter.extra_template_pathss', [
         '.', os.path.join(jupyter_data_dir(), 'templates'),
     ], False)
     _update_config_list(config, 'Exporter.preprocessors', [

src/jupyter_contrib_nbextensions/nbconvert_support/exporter_inliner.py

@@ -13,7 +13,7 @@ class ExporterInliner(HTMLExporter):
         help='css and js scripts to wrap in html <style> or <script> tags')
 
     def _template_file_default(self):
-        return 'inliner'
+        return 'inliner.tpl'
 
     def from_notebook_node(self, nb, resources=None, **kw):
 

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.extra_template_basedirs = [
+        c.TemplateExporter.extra_template_paths = [
             '.',
             templates_directory(),
         ]