Merge #30383

Matthias Koeppe · Matthias Koeppe · commit a67300bd6673 · 2021-03-12T14:25:25.000-08:00
diff --git a/Makefile b/Makefile
@@ -15,6 +15,12 @@ all: base-toolchain
 build: base-toolchain
 	$(MAKE) all-build
 
+build-local: base-toolchain
+	$(MAKE) all-build-local
+
+build-venv: base-toolchain
+	$(MAKE) all-build-venv
+
 start: base-toolchain
 	$(MAKE) build-start
 
diff --git a/bootstrap b/bootstrap
@@ -80,6 +80,13 @@ install_config_rpath() {
 bootstrap () {
     rm -f m4/sage_spkg_configures.m4
     spkg_configures=""
+
+    # initialize SAGE_ENABLE... options for standard packages
+    for pkgname in $(./sage --package list :standard: | sort); do
+        spkg_configures="$spkg_configures
+AS_VAR_SET_IF([SAGE_ENABLE_$pkgname], [], [AS_VAR_SET([SAGE_ENABLE_$pkgname], [yes])])"
+    done
+    # --enable-SPKG options
     for pkgname in $(./sage --package list :optional: :experimental: | sort); do
                 # Trac #29629: Temporary solution for Sage 9.1: Do not provide
                 # --enable-SPKG options for installing pip packages
@@ -89,7 +96,8 @@ bootstrap () {
                     case "$pkgname" in
                         _*) ;;
                         *)  spkg_configures="$spkg_configures
-SAGE_SPKG_ENABLE([$pkgname], [$pkgtype])" ;;
+AC_SUBST(SAGE_ENABLE_$pkgname, [if_installed])
+SAGE_SPKG_ENABLE([$pkgname], [$pkgtype], [$(head -n1 build/pkgs/$pkgname/SPKG.rst 2>/dev/null || echo $pkgname)])" ;;
                     esac
                 fi
     done
diff --git a/build/make/Makefile.in b/build/make/Makefile.in
@@ -86,19 +86,28 @@ GCC_DEP = @SAGE_GCC_DEP@
 
 @SAGE_PACKAGE_DEPENDENCIES@
 
-# All standard packages
-STANDARD_PACKAGES = @SAGE_STANDARD_PACKAGES@
-STANDARD_PACKAGE_INSTS = \
-	$(foreach pkgname,$(STANDARD_PACKAGES),$(inst_$(pkgname)))
+# Installation trees for all packages, in the format:
+#
+# - for a non-Python package:
+#
+#   trees_<pkgname1> = SAGE_LOCAL
+#
+# - for a Python package:
+#
+#   trees_<pkgname2> = SAGE_VENV
+
+@SAGE_PACKAGE_TREES@
 
-# All optional installed packages (triggers the auto-update)
+# All standard/optional/experimental installed packages (triggers the auto-update)
 OPTIONAL_INSTALLED_PACKAGES = @SAGE_OPTIONAL_INSTALLED_PACKAGES@
-OPTIONAL_INSTALLED_PACKAGE_INSTS = \
-    $(foreach pkgname,$(OPTIONAL_INSTALLED_PACKAGES),$(inst_$(pkgname)))
+INSTALLED_PACKAGES = $(OPTIONAL_INSTALLED_PACKAGES)
+INSTALLED_PACKAGE_INSTS = \
+    $(foreach pkgname,$(INSTALLED_PACKAGES),$(inst_$(pkgname)))
 
-# All previously installed optional packages that are to be uninstalled
-OPTIONAL_CLEANED_PACKAGES = @SAGE_OPTIONAL_CLEANED_PACKAGES@
-OPTIONAL_CLEANED_PACKAGES_CLEANS = $(OPTIONAL_CLEANED_PACKAGES:%=%-clean)
+# All previously installed standard/optional/experimental packages that are to be uninstalled
+OPTIONAL_UNINSTALLED_PACKAGES = @SAGE_OPTIONAL_UNINSTALLED_PACKAGES@
+UNINSTALLED_PACKAGES = $(OPTIONAL_UNINSTALLED_PACKAGES)
+UNINSTALLED_PACKAGES_CLEANS = $(UNINSTALLED_PACKAGES:%=%-clean)
 
 # All packages which should be downloaded
 SDIST_PACKAGES = @SAGE_SDIST_PACKAGES@
@@ -146,6 +155,18 @@ $(INST)/.dummy:
 	touch $@
 
 
+# Filtered by installation tree
+$(foreach tree,SAGE_LOCAL SAGE_VENV, \
+    $(eval $(tree)_INSTALLED_PACKAGE_INSTS = \
+               $(foreach pkgname,$(INSTALLED_PACKAGES), \
+                         $(if $(findstring $(tree),$(trees_$(pkgname))), \
+                              $(inst_$(pkgname))))) \
+    $(eval $(tree)_CLEANED_PACKAGE_CLEANS = \
+               $(foreach pkgname,$(INSTALLED_PACKAGES), \
+                         $(if $(findstring $(tree),$(trees_$(pkgname))), \
+                              $(inst_$(pkgname))))))
+
+
 ###############################################################################
 
 # Silent rules
@@ -211,9 +232,19 @@ base-toolchain: _clean-broken-gcc base
 # All targets except for the base packages
 all-sage: \
 		sagelib \
-		$(STANDARD_PACKAGE_INSTS) \
-		$(OPTIONAL_INSTALLED_PACKAGE_INSTS) \
-                $(OPTIONAL_CLEANED_PACKAGES_CLEANS)
+		$(INSTALLED_PACKAGE_INSTS) \
+                $(UNINSTALLED_PACKAGES_CLEANS)
+
+# Same but filtered by installation trees:
+all-build-local: toolchain-deps
+	+$(MAKE_REC) all-sage-local
+
+all-sage-local: $(SAGE_LOCAL_INSTALLED_PACKAGE_INSTS) $(SAGE_LOCAL_UNINSTALLED_PACKAGES_CLEANS)
+
+all-build-venv: toolchain-deps
+	+$(MAKE_REC) all-sage-venv
+
+all-sage-venv:  $(SAGE_VENV_INSTALLED_PACKAGE_INSTS)  $(SAGE_VENV_UNINSTALLED_PACKAGES_CLEANS)
 
 # Download all packages which should be inside an sdist tarball (the -B
 # option to make forces all targets to be built unconditionally)
@@ -268,7 +299,7 @@ build-start: all-build
 # We make this depend on all standard packages because running
 # sage-starts runs sage-location, which should be run after installing
 # any package.
-$(STARTED): $(STANDARD_PACKAGE_INSTS)
+$(STARTED): $(OPTIONAL_INSTALLED_PACKAGE_INSTS)
 	$(AM_V_at)"$(SAGE_ROOT)/build/bin/sage-starts"
 
 
diff --git a/build/pkgs/ipywidgets/checksums.ini b/build/pkgs/ipywidgets/checksums.ini
@@ -1,5 +1,5 @@
 tarball=ipywidgets-VERSION.tar.gz
-sha1=d46a0d2e16cb2a878043576f8b2afd732e8b5491
-md5=090f5ad1294b084f075af8f684d8981f
-cksum=3253769585
+sha1=29efcd1ba915a02078d3a73da487c3ee4db0730f
+md5=19c4ddc4cebfdc82bacacf98513fb672
+cksum=1780484298
 upstream_url=https://pypi.io/packages/source/i/ipywidgets/ipywidgets-VERSION.tar.gz
diff --git a/build/pkgs/ipywidgets/package-version.txt b/build/pkgs/ipywidgets/package-version.txt
@@ -1 +1 @@
-7.5.1
+7.6.3
diff --git a/build/pkgs/pynac/install-requires.txt b/build/pkgs/pynac/install-requires.txt
diff --git a/build/pkgs/sagelib/install-requires.txt b/build/pkgs/sagelib/install-requires.txt
@@ -0,0 +1 @@
+sagemath-standard
diff --git a/build/pkgs/widgetsnbextension/dependencies b/build/pkgs/widgetsnbextension/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN) notebook jupyter_core
+$(PYTHON) | $(PYTHON_TOOLCHAIN) jupyter_core
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/widgetsnbextension/package-version.txt b/build/pkgs/widgetsnbextension/package-version.txt
@@ -1 +1 @@
-3.5.1
+3.5.1.p0
diff --git a/build/pkgs/widgetsnbextension/patches/no-notebook-dep.patch b/build/pkgs/widgetsnbextension/patches/no-notebook-dep.patch
@@ -0,0 +1,24 @@
+commit 55bc3c93bf4310d4f4d9d02f2e51d1d65b7f6533 (HEAD -> 7.6.3-sage)
+Author: Sylvain Corlay <scorlay@bloomberg.net>
+Date:   Mon Oct 21 01:33:23 2019 +0200
+
+    Drop notebook dependency from widgetsnbextension
+
+diff --git a/widgetsnbextension/setup.py b/widgetsnbextension/setup.py
+index 866d82eb..88746f95 100644
+--- a/setup.py
++++ b/setup.py
+@@ -219,13 +219,5 @@ if 'setuptools' in sys.modules:
+     from setuptools.command.develop import develop
+     setup_args['cmdclass']['develop'] = js_prerelease(develop, strict=True)
+
+-setuptools_args = {}
+-install_requires = setuptools_args['install_requires'] = [
+-    'notebook>=4.4.1',
+-]
+-
+-if 'setuptools' in sys.modules:
+-    setup_args.update(setuptools_args)
+-
+ if __name__ == '__main__':
+     setup(**setup_args)
diff --git a/configure.ac b/configure.ac
@@ -416,6 +416,14 @@ AS_IF([test "x$enable_download_from_upstream_url" = "xyes"], [
 ])
 AC_SUBST([SAGE_SPKG_OPTIONS])
 
+AC_ARG_ENABLE([notebook],
+  AS_HELP_STRING([--disable-notebook],
+                 [disable build of the Jupyter notebook and related packages]), [
+    for pkg in notebook nbconvert sagenb_export nbformat terminado send2trash prometheus_client mistune pandocfilters bleach defusedxml jsonschema jupyter_jsmol; do
+      AS_VAR_SET([SAGE_ENABLE_$pkg], [$enableval])
+    done
+  ])
+
 SAGE_SPKG_COLLECT()
 
 dnl AC_CONFIG_HEADERS([config.h])
diff --git a/m4/sage_spkg_collect.m4 b/m4/sage_spkg_collect.m4
@@ -20,13 +20,11 @@
 #        platform, or the dependency on them is satisfied by an existing
 #        system package.
 #
-#      - SAGE_STANDARD_PACKAGES - lists the names of all packages that have
-#        the "standard" type.  All "standard" packages are installed by
-#        default (if they are listed in SAGE_DUMMY_PACKAGES "installed" in
-#        this case is a no-op).
+#      - SAGE_OPTIONAL_INSTALLED_PACKAGES - lists the names of packages with the
+#        "standard", "optional", or "experimental" type that should be installed.
 #
-#      - SAGE_OPTIONAL_PACKAGES - lists the names of packages with the
-#        "optional" type that should be installed.
+#      - SAGE_OPTIONAL_UNINSTALLED_PACKAGES - lists the names of packages with the
+#        "standard", "optional", or "experimental" type that should be uninstalled.
 #
 #      - SAGE_SDIST_PACKAGES - lists the names of all packages whose sources
 #        need to be downloaded to be included in the source distribution.
@@ -107,20 +105,18 @@ SAGE_BUILT_PACKAGES=''
 # underlying system.
 SAGE_DUMMY_PACKAGES=''
 
-# Standard packages
-SAGE_STANDARD_PACKAGES=''
-
-# List of currently installed and to-be-installed optional packages - filled in SAGE_SPKG_ENABLE
-#SAGE_OPTIONAL_INSTALLED_PACKAGES
-# List of optional packages to be uninstalled - filled in SAGE_SPKG_ENABLE
-#SAGE_OPTIONAL_CLEANED_PACKAGES
+# List of currently installed and to-be-installed standard/optional/experimental packages
+SAGE_OPTIONAL_INSTALLED_PACKAGES=''
+# List of optional packages to be uninstalled
+SAGE_OPTIONAL_UNINSTALLED_PACKAGES=''
 
 # List of all packages that should be downloaded
 SAGE_SDIST_PACKAGES=''
 
-# Generate package version and dependency lists
+# Generate package version/dependency/tree lists
 SAGE_PACKAGE_VERSIONS=""
 SAGE_PACKAGE_DEPENDENCIES=""
+SAGE_PACKAGE_TREES=""
 # Lists of packages categorized according to their build rules
 SAGE_NORMAL_PACKAGES=''
 SAGE_PIP_PACKAGES=''
@@ -149,32 +145,50 @@ for DIR in $SAGE_ROOT/build/pkgs/*; do
 
     in_sdist=no
 
+    dnl Write out information about the installation tree, using the name of the tree prefix
+    dnl variable (SAGE_LOCAL or SAGE_VENV).  The makefile variable of SPKG is called "trees_SPKG",
+    dnl note plural, for possible future extension in which an SPKG would be installed into several
+    dnl trees.  For example, if we decide to create a separate tree for a venv with the
+    dnl Jupyter notebook, then packages such as jupyter_core would have to be installed into
+    dnl two trees.
+    SPKG_TREE_VAR=SAGE_LOCAL
+    if test -f "$DIR/requirements.txt" -o -f "$DIR/install-requires.txt"; then
+        dnl A Python package
+        SPKG_TREE_VAR=SAGE_VENV
+    fi
+    SAGE_PACKAGE_TREES="${SAGE_PACKAGE_TREES}$(printf '\ntrees_')${SPKG_NAME} = ${SPKG_TREE_VAR}"
+
     uninstall_message=""
     # Check consistency of 'DIR/type' file
     case "$SPKG_TYPE" in
     base)
         message="came preinstalled with the SageMath tarball"
         ;;
     standard)
-        SAGE_STANDARD_PACKAGES="${SAGE_STANDARD_PACKAGES} \\$(printf '\n    ')${SPKG_NAME}"
-        in_sdist=yes
-        message="will be installed as an SPKG"
+        AS_VAR_IF([SAGE_ENABLE_]${SPKG_NAME}, [yes], [
+            message="$SPKG_TYPE, will be installed as an SPKG"
+        ], [
+            message="$SPKG_TYPE, but disabled using configure option"
+        ])
         ;;
     optional|experimental)
         AS_VAR_IF([SAGE_ENABLE_]${SPKG_NAME}, [yes], [
             message="$SPKG_TYPE, will be installed as an SPKG"
         ], [
             message="$SPKG_TYPE, use \"$srcdir/configure --enable-$SPKG_NAME\" to install"
         ])
-        uninstall_message=", use \"$srcdir/configure --disable-$SPKG_NAME\" to uninstall"
         ;;
     *)
         AC_MSG_ERROR([The content of "$SPKG_TYPE_FILE" must be 'base', 'standard', 'optional', or 'experimental'])
         ;;
     esac
 
     case "$SPKG_TYPE" in
+    standard)
+        in_sdist=yes
+        ;;
     optional|experimental)
+        uninstall_message=", use \"$srcdir/configure --disable-$SPKG_NAME\" to uninstall"
         stampfile=""
         for f in "$SAGE_SPKG_INST/$SPKG_NAME"-*; do
             AS_IF([test -r "$f"], [
@@ -215,7 +229,7 @@ for DIR in $SAGE_ROOT/build/pkgs/*; do
             ],                               [ message="not required on your platform; SPKG will not be installed"
             ])
         ], [
-            dnl We won't use the system package.
+            dnl We will not use the system package.
             SAGE_BUILT_PACKAGES="${SAGE_BUILT_PACKAGES} \\$(printf '\n    ')${SPKG_NAME}"
             AS_VAR_SET_IF([sage_use_system], [
                 AS_VAR_COPY([reason], [sage_use_system])
@@ -225,9 +239,6 @@ for DIR in $SAGE_ROOT/build/pkgs/*; do
                                              ],
                 [installed],                 [ message="already installed as an SPKG$uninstall_message" ],
                                              [ message="$reason; $message" ])
-            ], [
-                # Package does not use spkg-configure.m4 yet
-                message="does not support check for system package; $message"
             ])
         ])
 
@@ -282,6 +293,22 @@ for DIR in $SAGE_ROOT/build/pkgs/*; do
         SAGE_SDIST_PACKAGES="${SAGE_SDIST_PACKAGES} \\$(printf '\n    ')${SPKG_NAME}"
     fi
 
+    # Determine whether package is enabled
+    AS_VAR_SET([is_installed], [no])
+    for f in "$SAGE_SPKG_INST/${SPKG_NAME}"-*; do
+        AS_IF([test -r "$f"],
+              [AS_VAR_SET([is_installed], [yes])])
+    done
+
+    AS_VAR_IF([SAGE_ENABLE_${SPKG_NAME}}], [if_installed],
+          [AS_VAR_SET([SAGE_ENABLE_${SPKG_NAME}], $is_installed)])
+    AS_VAR_COPY([want_spkg], [SAGE_ENABLE_${SPKG_NAME}])
+
+    spkg_line=" \\$(printf '\n    ')$SPKG_NAME"
+    AS_CASE([$is_installed-$want_spkg],
+            [*-yes],  [AS_VAR_APPEND(SAGE_OPTIONAL_INSTALLED_PACKAGES, "$spkg_line")],
+            [yes-no], [AS_VAR_APPEND(SAGE_OPTIONAL_UNINSTALLED_PACKAGES, "$spkg_line")])
+
     # Determine package dependencies
     #
     DEP_FILE="$DIR/dependencies"
@@ -320,14 +347,14 @@ done
 
 AC_SUBST([SAGE_PACKAGE_VERSIONS])
 AC_SUBST([SAGE_PACKAGE_DEPENDENCIES])
+AC_SUBST([SAGE_PACKAGE_TREES])
 AC_SUBST([SAGE_NORMAL_PACKAGES])
 AC_SUBST([SAGE_PIP_PACKAGES])
 AC_SUBST([SAGE_SCRIPT_PACKAGES])
 AC_SUBST([SAGE_BUILT_PACKAGES])
 AC_SUBST([SAGE_DUMMY_PACKAGES])
-AC_SUBST([SAGE_STANDARD_PACKAGES])
 AC_SUBST([SAGE_OPTIONAL_INSTALLED_PACKAGES])
-AC_SUBST([SAGE_OPTIONAL_CLEANED_PACKAGES])
+AC_SUBST([SAGE_OPTIONAL_UNINSTALLED_PACKAGES])
 AC_SUBST([SAGE_SDIST_PACKAGES])
 ])
 
diff --git a/m4/sage_spkg_enable.m4 b/m4/sage_spkg_enable.m4

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-$(PYTHON) \| $(PYTHON_TOOLCHAIN) notebook jupyter_core`
	`1`	`+$(PYTHON) \| $(PYTHON_TOOLCHAIN) jupyter_core`
`2`	`2`
`3`	`3`	`----------`
`4`	`4`	`All lines of this file are ignored except the first.`