Use versioned kernel name

sagemath · Apr 6, 2022 · ecd6c78 · ecd6c78
1 parent b397afc
commit ecd6c78
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/build/bin/sage-site b/build/bin/sage-site
@@ -236,11 +236,6 @@ if [ "$1" = "-docbuild" -o "$1" = "--docbuild" ]; then
  export OMP_NUM_THREADS=1
  fi
 
- # Trac #33650: Make sure that user configuration of Jupyter does not
- # shadow our sagemath kernel when jupyter-sphinx is invoked
- export JUPYTER_CONFIG_DIR=/doesnotexist
- export JUPYTER_CONFIG_PATH=/doesnotexist
-
  exec sage-python -m sage_docbuild "$@" </dev/null
 fi
 

diff --git a/src/sage/docs/conf.py b/src/sage/docs/conf.py
@@ -1,7 +1,7 @@
 import sys
 import os
 import sphinx
-from sage.env import SAGE_DOC_SRC, SAGE_DOC, SAGE_SRC, THEBE_DIR, PPLPY_DOCS, MATHJAX_DIR
+from sage.env import SAGE_VERSION, SAGE_DOC_SRC, SAGE_DOC, SAGE_SRC, THEBE_DIR, PPLPY_DOCS, MATHJAX_DIR
 import sage.version
 from sage.misc.sagedoc import extlinks
 import dateutil.parser
@@ -26,7 +26,7 @@
  'matplotlib.sphinxext.plot_directive',
  'jupyter_sphinx']
 
-jupyter_execute_default_kernel = 'sagemath'
+jupyter_execute_default_kernel = 'sagemath' + SAGE_VERSION
 
 jupyter_sphinx_thebelab_config = {
  'requestKernel': True,
@@ -35,7 +35,7 @@
  },
  'kernelOptions': {
  'name': "sagemath",
- 'kernelName': "sagemath",
+ 'kernelName': jupyter_execute_default_kernel,
  'path': ".",
  },
 }

diff --git a/src/sage/repl/ipython_kernel/install.py b/src/sage/repl/ipython_kernel/install.py
@@ -85,9 +85,9 @@ def identifier(cls):
 
  sage: from sage.repl.ipython_kernel.install import SageKernelSpec
  sage: SageKernelSpec.identifier()
- 'sagemath'
+ 'sagemath...'
  """
- return 'sagemath'
+ return 'sagemath' + SAGE_VERSION
 
  def symlink(self, src, dst):
  """