From 7240d4b964cedce743614d9a0eab3e0a2274b097 Mon Sep 17 00:00:00 2001 From: RRosio Date: Wed, 4 Oct 2023 12:28:05 -0700 Subject: [PATCH 1/2] update for compatibility with notebook 7 and nbclassic --- .../notebook_compat/_compat/nbextensions.py | 9 ++++++++- .../notebook_compat/_compat/serverextensions.py | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/jupyter_contrib_core/notebook_compat/_compat/nbextensions.py b/src/jupyter_contrib_core/notebook_compat/_compat/nbextensions.py index e76bdab..6df35c7 100644 --- a/src/jupyter_contrib_core/notebook_compat/_compat/nbextensions.py +++ b/src/jupyter_contrib_core/notebook_compat/_compat/nbextensions.py @@ -32,9 +32,15 @@ ENV_CONFIG_PATH, ENV_JUPYTER_PATH, SYSTEM_CONFIG_PATH, SYSTEM_JUPYTER_PATH, jupyter_config_dir, jupyter_data_dir, ) -from notebook.nbextensions import ( +try: + from notebook.nbextensions import ( ArgumentConflict, __version__, _safe_is_tarfile, ) +except ImportError: + from nbclassic.nbextensions import ( + ArgumentConflict, __version__, _safe_is_tarfile, + ) + from tornado.log import LogFormatter from traitlets import Bool from traitlets.config.manager import BaseJSONConfigManager @@ -367,6 +373,7 @@ class BaseNBExtensionApp(JupyterApp): """Base nbextension installer app""" _log_formatter_cls = LogFormatter version = __version__ + print(f"version is: {__version__}") flags = copy.deepcopy(JupyterApp.flags) flags.update({ diff --git a/src/jupyter_contrib_core/notebook_compat/_compat/serverextensions.py b/src/jupyter_contrib_core/notebook_compat/_compat/serverextensions.py index 32232f4..f3b3d28 100644 --- a/src/jupyter_contrib_core/notebook_compat/_compat/serverextensions.py +++ b/src/jupyter_contrib_core/notebook_compat/_compat/serverextensions.py @@ -70,8 +70,8 @@ def toggle_serverextension_python(import_name, enabled=None, parent=None, cm = BaseJSONConfigManager(parent=parent, config_dir=config_dir) cfg = cm.get("jupyter_notebook_config") server_extensions = ( - cfg.setdefault("NotebookApp", {}) - .setdefault("server_extensions", []) + cfg.setdefault("ServerApp", {}) + .setdefault("jpserver_extensions", []) ) old_enabled = import_name in server_extensions From e56d08196830f66f84cee5e99668675cae0f79de Mon Sep 17 00:00:00 2001 From: RRosio Date: Wed, 4 Oct 2023 12:56:32 -0700 Subject: [PATCH 2/2] remove print statement --- src/jupyter_contrib_core/notebook_compat/_compat/nbextensions.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/jupyter_contrib_core/notebook_compat/_compat/nbextensions.py b/src/jupyter_contrib_core/notebook_compat/_compat/nbextensions.py index 6df35c7..6188ea7 100644 --- a/src/jupyter_contrib_core/notebook_compat/_compat/nbextensions.py +++ b/src/jupyter_contrib_core/notebook_compat/_compat/nbextensions.py @@ -373,7 +373,6 @@ class BaseNBExtensionApp(JupyterApp): """Base nbextension installer app""" _log_formatter_cls = LogFormatter version = __version__ - print(f"version is: {__version__}") flags = copy.deepcopy(JupyterApp.flags) flags.update({