Merge branch 't/29669/for_sage_9_2__remove_python_2_support_from_the_…

…build_system' into t/29757/_github_workflows_tox_gcc_spkg_yml__remove_python2
sagemath · May 29, 2020 · 378bf54 · 378bf54
2 parents 860e4dc + ff41817
commit 378bf54
Show file tree

Hide file tree

Showing 521 changed files with 9,371 additions and 9,430 deletions.
diff --git a/.github/workflows/ci-cygwin-standard-python2.yml b/.github/workflows/ci-cygwin-standard-python2.yml
diff --git a/.github/workflows/tox-optional.yml b/.github/workflows/tox-optional.yml
@@ -102,7 +102,7 @@ jobs:
       fail-fast: false
       max-parallel: 3
       matrix:
-        tox_system_factor: [homebrew-macos-python2, homebrew-macos, homebrew-macos-python3_xcode, homebrew-macos-python3_xcode-nokegonly, homebrew-macos-python3_pythonorg, conda-forge-macos]
+        tox_system_factor: [homebrew-macos, homebrew-macos-python3_xcode, homebrew-macos-python3_xcode-nokegonly, homebrew-macos-python3_pythonorg, conda-forge-macos]
         tox_packages_factor: [maximal]
     env:
       TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
@@ -37,7 +37,7 @@ jobs:
       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, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-eoan-i386, debian-buster-i386, centos-7-i386]
-        tox_packages_factor: [minimal, standard, standard-python2]
+        tox_packages_factor: [minimal, standard]
     env:
       TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
       LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
@@ -102,7 +102,7 @@ jobs:
       fail-fast: false
       max-parallel: 4
       matrix:
-        tox_system_factor: [homebrew-macos-python2, homebrew-macos, homebrew-macos-python3_xcode, homebrew-macos-python3_xcode-nokegonly, homebrew-macos-python3_pythonorg, homebrew-macos-python3_xcode-gcc_spkg, conda-forge-macos]
+        tox_system_factor: [homebrew-macos, homebrew-macos-python3_xcode, homebrew-macos-python3_xcode-nokegonly, homebrew-macos-python3_pythonorg, homebrew-macos-python3_xcode-gcc_spkg, conda-forge-macos]
         tox_packages_factor: [minimal, standard]
     env:
       TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
@@ -147,7 +147,7 @@ jobs:
       max-parallel: 1
       matrix:
         tox_system_factor: [conda-forge-ubuntu]
-        tox_packages_factor: [minimal, standard, standard-python2]
+        tox_packages_factor: [minimal, standard]
     env:
       TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
       LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}

diff --git a/Makefile b/Makefile
@@ -105,6 +105,7 @@ distclean: build-clean
 bootstrap-clean:
 	rm -rf config configure build/make/Makefile-auto.in
 	rm -f src/doc/en/installation/*.txt
+	rm -rf src/doc/en/reference/spkg/*.rst
 
 # Remove absolutely everything which isn't part of the git repo
 maintainer-clean: distclean bootstrap-clean

diff --git a/bootstrap b/bootstrap
@@ -160,7 +160,7 @@ save () {
     # Create configure tarball
     echo "Creating $NEWCONFBALL..."
     mkdir -p upstream
-    tar zcf "$NEWCONFBALL" configure config/* build/make/Makefile-auto.in src/doc/en/installation/*.txt
+    tar zcf "$NEWCONFBALL" configure config/* build/make/Makefile-auto.in src/doc/en/installation/*.txt src/doc/en/reference/spkg/*.rst
 
     # Update version
     echo "$NEWCONFVERSION" >$PKG/package-version.txt

diff --git a/build/bin/sage-spkg b/build/bin/sage-spkg
@@ -361,52 +361,7 @@ EOF
 fi
 
 if [ $INFO -ne 0 -a "$USE_LOCAL_SCRIPTS" = yes ]; then
-    cat "$PKG_SCRIPTS/SPKG.txt"
-    if [ -r "$PKG_SCRIPTS/type" ] ; then
-        echo
-        echo "== Type =="
-        echo
-        cat "$PKG_SCRIPTS/type"
-        echo
-    fi
-    echo "== Equivalent System Packages =="
-    echo
-    PKG_DISTROS="$PKG_SCRIPTS"/distros
-    for system_package_file in "$PKG_DISTROS"/*.txt; do
-        if [ -f "$system_package_file" ]; then
-            system=$(basename "$system_package_file" .txt)
-            system_packages="$(echo $(sed 's/#.*//;' $system_package_file))"
-            case $system in
-                debian)
-                    # Generic
-                    echo "Debian/Ubuntu:"
-                    ;;
-                fedora)
-                    # Generic
-                    echo "Fedora/Redhat/CentOS:"
-                    ;;
-                *)
-                    echo "$system:"
-                    ;;
-            esac
-            echo -n "  "
-            sage-print-system-package-command $system --prompt --sudo install $system_packages
-        fi
-    done
-    if [ -z "$system" ]; then
-        echo "(none known)"
-    else
-        echo
-        if [ -f "$PKG_SCRIPTS"/spkg-configure.m4 ]; then
-            echo "If the system package is installed, ./configure will check whether it can be used."
-        else
-            echo "However, these system packages will not be used for building Sage"
-            echo "because spkg-configure.m4 has not been written for this package;"
-            echo "see https://trac.sagemath.org/ticket/27330"
-        fi
-    fi
-    echo
-    exit 0
+    exec sage-spkg-info $PKG_BASE
 fi
 
 # If we haven't found the package yet, we must download it

diff --git a/build/bin/sage-spkg-info b/build/bin/sage-spkg-info
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+#
+#  sage-spkg-info SPKG
+#  Format information about a Sage package
+#
+#  Assumes SAGE_ROOT is set
+PKG_BASE=$1
+PKG_SCRIPTS="$SAGE_ROOT/build/pkgs/$PKG_BASE"
+for ext in rst txt; do
+    SPKG_FILE="$PKG_SCRIPTS/SPKG.$ext"
+    if [ -f "$SPKG_FILE" ]; then
+        cat "$SPKG_FILE"
+        break
+    fi
+done
+if [ -r "$PKG_SCRIPTS/type" ] ; then
+    echo
+    echo "== Type =="
+    echo
+    cat "$PKG_SCRIPTS/type"
+    echo
+fi
+echo "== Equivalent System Packages =="
+echo
+PKG_DISTROS="$PKG_SCRIPTS"/distros
+for system_package_file in "$PKG_DISTROS"/*.txt; do
+    if [ -f "$system_package_file" ]; then
+        system=$(basename "$system_package_file" .txt)
+        system_packages="$(echo $(sed 's/#.*//;' $system_package_file))"
+        case $system in
+            debian)
+                # Generic
+                echo "Debian/Ubuntu:"
+                ;;
+            fedora)
+                # Generic
+                echo "Fedora/Redhat/CentOS:"
+                ;;
+            *)
+                echo "$system:"
+                ;;
+        esac
+        echo -n "  "
+        sage-print-system-package-command $system --prompt --sudo install $system_packages
+    fi
+done
+if [ -z "$system" ]; then
+    echo "(none known)"
+else
+    echo
+    if [ -f "$PKG_SCRIPTS"/spkg-configure.m4 ]; then
+        echo "If the system package is installed, ./configure will check whether it can be used."
+    else
+        echo "However, these system packages will not be used for building Sage"
+        echo "because spkg-configure.m4 has not been written for this package;"
+        echo "see https://trac.sagemath.org/ticket/27330"
+    fi
+fi
+echo
diff --git a/build/pkgs/4ti2/SPKG.rst b/build/pkgs/4ti2/SPKG.rst
@@ -0,0 +1,24 @@
+4ti2
+====
+
+Description
+-----------
+
+A software package for algebraic, geometric and combinatorial problems
+on linear spaces. Available at www.4ti2.de.
+
+License
+-------
+
+4ti2 is released under a GPL v2 license.
+
+
+Upstream Contact
+----------------
+
+Raymond Hemmecke, TU Munich, Germany Matthias Köppe, UC Davis, CA, USA
+
+Dependencies
+------------
+
+GLPK, GMP.
diff --git a/build/pkgs/4ti2/SPKG.txt b/build/pkgs/4ti2/SPKG.txt
diff --git a/build/pkgs/alabaster/SPKG.rst b/build/pkgs/alabaster/SPKG.rst
@@ -0,0 +1,15 @@
+alabaster
+=========
+
+Description
+-----------
+
+Alabaster is a visually (c)lean, responsive, configurable theme for the
+Sphinx documentation system. It is Python 2+3 compatible.
+
+It began as a third-party theme, and is still maintained separately, but
+as of Sphinx 1.3, Alabaster is an install-time dependency of Sphinx and
+is selected as the default theme.
+
+Live examples of this theme can be seen on paramiko.org, fabfile.org and
+pyinvoke.org.
diff --git a/build/pkgs/alabaster/SPKG.txt b/build/pkgs/alabaster/SPKG.txt
diff --git a/build/pkgs/appnope/SPKG.rst b/build/pkgs/appnope/SPKG.rst
@@ -0,0 +1,7 @@
+appnope
+=======
+
+Description
+-----------
+
+Disable App Nap on OS X 10.9
diff --git a/build/pkgs/appnope/SPKG.txt b/build/pkgs/appnope/SPKG.txt
diff --git a/build/pkgs/arb/SPKG.txt → build/pkgs/arb/SPKG.rst b/build/pkgs/arb/SPKG.txt → build/pkgs/arb/SPKG.rst
@@ -1,6 +1,8 @@
-= arb =
+arb
+===
 
-== Description ==
+Description
+-----------
 
 Arb is a C library for arbitrary-precision floating-point ball
 arithmetic, developed by Fredrik Johansson
@@ -9,21 +11,24 @@ computation with polynomials, power series, matrices and special
 functions over the real and complex numbers, with automatic, rigorous
 error control.
 
-== License ==
+License
+-------
 
 GNU General Public License v2+
 
 
-== Upstream Contact ==
+Upstream Contact
+----------------
 
-* Fredrik Johansson:  fredrik.johansson@gmail.com
+-  Fredrik Johansson: fredrik.johansson@gmail.com
 
+Dependencies
+------------
 
-== Dependencies ==
+-  FLINT
+-  MPIR or GMP
+-  MPFR
 
-* FLINT
-* MPIR or GMP
-* MPFR
-
-== Special Update/Build Instructions ==
 
+Special Update/Build Instructions
+---------------------------------