Merge branch 'develop' into t/34855/remove_direct_use_of__setup_py_sdist_

Author: Matthias Köppe

.github/workflows/doc-build.yml

@@ -15,14 +15,13 @@ jobs:
   build-docs:
     runs-on: ubuntu-latest
     container: ghcr.io/sagemath/sage/sage-docker-ubuntu-focal-standard-with-targets:dev
-    env:
-      CAN_DEPLOY: ${{ secrets.NETLIFY_AUTH_TOKEN != '' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
       - name: Prepare
         run: |
+          apt-get update && apt-get install -y zip
           # Reuse built SAGE_LOCAL contained in the Docker image
           ./bootstrap
           ./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv --enable-download-from-upstream-url
@@ -34,43 +33,17 @@ jobs:
           SAGE_NUM_THREADS: 2
 
       - name: Copy docs
-        if: env.CAN_DEPLOY == 'true'
         run: |
           # For some reason the deploy step below cannot find /sage/...
           # So copy everything from there to local folder
           # We also need to replace the symlinks because netlify is not following them
           mkdir -p ./docs
           cp -r -L /sage/local/share/doc/sage/html/en/* ./docs
+          # Zip everything for increased performance
+          zip -r docs.zip docs
 
-      - name: Deploy to Netlify preview
-        id: preview-netlify
-        if: env.CAN_DEPLOY == 'true' && github.ref != 'refs/heads/develop'
-        uses: netlify/actions/cli@master
+      - name: Upload docs
+        uses: actions/upload-artifact@v3
         with:
-          args: deploy --dir=docs --alias="${NETLIFY_ALIAS}"
-        env:
-          # Set deployment url to commit hash to easily link from the trac.
-          # We could also set NETLIFY_ALIAS to the branch name.
-          # However, netlify currently doesn't support updates to a deployment with the same alias
-          # https://github.com/netlify/cli/issues/948
-          # https://github.com/netlify/cli/issues/1984
-          # Note that even if this feature is implemented, one would also need to first process the branch name
-          # to workaround the bug https://github.com/netlify/cli/issues/969.
-          NETLIFY_ALIAS: ${{ github.sha }}
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
-
-      - name: Deploy to Netlify production
-        id: deploy-netlify
-        if: env.CAN_DEPLOY == 'true' && github.ref == 'refs/heads/develop'
-        uses: netlify/actions/cli@master
-        with:
-          args: deploy --dir=docs --prod
-        env:
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
-
-      - name: Report deployment url
-        if: env.CAN_DEPLOY == 'true'
-        run: |
-          echo "::notice::The documentation has being automatically deployed to Netlify. %0A ✅ Preview: ${{ steps.preview-netlify.outputs.NETLIFY_URL || steps.deploy-netlify.outputs.NETLIFY_URL }}"
+          name: docs
+          path: docs.zip

.github/workflows/doc-publish.yml

@@ -0,0 +1,95 @@
+# Triggers after the documentation build has finished, 
+# taking the artifact and uploading it to netlify
+name: Publish documentation
+
+on:
+  workflow_run:
+    workflows: ["Build documentation"]
+    types:
+      - completed
+
+permissions:
+  statuses: write
+  checks: write
+  pull-requests: write
+
+jobs:
+  upload-docs:
+    runs-on: ubuntu-latest
+    if: github.event.workflow_run.conclusion == 'success'
+    steps:
+      - name: Get information about workflow origin
+        uses: potiuk/get-workflow-origin@v1_5
+        id: source-run-info
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          sourceRunId: ${{ github.event.workflow_run.id }}
+
+      # Once https://github.com/actions/download-artifact/issues/172 and/or https://github.com/actions/download-artifact/issues/60 is implemented, we can use the official download-artifact action
+      # For now use the solution from https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#using-data-from-the-triggering-workflow
+      - name: Download docs
+        uses: actions/[email protected]
+        with:
+          script: |
+            var artifacts = await github.actions.listWorkflowRunArtifacts({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: ${{github.event.workflow_run.id }},
+            });
+            var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "docs"
+            })[0];
+            var download = await github.actions.downloadArtifact({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               artifact_id: matchArtifact.id,
+               archive_format: 'zip',
+            });
+            var fs = require('fs');
+            fs.writeFileSync('${{github.workspace}}/docs.zip', Buffer.from(download.data));
+      
+      - name: Extract docs
+        run: unzip docs.zip -d docs && unzip docs/docs.zip -d docs/docs
+
+      - name: Deploy to Netlify
+        id: deploy-netlify
+        uses: netlify/actions/cli@master
+        with:
+          args: deploy --dir=docs/docs/docs ${NETLIFY_PRODUCTION:+"--prod"} --message ${NETLIFY_MESSAGE} --alias ${NETLIFY_ALIAS}
+        env:
+          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
+          NETLIFY_PRODUCTION: ${{ github.ref == 'refs/heads/develop' }}
+          NETLIFY_MESSAGE: ${{ steps.source-run-info.outputs.pullRequestNumber }}
+          NETLIFY_ALIAS: deploy-preview-${{ steps.source-run-info.outputs.pullRequestNumber }}
+
+      # Add deployment as status check, PR comment and annotation
+      # we could use the nwtgck/actions-netlify action for that, except for that it is not (yet) working in workflow_run context: https://github.com/nwtgck/actions-netlify/issues/545
+      - name: Add/Update deployment status PR comment
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          number: ${{ steps.source-run-info.outputs.pullRequestNumber }}
+          header: preview-comment
+          recreate: true
+          message: |
+            [Documentation preview for this PR](${{ steps.deploy-netlify.outputs.NETLIFY_URL }}) is ready! :tada:
+            Built with commit: ${{ steps.source-run-info.outputs.sourceHeadSha }}
+      
+      - name: Update deployment status PR check
+        uses: myrotvorets/[email protected]
+        if: ${{ always() }}
+        env:
+          DEPLOY_SUCCESS: Successfully deployed preview.
+          DEPLOY_FAILURE: Failed to deploy preview.
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          status: ${{ job.status == 'success' && 'success' || 'failure' }}
+          sha: ${{ github.event.workflow_run.head_sha }}
+          context: Deploy Documentation
+          targetUrl: ${{ steps.deploy-netlify.outputs.NETLIFY_URL }}
+          description: ${{ job.status == 'success' && env.DEPLOY_SUCCESS || env.DEPLOY_FAILURE }}
+
+      - name: Report deployment url
+        run: |
+          echo "::notice::The documentation has being automatically deployed to Netlify. %0A ✅ Preview: ${{ steps.deploy-netlify.outputs.NETLIFY_URL }}"
+

src/sage/combinat/key_polynomial.py

@@ -863,4 +863,3 @@ def sorting_word(alpha):
                 w.append(j+1)
                 L[j], L[j + 1] = L[j + 1], L[j]
     return reversed(w), L
-

src/sage/combinat/schubert_polynomial.py

@@ -499,4 +499,3 @@ def product_on_basis(self, left, right):
             X[4, 2, 1, 3]
         """
         return symmetrica.mult_schubert_schubert(left, right)
-

src/sage/groups/cactus_group.py

@@ -997,4 +997,3 @@ def gens(self):
                     continue
                 gens.append(val)
         return tuple([self(g) for g in gens])
-

src/sage/groups/finitely_presented_named.py

@@ -595,4 +595,3 @@ def CactusPresentation(n):
             elt = gens[i] * gens[j] * ~gens[K.index(y)] * ~gens[K.index(x)]
             rls.append(elt)
     return FinitelyPresentedGroup(F, tuple(rls))
-

src/sage/groups/kernel_subgroup.py

@@ -223,4 +223,3 @@ def __invert__(self):
                 s[1,2]*s[2,3]*s[1,2]*s[1,3]
             """
             return type(self)(self.parent(), ~self.value)
-

src/sage/groups/misc_gps/misc_groups_catalog.py

@@ -25,4 +25,3 @@
 from sage.combinat.root_system.reflection_group_real import ReflectionGroup
 from sage.groups.cactus_group import CactusGroup as Cactus
 from sage.groups.cactus_group import PureCactusGroup as PureCactus
-