Merge #31362

Author: Matthias Koeppe

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
 

build/make/Makefile.in

@@ -86,14 +86,27 @@ GCC_DEP = @SAGE_GCC_DEP@
 
 @SAGE_PACKAGE_DEPENDENCIES@
 
+# 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 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 = @SAGE_OPTIONAL_INSTALLED_PACKAGES@
+INSTALLED_PACKAGE_INSTS = \
+    $(foreach pkgname,$(INSTALLED_PACKAGES),$(inst_$(pkgname)))
 
 # All previously installed standard/optional/experimental packages that are to be uninstalled
 OPTIONAL_CLEANED_PACKAGES = @SAGE_OPTIONAL_CLEANED_PACKAGES@
-OPTIONAL_CLEANED_PACKAGES_CLEANS = $(OPTIONAL_CLEANED_PACKAGES:%=%-clean)
+CLEANED_PACKAGES = $(OPTIONAL_CLEANED_PACKAGES)
+CLEANED_PACKAGES_CLEANS = $(CLEANED_PACKAGES:%=%-clean)
 
 # All packages which should be downloaded
 SDIST_PACKAGES = @SAGE_SDIST_PACKAGES@
@@ -141,6 +154,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
@@ -206,8 +231,19 @@ base-toolchain: _clean-broken-gcc base
 # All targets except for the base packages
 all-sage: \
 		sagelib \
-		$(OPTIONAL_INSTALLED_PACKAGE_INSTS) \
-                $(OPTIONAL_CLEANED_PACKAGES_CLEANS)
+		$(INSTALLED_PACKAGE_INSTS) \
+                $(CLEANED_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_CLEANED_PACKAGES_CLEANS)
+
+all-build-venv: toolchain-deps
+	+$(MAKE_REC) all-sage-venv
+
+all-sage-venv:  $(SAGE_VENV_INSTALLED_PACKAGE_INSTS)  $(SAGE_VENV_CLEANED_PACKAGES_CLEANS)
 
 # Download all packages which should be inside an sdist tarball (the -B
 # option to make forces all targets to be built unconditionally)

build/pkgs/pynac/install-requires.txt

@@ -0,0 +1 @@
+sagemath-standard

build/pkgs/sagelib/install-requires.txt

@@ -0,0 +1 @@
+../../../../src/LICENSE.txt

build/pkgs/sagelib/src/LICENSE.txt

@@ -0,0 +1,28 @@
+=================================================================
+ Sage: Open Source Mathematics Software: Standard Python Library
+=================================================================
+
+About SageMath
+--------------
+
+   "Creating a Viable Open Source Alternative to
+    Magma, Maple, Mathematica, and MATLAB"
+
+   Copyright (C) 2005-2020 The Sage Development Team
+
+   https://www.sagemath.org
+
+SageMath fully supports all major Linux distributions, recent versions of macOS, and Windows (using Cygwin or Windows Subsystem for Linux).
+
+The traditional and recommended way to install SageMath is from source via Sage-the-distribution (https://www.sagemath.org/download-source.html).  Sage-the-distribution first builds a large number of open source packages from source (unless it finds suitable versions installed in the system) and then installs the Sage Library (sagelib, implemented in Python and Cython).
+
+
+About this experimental pip-installable source distribution
+-----------------------------------------------------------
+
+This pip-installable source distribution `sagemath-standard` is an experimental distribution of the Sage Library.  Use at your own risk.
+
+Building `sagemath-standard` has a large number of system packages as prerequisites. See https://doc.sagemath.org/html/en/installation/source.html#linux-recommended-installation
+for partial lists for various systems.
+
+A modularization effort is in progress with the goal of making it possible to install parts of the Sage Library with fewer prerequisites. https://trac.sagemath.org/ticket/29705

build/pkgs/sagelib/src/README.rst

@@ -0,0 +1 @@
+../package-version.txt

build/pkgs/sagelib/src/VERSION.txt

@@ -0,0 +1 @@
+../../../../src/setup.cfg

build/pkgs/sagelib/src/setup.cfg

@@ -6,7 +6,7 @@
 import sys
 import time
 from distutils import log
-from distutils.core import setup
+from setuptools import setup
 
 # Work around a Cython problem in Python 3.8.x on macOS
 # https://github.com/cython/cython/issues/3262
@@ -87,14 +87,8 @@
 ### Distutils
 #########################################################
 
-code = setup(name = 'sage',
-      version     =  SAGE_VERSION,
-      description = 'Sage: Open Source Mathematics Software',
-      license     = 'GNU Public License (GPL)',
-      author      = 'William Stein et al.',
-      author_email= 'https://groups.google.com/group/sage-support',
-      url         = 'https://www.sagemath.org',
-      packages    = python_packages,
+code = setup(
+      packages = python_packages,
       package_data = {
           'sage.libs.gap': ['sage.gaprc'],
           'sage.interfaces': ['sage-maxima.lisp'],

build/pkgs/sagelib/src/setup.py

@@ -113,9 +113,10 @@ SAGE_DUMMY_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=''
@@ -144,6 +145,19 @@ 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
@@ -310,6 +324,7 @@ 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])