Migration to latest jupyter version

morganstanley · Jun 9, 2024 · 827dfdf · 827dfdf
1 parent f99242f
commit 827dfdf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/scripts/lib/setup.py b/scripts/lib/setup.py
@@ -63,7 +63,8 @@
         'cement',
         'termcolor',
         'py-cpuinfo',
-        'jupyter',
+        'nbclassic',
         'six',
+        'setuptools'
       ],
       zip_safe=False)
diff --git a/scripts/lib/xpedite/jupyter/commands.py b/scripts/lib/xpedite/jupyter/commands.py
@@ -14,7 +14,7 @@
 """
 
 import logging
-from IPython.core.display      import display, HTML
+from IPython.display           import display, HTML
 from xpedite.jupyter.context   import context
 from xpedite.report.markup     import ERROR_TEXT
 
@@ -241,7 +241,7 @@ def __repr__(self):
       ) if self.profile.current.isEventsEnabled() else ''
       threshold = 1000
       if len(self.profile.current) > threshold:
-        LOGGER.warn('too many transaction - showing only %d out of %d', threshold, len(self.profile.current))
+        LOGGER.warning('too many transaction - showing only %d out of %d', threshold, len(self.profile.current))
       strRepr += str(ReportBuilder().buildTimelineTable(
         self.profile.current, self.profile.probes, ResultOrder.Chronological, threshold, uid
       ))

diff --git a/scripts/lib/xpedite/jupyter/driver.py b/scripts/lib/xpedite/jupyter/driver.py
@@ -210,7 +210,7 @@ def launchJupyter(homeDir):
   jupyterEnv['PATH'] = pyPath
   jupyterEnv['HOME'] = tempfile.mkdtemp(prefix=SHELL_PREFIX, dir='/tmp')
   jupyterBinary = binPath('jupyter')
-  os.execle(jupyterBinary, 'Xpedite', 'notebook', '--no-browser', '--notebook-dir='+homeDir, jupyterEnv)
+  os.execle(jupyterBinary, 'Xpedite', 'nbclassic', '--no-browser', '--notebook-dir='+homeDir, jupyterEnv)
 
 def validatePath(homeDir, reportName):
   """Validates the path to store xpedite notebook and data files"""

diff --git a/scripts/lib/xpedite/requirements.txt b/scripts/lib/xpedite/requirements.txt
@@ -5,8 +5,9 @@ netifaces>=0.10.4
 numpy>=1.15.2
 pygments>=2.0.2
 rpyc>=4.0.1
-cement==2.8.2
+cement>=3.0.10
 termcolor>=1.1.0
 py-cpuinfo>=0.1.2
-jupyter>=1.0.0
 six>=1.12.0
+nbclassic>=1.0.0
+setuptools