Merge branch 'develop' into t/22349/public/graphs/22349_deprecate_sorting_vertices_and_edges

Author: jhpalmieri

.github/workflows/build.yml

@@ -4,6 +4,15 @@ on:
   push:
   workflow_dispatch:
     # Allow to run manually
+    inputs:
+      platform:
+        description: 'Platform'
+        required: true
+        default: 'ubuntu-focal-standard'
+      docker_tag:
+        description: 'Docker tag'
+        required: true
+        default: 'dev'
 
 concurrency:
   # Cancel previous runs of this workflow for the same branch
@@ -13,7 +22,7 @@ concurrency:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: ghcr.io/sagemath/sage/sage-docker-ubuntu-focal-standard-with-targets:dev
+    container: ghcr.io/sagemath/sage/sage-docker-${{ github.event.inputs.platform || 'ubuntu-focal-standard' }}-with-targets:${{ github.event.inputs.docker_tag || 'dev'}}
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -30,10 +39,16 @@ jobs:
       - name: Prepare
         run: |
           # Install test tools.
-          # Installation of python3-venv can be removed as soon as a
-          # base image with a release including #33822 is available
-          apt-get update
-          apt-get install -y git python3-venv
+          if apt-get update && apt-get install -y git python3-venv; then
+             # Debian-specific temporary code:
+             # Installation of python3-venv can be removed as soon as a
+             # base image with a release including #33822 is available
+             :
+          else
+             export PATH="build/bin:$PATH"
+             eval $(sage-print-system-package-command auto update)
+             eval $(sage-print-system-package-command auto --spkg --yes --no-install-recommends install git)
+          fi
           # Reuse built SAGE_LOCAL contained in the Docker image 
           ./bootstrap
           ./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv --enable-editable --enable-download-from-upstream-url

.github/workflows/lint.yml

@@ -36,3 +36,19 @@ jobs:
       run: pip install tox relint
     - name: Lint using relint
       run: tox -e relint src/sage/
+  lint-rst:
+    name: Validate docstring markup as RST
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+    - name: Install tox
+      run: pip install tox
+    - name: Lint using tox -e rst
+      run: tox -e rst
+      # Until all errors are fixed:
+      continue-on-error: true

.zenodo.json

@@ -1,10 +1,10 @@
 {
     "description": "Mirror of the Sage https://sagemath.org/ source tree", 
     "license": "other-open", 
-    "title": "sagemath/sage: 9.7.beta5", 
-    "version": "9.7.beta5", 
+    "title": "sagemath/sage: 9.7.beta6", 
+    "version": "9.7.beta6", 
     "upload_type": "software", 
-    "publication_date": "2022-07-10", 
+    "publication_date": "2022-07-24", 
     "creators": [
         {
             "affiliation": "SageMath.org", 
@@ -15,7 +15,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/sagemath/sage/tree/9.7.beta5", 
+            "identifier": "https://github.com/sagemath/sage/tree/9.7.beta6", 
             "relation": "isSupplementTo"
         }, 
         {

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.7.beta5, Release Date: 2022-07-10
+SageMath version 9.7.beta6, Release Date: 2022-07-24

bootstrap-conda

@@ -45,7 +45,7 @@ for PKG_BASE in $(sage-package list --has-file distros/conda.txt); do
         fi
     fi
 done
-echo >&2 $0:$LINENO: generate conda enviroment files
+echo >&2 $0:$LINENO: generate conda environment files
 echo "name: sage-build" >  environment.yml
 echo "channels:"        >> environment.yml
 echo "  - conda-forge"  >> environment.yml

build/bin/sage-logger

@@ -79,7 +79,7 @@ if [ -n "$SAGE_SILENT_BUILD" -a ${use_prefix} = true ]; then
     status=$?
     if [[ $status != 0 ]]; then
         echo "  [$logname] error installing, exit status $status. End of log file:"
-        tail -n 40 "$logfile" | sed "/Please email sage-devel/,$ d;s;^;  [$logname]   ;" >&2
+        tail -n 72 "$logfile" | sed "/Please email sage-devel/,$ d;s;^;  [$logname]   ;" >&2
         echo "  [$logname] Full log file: $logfile"
     else
         echo "  [$logname] successfully installed."

build/bin/sage-sdist

@@ -25,11 +25,11 @@ if [ $# -gt 1 ]; then
 fi
 
 if [ -z "$SAGE_ROOT" ]; then
-    die "must be run from within a Sage enviroment, or with SAGE_ROOT provided"
+    die "must be run from within a Sage environment, or with SAGE_ROOT provided"
 fi
 
 if [ -z "$SAGE_SRC" ]; then
-    die "must be run from within a Sage enviroment, or with SAGE_SRC provided"
+    die "must be run from within a Sage environment, or with SAGE_SRC provided"
 fi
 
 if [ "$#" -gt 0 ]; then

build/make/Makefile.in

@@ -625,17 +625,19 @@ $(1)-$(4)-no-deps:
 		SAGE_INST_LOCAL=$$($(4)) \
 		sage-logger -p '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install' '$$(SAGE_LOGS)/$(1)-$(2).log' && \
 	    touch "$$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2)"; \
-	else \
+	else ( \
 	    echo; \
-	    echo "Error: $(1) is a dummy script package that the Sage distribution uses"; \
+	    echo "Note: $(1) is a dummy script package that the Sage distribution uses"; \
 	    echo "to provide information about equivalent system packages."; \
 	    echo "It cannot be installed using the Sage distribution."; \
 	    echo "Please install it manually, for example using the system packages"; \
 	    echo "recommended at the end of a run of './configure'"; \
 	    echo "See below for package-specific information."; \
 	    echo; \
 	    $$(SAGE_ROOT)/build/bin/sage-spkg-info $(1); \
-	    exit 1; \
+	    echo; \
+	    echo "Error: $(1) is a dummy script package and "; \
+	    echo "cannot be installed using the Sage distribution." ) | sage-logger -p 'cat; exit 1' '$$(SAGE_LOGS)/$(1)-$(2).log'; \
 	fi
 
 $(1)-no-deps: $(1)-$(4)-no-deps

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=b5a2cfbb85e9d1afd3c151429525944f1e0ca84f
-md5=8cf9a8e717fe11a7c6fb7aa41975a7a1
-cksum=2226307451
+sha1=7df04dc0c2e0d7cdfd767dfb86dd3a60d3af1767
+md5=f8e92133f5447c39196fc45a026ed49d
+cksum=1963708627

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-413ff13c54c4738b14d64eb7e7e6b2d06439d12c
+e3ababd22689e7cc6e89a01b1e8bd6d770e7b1cf