Skip to content

explictly install jupyter kernel, harmonise with meson #40700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

explictly install jupyter kernel, harmonise with meson #40700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32eb8d9
configure installs jupyter kerneldata to SAGE_LOCAL/share
dimpase Aug 27, 2025
7df7430
install jupyter kernel data to the venv
dimpase Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build/pkgs/sagelib/spkg-install.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ if [ "$SAGE_EDITABLE" = yes ]; then
# Additionally build a wheel (for use in other venvs)
cd $SAGE_PKGS/sagelib/src && time sdh_build_and_store_wheel --no-build-isolation .
fi
jupyter kernelspec install --name=sagemath --sys-prefix $SAGE_LOCAL/share/notebook
else
# Now implied: "$SAGE_WHEELS" = yes
# We should remove the egg-link that may have been installed previously.
Expand Down
5 changes: 5 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,11 @@ AC_CONFIG_FILES([src/bin/sage-env-config src/bin/sage-src-env-config build/bin/s

AC_CONFIG_FILES([pkgs/sage-conf/_sage_conf/_conf.py])

# install jupyter kernel data
AC_CONFIG_FILES([$SAGE_LOCAL/share/notebook/kernel.json:src/sage/ext_data/notebook-ipython/kernel.json.in]
[$SAGE_LOCAL/share/notebook/logo.svg:src/sage/ext_data/notebook-ipython/logo.svg]
[$SAGE_LOCAL/share/notebook/logo-64x64.png:src/sage/ext_data/notebook-ipython/logo-64x64.png])

dnl Create basic directories needed for Sage
AC_CONFIG_COMMANDS(mkdirs,
[
Expand Down
2 changes: 1 addition & 1 deletion src/sage/ext_data/notebook-ipython/kernel.json.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"-f",
"{connection_file}"
],
"display_name": "SageMath @SAGE_VERSION@",
"display_name": "SageMath @PACKAGE_VERSION@",
"language": "sage"
}
4 changes: 2 additions & 2 deletions src/sage/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sage_install_dir = py.get_install_dir() / 'sage'

# Generate the configuration file
conf_data = configuration_data()
conf_data.set('PACKAGE_VERSION', '1.2.3')
conf_data.set('SAGE_MESON_PKG_VERSION', '1.2.3')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you can just delete that line along with it's usage in _conf.py.in. No idea about it's purpose, if it ever served one.

# We use Python's prefix here to make it work with conda
prefix = fs.as_posix(py.get_variable('prefix', ''))
conf_data.set('prefix', prefix)
Expand Down Expand Up @@ -144,7 +144,7 @@ kernel_dir = get_option('datadir') / 'share/jupyter/kernels/sagemath'
install_data('ext_data/notebook-ipython/logo.svg', install_dir: kernel_dir)
install_data('ext_data/notebook-ipython/logo-64x64.png', install_dir: kernel_dir)
kernel_data = configuration_data()
kernel_data.set('SAGE_VERSION', meson.project_version())
kernel_data.set('PACKAGE_VERSION', meson.project_version())
configure_file(
input: 'ext_data/notebook-ipython/kernel.json.in',
output: 'kernel.json',
Expand Down
2 changes: 1 addition & 1 deletion subprojects/packagefiles/mpfi/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ mpfr = dependency('mpfr', version: '>= 4.0.1')

# Configuration data
conf = configuration_data()
conf.set('PACKAGE_VERSION', '"' + meson.project_version() + '"')
conf.set('SAGE_MESON_PKG_VERSION', '"' + meson.project_version() + '"')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's the version of mpfi, you probably don't want to change that.

# Check for functions
conf.set('HAVE_DUP2', c.has_function('dup2') ? 1 : 0)
conf.set('HAVE_GETTIMEOFDAY', c.has_function('gettimeofday') ? 1 : 0)
Expand Down
Loading