Merge branch 'develop' of git://github.com/sagemath/sage into public/…

…mainfolds/pyright

.github/workflows/tox.yml

@@ -36,7 +36,7 @@ jobs:
       fail-fast: false
       max-parallel: 20
       matrix:
-        tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, centos-7, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-eoan-i386, debian-buster-i386, centos-7-i386]
+        tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, ubuntu-groovy, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, centos-7, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-focal-i386, debian-buster-i386, centos-7-i386]
         tox_packages_factor: [minimal, standard]
     env:
       TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}

.gitignore

@@ -101,6 +101,12 @@ gitlab-build-docker.log
 /src/bin/sage-env-config
 /build/bin/sage-build-env-config
 
+/build/pkgs/*/src/build
+/build/pkgs/*/src/dist
+/build/pkgs/*/src/MANIFEST
+/build/pkgs/*/src/*.egg-info
+/build/pkgs/*/src/.tox
+
 #######################
 # tox generated files #
 #######################

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.2.beta8, Release Date: 2020-08-10
+SageMath version 9.2.beta9, Release Date: 2020-08-18

build/bin/sage-guess-package-system

@@ -25,6 +25,8 @@ elif zypper --version > /dev/null 2>&1; then
     echo opensuse
 elif apk --version > /dev/null 2>&1; then
     echo alpine
+elif xbps-install --version > /dev/null 2>&1; then
+    echo void
 else
     case `uname -s` in
         CYGWIN*)

build/bin/sage-print-system-package-command

@@ -64,6 +64,10 @@ case $system:$command in
     arch*:install)
         [ -n "$system_packages" ] && echo "${PROMPT}${SUDO}pacman -S $system_packages"
         ;;
+
+    void*:install)
+        [ -n "$system_packages" ] && echo "${PROMPT}${SUDO}xbps-install $system_packages"
+        ;;
     *conda*:install)
         [ -n "$system_packages" ] && echo "${PROMPT}conda install $system_packages"
         ;;

build/bin/write-dockerfile.sh

@@ -91,6 +91,16 @@ EOF
         EXISTS="pacman -Si"
         INSTALL="pacman -Su --noconfirm"
         ;;
+    void*)
+	# https://hub.docker.com/r/voidlinux/masterdir-x86_64-musl
+	cat <<EOF
+ARG BASE_IMAGE=voidlinux:masterdir-x86_64-musl
+FROM \${BASE_IMAGE} as with-system-packages
+EOF
+        UPDATE="xbps-install -Su &&"
+        EXISTS="xbps-query"
+        INSTALL="xbps-install --yes"
+        ;;
     conda*)
         cat <<EOF
 ARG BASE_IMAGE=continuumio/miniconda3:latest

build/make/Makefile.in

@@ -41,6 +41,11 @@ PCFILES = @SAGE_SYSTEM_FACADE_PC_FILES@
 LN = ln
 SED = sed
 
+# In recursive invocations of make, remove "-jNUMJOBS" options that may
+# be in $(MAKE) when users follow the recommendations in our manuals.
+# We also get rid of excessive "Entering directory" messages.
+MAKE_REC = $(MAKE:-j%=) --no-print-directory
+
 # We need to be able to override this to support ./sage -i -c PKG
 SAGE_SPKG = sage-spkg
 
@@ -187,17 +192,17 @@ endif
 # the doc build takes the most time and should be started as soon as
 # possible.
 all-start: toolchain-deps
-	$(MAKE) doc all-sage
-	$(MAKE) '$(STARTED)'
+	+$(MAKE_REC) doc all-sage
+	+$(MAKE_REC) '$(STARTED)'
 
 # Build everything except the documentation
 all-build: toolchain-deps
-	$(MAKE) all-sage
+	+$(MAKE_REC) all-sage
 
 
 # The 2 preliminary build phases: base and toolchain.
 base-toolchain: _clean-broken-gcc base
-	$(MAKE) toolchain
+	+$(MAKE_REC) toolchain
 
 # All targets except for the base packages
 all-sage: \
@@ -209,7 +214,7 @@ all-sage: \
 # Download all packages which should be inside an sdist tarball (the -B
 # option to make forces all targets to be built unconditionally)
 download-for-sdist:
-	env SAGE_INSTALL_FETCH_ONLY=yes $(MAKE) -B SAGERUNTIME= \
+	+env SAGE_INSTALL_FETCH_ONLY=yes $(MAKE_REC) -B SAGERUNTIME= \
 		$(SDIST_PACKAGES)
 
 # TOOLCHAIN consists of dependencies determined by configure.
@@ -229,12 +234,13 @@ TOOLCHAIN_DEP_INSTS = \
 	$(foreach pkgname,$(TOOLCHAIN_DEPS),$(inst_$(pkgname)))
 
 toolchain-deps:
-	for target in $(TOOLCHAIN_DEP_INSTS); do \
-	    $(MAKE) $$target; \
+	+@for target in $(TOOLCHAIN_DEP_INSTS); do \
+	    echo $(MAKE_REC) $$target; \
+	    $(MAKE_REC) $$target; \
 	done
 
 all-toolchain: base-toolchain
-	$(MAKE) toolchain-deps
+	+$(MAKE_REC) toolchain-deps
 
 # All packages needed as a prerequisite to install other Python packages with
 # pip or which are otherwise used by the Python build tools; these should be
@@ -247,13 +253,13 @@ SAGERUNTIME = sagelib $(inst_ipython) $(inst_pexpect) \
 		$(inst_psutil)
 
 all-sageruntime: toolchain-deps
-	$(MAKE) $(SAGERUNTIME)
+	+$(MAKE_REC) $(SAGERUNTIME)
 
 
 # Start Sage at least once to check that it works
 # (i.e. when we just installed Sage for the first time).
 build-start: all-build
-	$(MAKE) '$(STARTED)'
+	+$(MAKE_REC) '$(STARTED)'
 
 # We make this depend on all standard packages because running
 # sage-starts runs sage-location, which should be run after installing
@@ -331,10 +337,10 @@ clean:
 	@echo "Deleting package build directories..."
 	rm -rf "$(SAGE_LOCAL)/var/tmp/sage/build"
 
-# c_lib .cython_version are from old sage versions
+# "c_lib", ".cython_version", "build" in $(SAGE_SRC) are from old sage versions
 sagelib-clean:
 	@echo "Deleting Sage library build artifacts..."
-	cd "$(SAGE_SRC)" && (rm -rf c_lib .cython_version; rm -rf build; find . -name '*.pyc' | xargs rm -f; rm -rf sage/ext/interpreters)
+	(cd "$(SAGE_SRC)" && rm -rf c_lib .cython_version; rm -rf build; find . -name '*.pyc' | xargs rm -f; rm -rf sage/ext/interpreters) && (cd "$(SAGE_ROOT)/build/pkgs/sagelib/src/" && rm -rf build)
 
 build-clean: clean doc-clean sagelib-clean
 
@@ -438,7 +444,7 @@ SAGE_CHECK_$(1) := $(SAGE_CHECK)
 $(1)-build-deps: $(3)
 
 $$(INST)/$(1)-$(2): $(3)
-	$(MAKE) $(1)-no-deps
+	+$(MAKE_REC) $(1)-no-deps
 
 $(1): $$(INST)/$(1)-$(2)
 
@@ -514,7 +520,7 @@ define PIP_PACKAGE_templ
 $(1)-build-deps: $(2)
 
 $(1): $(2)
-	$(MAKE) $(1)-no-deps
+	+$(MAKE_REC) $(1)-no-deps
 
 $(1)-no-deps:
 	$(AM_V_at)sage-logger -p 'sage --pip install -r "$$(SAGE_ROOT)/build/pkgs/$(1)/requirements.txt"' '$$(SAGE_LOGS)/$(1).log'
@@ -560,7 +566,7 @@ define SCRIPT_PACKAGE_templ
 $(1)-build-deps: $(3)
 
 $$(INST)/$(1)-$(2): $(3)
-	$(MAKE) $(1)-no-deps
+	+$(MAKE_REC) $(1)-no-deps
 
 $(1): $$(INST)/$(1)-$(2)
 

build/pkgs/attrs/SPKG.rst

@@ -0,0 +1,25 @@
+attrs
+=====
+
+Description
+-----------
+
+attrs is the Python package that will bring back the joy of writing classes
+by relieving you from the drudgery of implementing object protocols
+(aka dunder methods).
+
+License
+-------
+
+MIT License
+
+
+Upstream Contact
+----------------
+
+Home page: https://www.attrs.org
+
+Dependencies
+------------
+
+Python

build/pkgs/attrs/checksums.ini

@@ -0,0 +1,5 @@
+tarball=attrs-VERSION.tar.gz
+sha1=5cad208b39fe854745c35b75f667eaf6400e2720
+md5=5b2db50fcc31be34d32798183c9bd062
+cksum=2725988683
+upstream_url=https://pypi.io/packages/source/a/attrs/attrs-VERSION.tar.gz

build/pkgs/attrs/dependencies

@@ -0,0 +1,5 @@
+$(PYTHON) vcversioner | $(PYTHON_TOOLCHAIN)
+
+----------
+All lines of this file are ignored except the first.
+It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile.

build/pkgs/attrs/package-version.txt

@@ -0,0 +1 @@
+19.3.0

build/pkgs/attrs/spkg-install.in

@@ -0,0 +1,14 @@
+if [ -z "$SAGE_LOCAL" ]; then
+    echo >&2 "SAGE_LOCAL undefined ... exiting"
+    echo >&2 "Maybe run 'sage --sh'?"
+    exit 1
+fi
+
+cd src
+
+sdh_pip_install .
+
+if [ $? -ne 0 ]; then
+    echo "Error installing attrs ... exiting"
+    exit 1
+fi

build/pkgs/attrs/type

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

build/pkgs/bleach/checksums.ini

@@ -1,4 +1,5 @@
 tarball=bleach-VERSION.tar.gz
-sha1=b44b7705a1425338cf429d66f009aa15d09b768d
-md5=fc8df989e0200a45f7a3a95ef9ee9854
-cksum=2528269335
+sha1=3034291f3ec699d76aafefa00282007064a90312
+md5=63cae08551307156ec636465aff5183e
+cksum=3471185424
+upstream_url=https://pypi.io/packages/source/b/bleach/bleach-VERSION.tar.gz

build/pkgs/bleach/package-version.txt

@@ -1 +1 @@
-3.1.0
+3.1.5

build/pkgs/boost/distros/void.txt

@@ -0,0 +1 @@
+boost-devel

build/pkgs/bzip2/distros/void.txt

@@ -0,0 +1 @@
+bzip2-devel

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=3f0bae0f42cabe487db185d354ffce5401f41c0d
-md5=0f6b2ddc8280958cde5b5d089a2400e0
-cksum=1841781857
+sha1=9cc96f867a972260fba31ec0f94d93a83c8f0171
+md5=bb139207e7cfd88b73d0ac13e2888b5a
+cksum=1509944110

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-ab502c6901350ba3418d03f479c27128b14de479
+842a6866f12dc8ed96cc9f10f828c872dfb8e73a

build/pkgs/curl/distros/void.txt

@@ -0,0 +1,2 @@
+curl
+libcurl-devel

build/pkgs/e_antic/checksums.ini

@@ -1,5 +1,5 @@
 tarball=e-antic-VERSION.tar.gz
-sha1=e3f54ab708e34c65d5704a560caba3f89a065785
-md5=7af45afdb754bb87b11abf08cc876c26
-cksum=1677181853
+sha1=a210607c184831099619f2af7c0fcc373bf99d75
+md5=0ee15d22f49cd4235f14a5ec0bb1c848
+cksum=1752190215
 upstream_url=https://www.labri.fr/perso/vdelecro/e-antic/e-antic-VERSION.tar.gz

build/pkgs/e_antic/package-version.txt

@@ -1 +1 @@
-0.1.7
+0.1.8

build/pkgs/ecl/SPKG.rst

@@ -34,28 +34,9 @@ Upstream Contact
 
 -  the ECL mailing list - see http://ecls.sourceforge.net/resources.html
 
-Dependencies
-------------
-
--  mpir
--  boehm_gc
-
-
 Special Update/Build Instructions
 ---------------------------------
 
--  As autotools need to be run after most of the patches are applied,
-   we do all the patching in spkg-source.
-
--  Deleting the following directories saves space: without doing
-   this, the tarball can grow from under 3 megabytes to more than 7
-   megabytes. Deleting these files is done automatically by the
-   ``spkg-src`` script.
-
--  The directory msvc
--  The directory src/gc-unstable
--  The directory src/gmp
--  The directory src/libffi
 -  Note: for the time being, ECL is built single threaded library as it
    seems to interact badly with the pexpect interface and Sage's signal
    handling when built multithreaded.