Merge branch 'u/mantepse/remove_rings_from_streams' of trac.sagemath.…

…org:sage into t/34422/implement_functorial_composition_of_lazy_symmetric_functiosn

.devcontainer/develop-docker-computop/devcontainer.json

@@ -0,0 +1,18 @@
+// See https://aka.ms/devcontainer.json for format details.
+{
+    "name": "computop/sage Docker",
+    "image": "computop/sage",
+    "containerEnv": {
+        "MAKE": "make -j4"
+    },
+    // Install build tools, get rid of sourcing /sage/activate in non-login shells.
+    // libgmp.a is broken and leads to a build failure of ecm.
+    "onCreateCommand": ".devcontainer/onCreate.sh --sudo && sudo rm -f /sage/local/lib/libgmp.a && sed -i.bak '/sage.*activate/d' ~/.bashrc",
+    // Do not run configure within a sage-env (see #29485).
+    // The pari package is broken in the computop/sage 9.5 image, need to reinstall.
+    // Also libnauty is broken.
+    "updateContentCommand": "make configure && (export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin && unset CFLAGS LDFLAGS CXXFLAGS CPATH LIBRARY_PATH && ./configure --prefix=/sage/local --with-sage-venv) && make pari-clean nauty-clean build V=0",
+    "extensions": [
+        "ms-python.python"
+    ]
+}

.devcontainer/downstream-archlinux-latest/devcontainer.json

@@ -0,0 +1,12 @@
+// See https://aka.ms/devcontainer.json for format details.
+{
+    "name": "archlinux:latest downstream Sage",
+    "image": "archlinux:latest",
+    // Create an empty bashrc to avoid the error "No such file or directory" when opening a terminal.
+    "onCreateCommand": "EXTRA_SYSTEM_PACKAGES='sagemath sagemath-doc' EXTRA_SAGE_PACKAGES='notebook pip' .devcontainer/onCreate.sh && touch ~/.bashrc",
+    // There's no SAGE_LOCAL, so remove the symlink 'prefix'.
+    "updateContentCommand": "rm -f prefix && ln -sf /usr venv",
+    "extensions": [
+        "ms-python.python"
+    ]
+}

.devcontainer/downstream-conda-forge-latest/devcontainer.json

@@ -0,0 +1,19 @@
+// See https://aka.ms/devcontainer.json for format details.
+{
+    "name": "condaforge/mambaforge:latest downstream Sage",
+    "image": "condaforge/mambaforge:latest",
+    // Install Sage from the conda-forge package.
+    "onCreateCommand": "mamba install --yes sage",
+    // * If the workspace directory looks like a copy of the Sage source tree (SAGE_ROOT):
+    //   - it bootstraps and configures the Sage distribution,
+    //   - thus, the script ``./sage`` and the symlinks ``prefix``, ``venv`` are set as expected,
+    //   - the source tree is prepared for rebuilding Sage based from the source tree on
+    //     top of the existing installation from the Docker image.
+    //   - however, it does not start the build.
+    // * Otherwise, it does nothing. This is so that users can copy this devcontainer.json file as is
+    //   into their projects.
+    "updateContentCommand": "if [ -d pkgs/sagemath-standard ]; then make configure && ln -sf $CONDA_PREFIX venv; else echo 'Edit .devcontainer/devcontainer.json (updateContentCommand) to run project-specific startup commands'; fi",
+    "extensions": [
+        "ms-python.python"
+    ]
+}

.devcontainer/downstream-docker-cocalc/devcontainer.json

@@ -0,0 +1,19 @@
+// See https://aka.ms/devcontainer.json for format details.
+{
+    "name": "CoCalc Docker",
+    "image": "sagemathinc/cocalc",
+    "containerEnv": {
+        "MAKE": "make -j4"
+    },
+    // libgmp.a is broken and leads to a build failure of ecm.
+    "onCreateCommand": ".devcontainer/onCreate.sh && rm -f /usr/local/sage/local/lib/libgmp.a",
+    // * If the workspace directory looks like a copy of the Sage source tree (SAGE_ROOT):
+    //   - it bootstraps the Sage distribution,
+    //   - sets the symlink ``venv`` as expected,
+    // * Otherwise, it does nothing. This is so that users can copy this devcontainer.json file as is
+    //   into their projects.
+    "updateContentCommand": "if [ -d pkgs/sagemath-standard ]; then make configure && ./configure --enable-build-as-root --prefix=/usr/local/sage/local --with-sage-venv; else echo 'Edit .devcontainer/devcontainer.json (updateContentCommand) to run project-specific startup commands'; fi",
+    "extensions": [
+        "ms-python.python"
+    ]
+}

.devcontainer/downstream-docker-computop/devcontainer.json

@@ -0,0 +1,18 @@
+// See https://aka.ms/devcontainer.json for format details.
+{
+    "name": "computop/sage Docker",
+    "image": "computop/sage",
+    "containerEnv": {
+        "MAKE": "make -j4"
+    },
+    // Install build tools, get rid of sourcing /sage/activate in non-login shells.
+    // libgmp.a is broken and leads to a build failure of ecm.
+    "onCreateCommand": ".devcontainer/onCreate.sh --sudo && sudo rm -f /sage/local/lib/libgmp.a && sed -i.bak '/sage.*activate/d' ~/.bashrc",
+    // Do not run configure within a sage-env (see #29485).
+    // The pari package is broken in the computop/sage 9.5 image, need to reinstall.
+    // Also libnauty is broken.
+    "updateContentCommand": "make configure && (export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin && unset CFLAGS LDFLAGS CXXFLAGS CPATH LIBRARY_PATH && ./configure --prefix=/sage/local --with-sage-venv)",
+    "extensions": [
+        "ms-python.python"
+    ]
+}

.devcontainer/onCreate.sh

@@ -0,0 +1,9 @@
+#! /bin/sh
+# Run this script from SAGE_ROOT. Invoke with "--sudo" if sudo is needed.
+export PATH=$(pwd)/build/bin:$PATH
+SYSTEM=$(sage-guess-package-system)
+eval $(sage-print-system-package-command $SYSTEM "$@" update)
+eval $(sage-print-system-package-command $SYSTEM --yes "$@" --spkg install _bootstrap _prereq python3 git $EXTRA_SAGE_PACKAGES)
+if [ -n "$EXTRA_SYSTEM_PACKAGES" ]; then
+    eval $(sage-print-system-package-command $SYSTEM --yes "$@" install $EXTRA_SYSTEM_PACKAGES)
+fi

.devcontainer/portability-Dockerfile

@@ -0,0 +1,8 @@
+# This Dockerfile is used by all portability-.../devcontainer.json files,
+# which provide the actual values for the 4 arguments defined below, which
+# feed into the FROM statement that determines the base Docker image.
+ARG SYSTEM_FACTOR="ubuntu-jammy"
+ARG PACKAGE_FACTOR="standard"
+ARG DOCKER_TARGET="with-system-packages"
+ARG DOCKER_TAG="dev"
+FROM ghcr.io/sagemath/sage/sage-docker-${SYSTEM_FACTOR}-${PACKAGE_FACTOR}-${DOCKER_TARGET}:${DOCKER_TAG}

.devcontainer/portability-ubuntu-jammy-standard/devcontainer.json

@@ -0,0 +1,22 @@
+// See https://aka.ms/devcontainer.json for format details.
+{
+    "name": "Ubuntu jammy",
+    "build": {
+        "dockerfile": "portability-Dockerfile",
+        // See tox.ini for definitions
+        "args": {
+            "SYSTEM_FACTOR": "ubuntu-jammy",
+            "PACKAGE_FACTOR": "standard",
+            "DOCKER_TARGET": "with-targets",
+            "DOCKER_TAG": "dev"
+        }
+    },
+    "containerEnv": {
+        "MAKE": "make -j4"
+    },
+    "onCreateCommand": ".devcontainer/onCreate.sh",
+    "updateContentCommand": ".devcontainer/portability-updateContent.sh",
+    "extensions": [
+        "ms-python.python"
+    ]
+}

.devcontainer/portability-ubuntu-jammy-standard/portability-Dockerfile

@@ -0,0 +1 @@
+../portability-Dockerfile

.devcontainer/portability-updateContent.sh

@@ -0,0 +1,30 @@
+#! /bin/sh
+# The portability-.../devcontainer.json configurations run this script after
+# the container is started.
+#
+# The script assumes that it is run from SAGE_ROOT.
+#
+# If "config.log" or "logs" are symlinks (for example, created by 'tox -e local-...',
+# or after https://trac.sagemath.org/ticket/33262), they might point outside of
+# the dev container, so remove them. Likewise for upstream.
+for f in config.log logs upstream; do
+    if [ -L $f ]; then
+        rm -f $f
+    fi
+done
+# If possible (ensured after https://trac.sagemath.org/ticket/33262), keep the
+# logs in the container.
+if [ ! -d logs ]; then
+    ln -s /sage/logs logs
+fi
+# Bootstrap, configure, and build the Sage distribution, reusing the Sage
+# installation from the prebuilt image.
+set -e
+set -x
+make configure
+if [ -x /sage/config.status ]; then
+    eval ./configure $(/sage/config.status --config) --enable-build-as-root --prefix=/sage/local --with-sage-venv
+else
+    ./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv
+fi
+make build V=0

.github/workflows/dist.yml

@@ -138,6 +138,8 @@ jobs:
   upload_wheels:
     needs: build_wheels
     runs-on: ubuntu-latest
+    env:
+      CAN_DEPLOY: ${{ secrets.SAGEMATH_PYPI_API_TOKEN != '' }}
     steps:
 
       - uses: actions/download-artifact@v2

.github/workflows/lint.yml

@@ -50,5 +50,3 @@ jobs:
       run: pip install tox
     - name: Lint using tox -e rst
       run: tox -e rst
-      # Until all errors are fixed:
-      continue-on-error: true

.gitignore

@@ -217,6 +217,9 @@ src/ENV/
 src/env.bak/
 src/venv.bak/
 
+# devcontainer
+/.devcontainer/devcontainer.json
+
 # mypy
 **/.mypy_cache/
 

.gitpod.yml

@@ -9,8 +9,8 @@ tasks:
       # Create conda environment
       ./bootstrap-conda
       mamba env create --file src/environment-dev.yml --prefix venv
-      conda config --append envs_dirs /workspace/sagetrac-mirror
-      conda activate /workspace/sagetrac-mirror/venv
+      conda config --append envs_dirs $(pwd)
+      conda activate $(pwd)/venv
       
       # Build sage
       ./bootstrap
@@ -20,8 +20,8 @@ tasks:
 
     command: |
       # Activate conda environment
-      conda config --append envs_dirs /workspace/sagetrac-mirror
-      conda activate /workspace/sagetrac-mirror/venv
+      conda config --append envs_dirs $(pwd)
+      conda activate $(pwd)/venv
 
       # RestructuredText extension recommends python extension, although we have already installed it
       ## So disable the recommendation dialog

.vscode/settings.json

@@ -1,9 +1,11 @@
 {
+    // This settings file is not ignored by git. It should be kept in sync with
+    // the trac repo.
     "python.defaultInterpreterPath": "./venv/bin/python3",
     "files.exclude": {
         "**/__pycache__": true,
         "src/**/*.cpp": true,
-        "src/**/*.so": true,
+        "src/**/*.so": true
     },
     "search.exclude": {
         "build/pkgs/sagemath_categories/src": true,
@@ -12,20 +14,24 @@
         "pkgs/sage-conf_pypi/sage_root/build": true,
         "pkgs/sagemath-categories/sage": true,
         "pkgs/sagemath-objects/sage": true,
-        "pkgs/sagemath-standard/sage": true,
+        "pkgs/sagemath-standard/sage": true
     },
     "python.testing.pytestEnabled": true,
     "python.testing.pytestArgs": [
         "--rootdir=src/sage",
         "-c=src/tox.ini",
-        "--doctest-modules",
+        "--doctest-modules"
     ],
     "python.testing.unittestEnabled": false,
     "python.linting.pycodestyleEnabled": true,
     "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,E306,E401,E701,E702,E703,W605,E711,E712,E713,E721,E722"],
     "cSpell.words": [
-        "furo"
+        "furo",
         "Conda",
+        "sagemath",
         "Cython"
-    ],
+    ]
 }

.zenodo.json

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