Merge branch 'develop' into develop

Author: ForrestHilton

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -3,33 +3,11 @@ description: Report a bug
 title: "<title>"
 labels: "t: bug"
 body:
-  - type: checkboxes
-    attributes:
-      label: Is there an existing issue for this?
-      description: Please search to see if an issue already exists for the bug you encountered.
-      options:
-      - label: I have searched the existing issues for a bug report that matches the one I want to file, without success.
-        required: true
-  - type: checkboxes
-    attributes:
-      label: Did you read the documentation and troubleshoot guide?
-      description: Please read [README.md](https://github.com/sagemath/sage/blob/develop/README.md) and [the Troubleshooting section in the Installation Guide](https://doc.sagemath.org/html/en/installation/troubles.html).
-      options:
-      - label: I have read the documentation and troubleshoot guide
-        required: true
-  - type: textarea
+  - type: markdown
     attributes:
-      label: Environment
-      description: |
-        examples:
-          - **OS**: Ubuntu 20.04
-          - Sage Version: 9.2
       value: |
-          - **OS**:
-          - **Sage Version**: 
-      render: markdown
-    validations:
-      required: true
+        * Please search to see if an issue already exists for the bug you encountered.
+        * Please read [README.md](https://github.com/sagemath/sage/blob/develop/README.md) and [the Troubleshooting section in the Installation Guide](https://doc.sagemath.org/html/en/installation/troubles.html).
   - type: textarea
     attributes:
       label: Steps To Reproduce
@@ -60,3 +38,24 @@ body:
         Links? References? Anything that will give us more context about the issue you are encountering!
     validations:
       required: false
+  - type: textarea
+    attributes:
+      label: Environment
+      description: |
+        examples:
+          - **OS**: Ubuntu 20.04
+          - Sage Version: 9.2
+      value: |
+          - **OS**:
+          - **Sage Version**:
+      render: markdown
+    validations:
+      required: true
+  - type: checkboxes
+    attributes:
+      label: Checklist
+      options:
+      - label: I have searched the existing issues for a bug report that matches the one I want to file, without success.
+        required: true
+      - label: I have read the documentation and troubleshoot guide
+        required: true

.github/ISSUE_TEMPLATE/failure_building_from_source.yml

@@ -4,20 +4,11 @@ title: "<title>"
 labels: ['c: build', 't: bug']
 assignees: []
 body:
-  - type: checkboxes
+  - type: markdown
     attributes:
-      label: Is there an existing issue for this?
-      description: Please search to see if an issue already exists for the bug you encountered.
-      options:
-      - label: I have searched the existing issues for a bug report that matches the one I want to file, without success.
-        required: true
-  - type: checkboxes
-    attributes:
-      label: Did you read the documentation and troubleshoot guide?
-      description: Please read [README.md](https://github.com/sagemath/sage/blob/develop/README.md) and [the Troubleshooting sectionin the Installation Guide](https://doc.sagemath.org/html/en/installation/troubles.html).
-      options:
-      - label: I have read the documentation and troubleshoot guide
-        required: true
+      value: |
+        * Please search to see if an issue already exists for the bug you encountered.
+        * Please read [README.md](https://github.com/sagemath/sage/blob/develop/README.md) and [the Troubleshooting section in the Installation Guide](https://doc.sagemath.org/html/en/installation/troubles.html).
   - type: textarea
     attributes:
       label: Environment
@@ -65,3 +56,11 @@ body:
         Links? References? Anything that will give us more context about the issue you are encountering!
     validations:
       required: false
+  - type: checkboxes
+    attributes:
+      label: Checklist
+      options:
+      - label: I have searched the existing issues for a bug report that matches the one I want to file, without success.
+        required: true
+      - label: I have read the documentation and troubleshoot guide
+        required: true

.github/ISSUE_TEMPLATE/feature_report.yml

@@ -3,13 +3,10 @@ description: Suggest an idea
 title: "<title>"
 labels: "t: enhancement"
 body:
-  - type: checkboxes
+  - type: markdown
     attributes:
-      label: Is there an existing issue for this?
-      description: Please search to see if an issue already exists for the bug you encountered.
-      options:
-      - label: I have searched the existing issues for a bug report that matches the one I want to file, without success.
-        required: true
+      value: |
+        * Please search to see if an issue already exists for the bug you encountered.
   - type: textarea
     attributes:
       label: Problem Description
@@ -34,3 +31,9 @@ body:
       description: Add any other context about the problem here.
     validations:
       required: false
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      options:
+      - label: I have searched the existing issues for a bug report that matches the one I want to file, without success.
+        required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,17 +1,20 @@
-<!-- Please provide a concise, informative and self-explanatory title. -->
-<!-- Don't put issue numbers in the title. Put it in the Description below. -->
-<!-- For example, instead of "Fixes #12345", use "Add a new method to multiply two integers" -->
-
-### :books: Description
+<!-- ^^^^^
+Please provide a concise, informative and self-explanatory title.
+Don't put issue numbers in there, do this in the PR body below.
+For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1"
+-->
+<!-- Describe your changes here in detail -->
 
-<!-- Describe your changes here in detail. -->
 <!-- Why is this change required? What problem does it solve? -->
 <!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". -->
 <!-- If your change requires a documentation PR, please link it appropriately. -->
 
 ### :memo: Checklist
 
-<!-- Put an `x` in all the boxes that apply. It should be `[x]` not `[x ]`. -->
+<!-- Put an `x` in all the boxes that apply. -->
+<!-- If your change requires a documentation PR, please link it appropriately -->
+<!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
+<!-- Feel free to remove irrelevant items. -->
 
 - [ ] The title is concise, informative, and self-explanatory.
 - [ ] The description explains in detail what this PR is about.

.github/workflows/build.yml

@@ -60,11 +60,13 @@ jobs:
           # (This keeps mtimes of unchanged files unchanged and mtimes of changed files newer than unchanged files.)
           # Finally we reset the index to "old". (This keeps all mtimes unchanged.)
           # The changed files now show up as uncommitted changes.
+          # The final "git add -N" makes sure that files that were added in "new" do not show
+          # as untracked files, which would be removed by "git clean -fx".
           git worktree add --detach worktree-image
           rm -rf /sage/.git && mv worktree-image/.git /sage/
           rm -rf worktree-image && ln -s /sage worktree-image
           if [ ! -f worktree-image/.gitignore ]; then cp .gitignore worktree-image/; fi
-          (cd worktree-image && git add -A && git commit --allow-empty -m "old" -a && git tag -f old && git reset --hard new && git reset old)
+          (cd worktree-image && git add -A && git commit --quiet --allow-empty -m "old" -a && git tag -f old && git reset --hard new && git reset --quiet old && git add -N . && git status)
 
       - name: Incremental build, test changed files (sage -t --new)
         id: incremental

.github/workflows/doc-build.yml

@@ -44,11 +44,13 @@ jobs:
           # (This keeps mtimes of unchanged files unchanged and mtimes of changed files newer than unchanged files.)
           # Finally we reset the index to "old". (This keeps all mtimes unchanged.)
           # The changed files now show up as uncommitted changes.
+          # The final "git add -N" makes sure that files that were added in "new" do not show
+          # as untracked files, which would be removed by "git clean -fx".
           git worktree add --detach worktree-image
           rm -rf /sage/.git && mv worktree-image/.git /sage/
           rm -rf worktree-image && ln -s /sage worktree-image
           if [ ! -f worktree-image/.gitignore ]; then cp .gitignore worktree-image/; fi
-          (cd worktree-image && git add -A && git commit --allow-empty -m "old" -a && git tag -f old && git reset --hard new && git reset old)
+          (cd worktree-image && git add -A && git commit --quiet --allow-empty -m "old" -a && git tag -f old && git reset --hard new && git reset --quiet old && git add -N . && git status)
           # Keep track of changes to built HTML
           new_version=$(cat src/VERSION.txt); (cd /sage/local/share/doc/sage/html/en && find . -name "*.html" | xargs sed -i '/class="sidebar-brand-text"/s/Sage [0-9a-z.]* /Sage '$new_version' /'; git init && (echo "*.svg binary"; echo "*.pdf binary") >> .gitattributes && (echo ".buildinfo"; echo '*.inv'; echo '.git*'; echo '*.svg'; echo '*.pdf'; echo '*.png'; echo 'searchindex.js') > .gitignore; git add -A && git commit --quiet -m "old")
 

.gitignore

@@ -22,6 +22,7 @@
 /confdefs.h
 
 /m4/sage_spkg_configures.m4
+/m4/sage_spkg_versions*.m4
 
 # no longer generated, but may still be in user worktrees
 /src/lib/pkgconfig

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.beta5
+version: 10.1.beta6
 doi: 10.5281/zenodo.593563
-date-released: 2023-07-01
+date-released: 2023-07-09
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

VERSION.txt

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

bootstrap

@@ -35,10 +35,16 @@ CONFVERSION=$(cat $PKG/package-version.txt)
 
 
 bootstrap () {
-    if [ "${BOOTSTRAP_QUIET}" = "no" ]; then
-        echo "bootstrap:$LINENO: installing 'm4/sage_spkg_configures.m4'"
-    fi
-    rm -f m4/sage_spkg_configures.m4
+    for a in m4/sage_spkg_configures.m4 m4/sage_spkg_versions.m4 m4/sage_spkg_versions_toml.m4; do
+        if [ "${BOOTSTRAP_QUIET}" = "no" ]; then
+            echo "bootstrap:$LINENO: installing '"$a"'"
+        fi
+        rm -f $a
+        echo "# Generated by SAGE_ROOT/bootstrap; do not edit" > $a
+    done
+    for a in m4/sage_spkg_versions.m4 m4/sage_spkg_versions_toml.m4; do
+        echo 'changequote(`>>>'"'"', `<<<'"')dnl" >> $a
+    done
     spkg_configures=""
     # initialize SAGE_ENABLE... options for standard packages
     for pkgname in $(sage-package list :standard: | sort); do
@@ -92,12 +98,17 @@ SAGE_SPKG_CONFIGURE_$(echo ${pkgname} | tr '[a-z]' '[A-Z]')"
             if test -f "$DIR/requirements.txt" -o -f "$DIR/install-requires.txt"; then
                 # A Python package
                 SPKG_TREE_VAR=SAGE_VENV
+                echo "define(>>>SPKG_INSTALL_REQUIRES_${pkgname}<<<, >>>$(echo $(sage-get-system-packages install-requires ${pkgname}))<<<)dnl" >> m4/sage_spkg_versions.m4
+                echo "define(>>>SPKG_INSTALL_REQUIRES_${pkgname}<<<, >>>$(echo $(sage-get-system-packages install-requires-toml ${pkgname}))<<<)dnl" >> m4/sage_spkg_versions_toml.m4
             fi
         fi
         spkg_configures="$spkg_configures
 SAGE_SPKG_FINALIZE([$pkgname], [$pkgtype], [$SPKG_SOURCE], [$SPKG_TREE_VAR])"
     done
     echo "$spkg_configures" >> m4/sage_spkg_configures.m4
+    for a in m4/sage_spkg_versions.m4 m4/sage_spkg_versions_toml.m4; do
+        echo 'changequote(>>>`<<<, >>>'"'"'<<<)dnl' >> $a
+    done
 
     for pkgname in $(sage-package list --has-file bootstrap); do
         (cd build/pkgs/$pkgname && ./bootstrap) || exit 1