Merge tag '9.7.beta1' into t/33739/public/build/conda_gitpod

SageMath version 9.7.beta1, Release Date: 2022-05-26
sagemath · May 27, 2022 · 5748c21 · 5748c21
2 parents 2b9ef5a + 5fb2a6e
commit 5748c21
Show file tree

Hide file tree

Showing 464 changed files with 9,618 additions and 5,871 deletions.
diff --git a/.github/workflows/ci-cygwin-minimal.yml b/.github/workflows/ci-cygwin-minimal.yml
@@ -48,7 +48,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -108,7 +108,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -180,7 +180,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -250,7 +250,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -318,7 +318,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -386,7 +386,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -454,7 +454,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -526,7 +526,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -598,7 +598,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -670,7 +670,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -740,7 +740,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -808,7 +808,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -876,7 +876,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -944,7 +944,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -1012,7 +1012,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash

diff --git a/.github/workflows/ci-cygwin-standard.yml b/.github/workflows/ci-cygwin-standard.yml
@@ -48,7 +48,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -108,7 +108,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -180,7 +180,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -250,7 +250,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -318,7 +318,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -386,7 +386,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -454,7 +454,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -526,7 +526,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -598,7 +598,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -670,7 +670,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -740,7 +740,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -808,7 +808,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -876,7 +876,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -944,7 +944,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash
@@ -1012,7 +1012,7 @@ jobs:
     - name: tox
       run: |
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cat /proc/cpuinfo'
-        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+        C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.9 -m pip install tox'
         C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && PREFIX="${{ env.SAGE_LOCAL }}" tox -e local-cygwin-choco-${{ matrix.pkgs }} -- $TARGETS'
     - name: Prepare logs artifact
       shell: bash

diff --git a/.lgtm.yml b/.lgtm.yml
@@ -6,6 +6,7 @@ queries:
 path_classifiers:
   imports_only:
     - "**/all.py"
+    - "**/all_*.py"
     - "**/*catalog*.py"
     - "**/species/library.py"
     - "**/categories/basic.py"

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,6 +1,17 @@
 {
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": "Sage: Pytest",
+            "type": "python",
+            "request": "launch",
+            "module": "pytest",
+            "args": [
+                "${file}"
+            ],
+            "console": "integratedTerminal",
+            "justMyCode": false
+        },
         {
             "name": "Python: Current File",
             "type": "python",
@@ -22,4 +33,4 @@
             "justMyCode": false
         }
     ],
-}
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -16,7 +16,9 @@
     },
     "python.testing.pytestEnabled": true,
     "python.testing.pytestArgs": [
-        "src"
+        "--rootdir=src/sage",
+        "-c=src/tox.ini",
+        "--doctest-modules",
     ],
     "python.testing.unittestEnabled": false,
     "python.linting.pycodestyleEnabled": true,

diff --git a/.zenodo.json b/.zenodo.json
@@ -1,10 +1,10 @@
 {
     "description": "Mirror of the Sage https://sagemath.org/ source tree", 
     "license": "other-open", 
-    "title": "sagemath/sage: 9.6", 
-    "version": "9.6", 
+    "title": "sagemath/sage: 9.7.beta1", 
+    "version": "9.7.beta1", 
     "upload_type": "software", 
-    "publication_date": "2022-05-15", 
+    "publication_date": "2022-05-26", 
     "creators": [
         {
             "affiliation": "SageMath.org", 
@@ -15,7 +15,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/sagemath/sage/tree/9.6", 
+            "identifier": "https://github.com/sagemath/sage/tree/9.7.beta1", 
             "relation": "isSupplementTo"
         }, 
         {

diff --git a/Makefile b/Makefile
@@ -197,7 +197,7 @@ micro_release:
 	@echo "Removing unnecessary files & directories - make will not be functional afterwards anymore"
 	@# We keep src/sage for some doctests that it expect it to be there and
 	@# also because it does not add any weight with rdfind below.
-	@# We need src/sage/bin/ for the scripts that invoke Sage
+	@# We need src/bin/ for the scripts that invoke Sage
 	@# We need sage, the script to start Sage
 	@# We need local/, the dependencies and the built Sage library itself.
 	@# We keep VERSION.txt.

diff --git a/README.md b/README.md
@@ -413,15 +413,18 @@ in the Installation Guide.
     get a list by typing  `./sage --optional` or by visiting the
     [packages documentation page](https://doc.sagemath.org/html/en/reference/spkg/).
 
-18. Optional: Create a symlink to the `sage` executable somewhere in your
-    `PATH`, so you can start Sage by typing `sage` from anywhere rather
-    than having to either type the full path or navigate to the Sage
+18. Optional: Create a symlink to the installed `sage` script in a
+    directory in your `PATH`, for example ``/usr/local``. This will
+    allow you to start Sage by typing `sage` from anywhere rather than
+    having to either type the full path or navigate to the Sage
     directory and type `./sage`. This can be done by running:
 
-        $ ln -s $HOME/sage/sage-x.y/sage /usr/local/bin
+        $ sudo ln -s $(./sage -sh -c 'ls $SAGE_ROOT/venv/bin/sage') /usr/local/bin
 
-    The `$HOME/sage/sage-x.y/` part may need adapting. One way to decide
-    how to adapt it is to run `print(SAGE_ROOT)` in a Sage session.
+19. Optional: Set up SageMath as a Jupyter kernel in an existing Jupyter notebook
+    or JupyterLab installation, as described in [section
+    "Launching SageMath"](https://doc.sagemath.org/html/en/installation/launching.html)
+    in the installation manual.
 
 Troubleshooting
 ---------------
@@ -580,17 +583,10 @@ Relocation
 
 It is not supported to move the `SAGE_ROOT` or `SAGE_LOCAL` directory
 after building Sage.  If you do move the directories, you will have to
-build Sage again from scratch.
-
-If you copy the `sage` script or make a symbolic link to it, you
-should modify the script to reflect this (as instructed at the top of
-the script). It is important that the path to Sage does not have any
-spaces and non-ASCII characters in it.
+run ``make distclean`` and build Sage again from scratch.
 
 For a system-wide installation, you have to build Sage as a "normal" user
-and then as root you can change permissions. Afterwards, you need to start up
-Sage as root at least once prior to using the system-wide Sage as a
-normal user. See the [Installation Guide](https://doc.sagemath.org/html/en/installation/source.html#installation-in-a-multiuser-environment)
+and then as root you can change permissions. See the [Installation Guide](https://doc.sagemath.org/html/en/installation/source.html#installation-in-a-multiuser-environment)
 for further information.
 
 Redistribution

diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-SageMath version 9.6, Release Date: 2022-05-15
+SageMath version 9.7.beta1, Release Date: 2022-05-26
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		SageMath version 9.6, Release Date: 2022-05-15
		SageMath version 9.7.beta1, Release Date: 2022-05-26