Skip to content

check ipython for sphinxext, extend python_package_check macro #36848

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

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

check ipython for sphinxext, extend python_package_check macro #36848

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
21dbcbc
check ipython for sphinxext, extend python_package_check macro
dimpase Dec 9, 2023
b755e58
more ipython parts for Fedora
dimpase Dec 10, 2023
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/ipython/distros/fedora.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
ipython
python-ipython-sphinx
4 changes: 3 additions & 1 deletion build/pkgs/ipython/spkg-configure.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
SAGE_SPKG_CONFIGURE([ipython], [SAGE_PYTHON_PACKAGE_CHECK([ipython])])
SAGE_SPKG_CONFIGURE([ipython],
[SAGE_PYTHON_PACKAGE_CHECK([ipython], ["import IPython.sphinxext.ipython_directive"])
])
15 changes: 13 additions & 2 deletions m4/sage_python_package_check.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# SYNOPSIS
#
# SAGE_PYTHON_PACKAGE_CHECK(package)
# SAGE_PYTHON_PACKAGE_CHECK(package, [further_checks])
#
# DESCRIPTION
#
Expand Down Expand Up @@ -38,6 +38,9 @@
# set --enable-system-site-packages, this macro also changes the
# default for --with-system-foo from "yes" to "no" in that case.
#
# further_checks is an optional argument: a snippet of Python code to be
# called as python3 -c $2; normal exit means OK, error means not OK.
#

AC_DEFUN([SAGE_PYTHON_PACKAGE_CHECK], [
AC_MSG_CHECKING([if --enable-system-site-packages was used])
Expand Down Expand Up @@ -80,7 +83,15 @@ AC_DEFUN([SAGE_PYTHON_PACKAGE_CHECK], [
"import pkg_resources; dnl
pkg_resources.require('${SAGE_PKG_VERSPEC}'.splitlines())" dnl
2>&AS_MESSAGE_LOG_FD],
[AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(yes)
AS_IF([test x$2 != x],
[AC_MSG_CHECKING([whether further conditions are satisfied...])
AS_IF(
[PYTHONUSERBASE="${PYTHONUSERBASE}" config.venv/bin/python3 -c $2 2>&AS_MESSAGE_LOG_FD],
[AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no); sage_spkg_install_$1=yes])
])
],
[AC_MSG_RESULT(no); sage_spkg_install_$1=yes]
)

Expand Down