Merge branch 'develop' into delta_classification

Author: xuluze

.github/workflows/ci-conda.yml

@@ -34,7 +34,9 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest]
         python: ['3.9', '3.10', '3.11']
-        conda-env: [environment, environment-optional]
+        # Optional environment is disabled for now as its not yet working
+        # environment: [environment, environment-optional]
+        conda-env: [environment]
 
     steps:
       - uses: actions/checkout@v3
@@ -100,19 +102,20 @@ jobs:
           SAGE_NUM_THREADS: 2
 
       - name: Verify dependencies
-        if: always()
+        if: success() || failure()
         shell: bash -l {0}
         run: pip check
 
       - name: Test
+        if: success() || failure()
         shell: bash -l {0}
         run: ./sage -t --all -p0
 
       - name: Print logs
+        if: always()
         run: |
           for file in $(find . -type f -name "*.log"); do
               echo "::group::$file"
               cat "$file"
               echo "::endgroup::"
           done
-        if: always()

.vscode/settings.json

@@ -27,7 +27,7 @@
     "python.linting.enabled": true,
     // The following pycodestyle arguments are the same as the pycodestyle-minimal
     // tox environnment, see the file SAGE_ROOT/src/tox.ini
-    "python.linting.pycodestyleArgs": ["--select= E111,E21,E222,E227,E251,E271,E303,E306,E401,E502,E701,E702,E703,E71,E72,W291,W293,W391,W605"],
+    "python.linting.pycodestyleArgs": ["--select= E111,E21,E222,E227,E25,E271,E303,E306,E401,E502,E701,E702,E703,E71,E72,W291,W293,W391,W605"],
     "cSpell.words": [
         "furo",
         "Conda",

CITATION.cff

@@ -4,8 +4,8 @@ title: SageMath
 abstract: SageMath is a free open-source mathematics software system.
 authors:
 - name: "The SageMath Developers"
-version: 10.1.beta6
+version: 10.1.beta7
 doi: 10.5281/zenodo.593563
-date-released: 2023-07-09
+date-released: 2023-07-20
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

VERSION.txt

@@ -1 +1 @@
-SageMath version 10.1.beta6, Release Date: 2023-07-09
+SageMath version 10.1.beta7, Release Date: 2023-07-20

bootstrap

@@ -110,10 +110,14 @@ SAGE_SPKG_FINALIZE([$pkgname], [$pkgtype], [$SPKG_SOURCE], [$SPKG_TREE_VAR])"
         echo 'changequote(>>>`<<<, >>>'"'"'<<<)dnl' >> $a
     done
 
-    for pkgname in $(sage-package list --has-file bootstrap); do
-        (cd build/pkgs/$pkgname && ./bootstrap) || exit 1
+    for pkgname in $(sage-package list --has-file bootstrap "$@"); do
+        (cd build/pkgs/$pkgname && if [ -x bootstrap ]; then ./bootstrap; else echo >&2 "bootstrap:$LINENO: Nothing to do for $pkgname"; fi) || exit 1
     done
 
+    if [ $# != 0 ]; then
+        return
+    fi
+
     # Default to no filter if "-q" was not passed.
     QUIET_SED_FILTER=""
     if [ "${BOOTSTRAP_QUIET}" = "yes" ]; then
@@ -126,7 +130,6 @@ SAGE_SPKG_FINALIZE([$pkgname], [$pkgtype], [$SPKG_SOURCE], [$SPKG_TREE_VAR])"
     # stdout alone. Basically we swap the two descriptors using a
     # third, filter, and then swap them back.
     ./bootstrap-conda && \
-    src/doc/bootstrap && \
     aclocal -I m4 && \
     automake --add-missing --copy build/make/Makefile-auto 3>&1 1>&2 2>&3 \
         | sed "${QUIET_SED_FILTER}" 3>&1 1>&2 2>&3 && \
@@ -236,7 +239,7 @@ save () {
 
 
 usage () {
-    echo >&2 "Usage: $0 [-d|-D|-s] [-u <URL>] [-h] [-q]"
+    echo >&2 "Usage: $0 [-d|-D|-s] [-u <URL>] [-h] [-q] [SPKG...]"
     echo >&2 ""
     echo >&2 "Options:"
     echo >&2 "  -d         fall back to downloading (released versions only)"
@@ -269,6 +272,7 @@ do
          ?) usage; exit 2;;
      esac
 done
+shift $(($OPTIND - 1))
 export BOOTSTRAP_QUIET
 CONFBALL="upstream/configure-$CONFVERSION.tar.gz"
 
@@ -278,14 +282,22 @@ if [ $DOWNLOAD$SAVE = yesyes ]; then
     exit 2
 fi
 
-# Start cleanly (it's not a problem if this fails)
+if [ $# != 0 -a $DOWNLOAD$ALWAYSDOWNLOAD$SAVE != nonono ]; then
+    echo >&2 "$0: Cannot combine -d, -D, -s, -u with SPKG arguments"
+    usage
+    exit 2
+fi
+
+# Start cleanly when a full bootstrap is happening (it's not a problem if this fails)
 # POSIX supports two separate incompatible formats for the MAKEFLAGS
 # variable, so instead of guessing, we simply define our own variable
 # to optionally pass an "-s" (silent) flag to Make.
-MAKE_SILENT=""
-[ "${BOOTSTRAP_QUIET}" = "yes" ] && MAKE_SILENT="-s"
-$MAKE ${MAKE_SILENT} bootstrap-clean 2>/dev/null
-mkdir config 2>/dev/null
+if [ $# = 0 ]; then
+    MAKE_SILENT=""
+    [ "${BOOTSTRAP_QUIET}" = "yes" ] && MAKE_SILENT="-s"
+    $MAKE ${MAKE_SILENT} bootstrap-clean 2>/dev/null
+fi
+mkdir -p config 2>/dev/null
 
 if [ $ALWAYSDOWNLOAD = yes ]; then
     if [ -n "$CONFTARBALL_URL" ]; then
@@ -302,7 +314,7 @@ if [ $ALWAYSDOWNLOAD = yes ]; then
         bootstrap_download || exit $?
     fi
 else
-    bootstrap
+    bootstrap "$@"
 fi
 
 if [ $SAVE = yes ]; then

build/pkgs/barvinok/SPKG.rst

@@ -1,4 +1,5 @@
-tarball=barvinok-VERSION.tar.bz2
-sha1=31c50d4b2a4cebe049072fd54c6e41ccece5ec1d
-md5=60082222a73b2d4fd430da7b770a4072
-cksum=355377045
+tarball=barvinok-VERSION.tar.xz
+sha1=1e17e72732f7e96017d9ae0c3394c3c77c185f2e
+md5=57066c5aa5628b89345c16ed95f93d7e
+cksum=2863920036
+upstream_url=https://sourceforge.net/projects/barvinok/files/barvinok-VERSION.tar.xz

build/pkgs/barvinok/checksums.ini

@@ -0,0 +1 @@
+math/barvinok

build/pkgs/barvinok/distros/freebsd.txt

@@ -1 +1 @@
-0.41.1
+0.41.7

build/pkgs/barvinok/package-version.txt

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=354d134d4bcdedba55ed2bcb1eac6ea33146ca15
-md5=2143a40fdce9ed5cb8b29a6232be4789
-cksum=304076036
+sha1=017780512407f8da87a091c485cf8c7162b5adaf
+md5=4e3e25464ee850c2593f16364bd6b206
+cksum=531215747