Merge branches 'gap-4.13.0', 'cvxpy-1.5', 'numpy2', 'cypari2-cysignal…

…s', 'jupyterlab-4.2', 'sage_bootstrap_pipes', 'docker_build_strip_timestamp', 'ci_linux_minimal_merge' and 'centos-stream-9' into HEAD
mkoeppe · Aug 19, 2024 · f4624b4 · f4624b4
10 parents e042294 + 62155e7 + 2477b1f + c7c33f0 + 559408a + 604c79b + d139be5 + 07ecb86 + ee30cbf + a2d4d8e
commit f4624b4
Show file tree

Hide file tree

Showing 272 changed files with 1,823 additions and 827 deletions.
diff --git a/.ci/create-changes-html.sh b/.ci/create-changes-html.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 if [ $# != 2 ]; then
-    echo >&2 "usage: $0 BASE_DOC_COMMIT DOC_REPO"
-    echo >&2 "creates CHANGES.html in the current directory"
-    echo >&2 "for the diffs of DOC_REPO against BASE_DOC_COMMIT"
+    echo >&2 "Usage: $0 DIFF_TEXT DOC_REPO"
+    echo >&2 "This script generates a CHANGES.html file in the current directory"
+    echo >&2 "and adds anchor targets in the documents within DOC_REPO"
+    echo >&2 "based on the diff hunks in the DIFF_TEXT file."
     exit 1
 fi
-BASE_DOC_COMMIT="$1"
+DIFF_TEXT="$1"
 DOC_REPOSITORY="$2"
 
 # Create CHANGES.html
@@ -52,11 +53,10 @@ diffParagraphs.forEach(paragraph => {
 EOF
 echo '</head>' >> CHANGES.html
 echo '<body>' >> CHANGES.html
-(cd $DOC_REPOSITORY && git diff $BASE_DOC_COMMIT -- "*.html") > diff.txt
 python3 - << EOF
 import os, re, html
 from itertools import chain
-with open('diff.txt', 'r') as f:
+with open('$DIFF_TEXT', 'r') as f:
     diff_text = f.read()
 diff_blocks = re.split(r'^(?=diff --git)', diff_text, flags=re.MULTILINE)
 out_blocks = []
@@ -83,12 +83,21 @@ for block in diff_blocks:
                     hunk_lines = []
                 search_result = re.search(r'@@ -(\d+),(\d+) \+(\d+),(\d+)', line)
                 if search_result:
-                    line_number = int(search_result.group(3))
+                    line_number = int(search_result.group(3)) - 1
                     span = int(search_result.group(4))
                     for i in chain(range(line_number, line_number + span), range(line_number - 1, -1, -1)):
-                        if content[i].startswith('<') and not content[i].startswith('</'):
+                        try:
+                            ln = content[i]
+                        except IndexError:
+                            continue
+                        for idx, char in enumerate(ln):
+                            if not char.isspace():
+                                break
+                        else:
+                            idx = len(ln)
+                        if ln.startswith('<', idx) and not ln.startswith('</', idx):
                             count += 1
-                            content[i] = f'<span id="hunk{count}" style="visibility: hidden;"></span>' + content[i]
+                            content[i] = ln[:idx] + f'<span id="hunk{count}" style="visibility: hidden;"></span>' + ln[idx:]
                             hunks.append(f'<p class="hunk"><a href="{path}#hunk{count}" class="hunk" target="_blank">hunk #{count}</a></p>')
                             break
             hunk_lines.append(line)
@@ -107,4 +116,4 @@ EOF
 cat diff.html >> CHANGES.html
 echo '</body>' >> CHANGES.html
 echo '</html>' >> CHANGES.html
-rm diff.txt diff.html
+rm diff.html
diff --git a/.ci/write-dockerfile.sh b/.ci/write-dockerfile.sh
@@ -323,7 +323,7 @@ ARG NUMPROC=8
 ENV MAKE="make -j\${NUMPROC}"
 ARG USE_MAKEFLAGS="-k V=0"
 ENV SAGE_CHECK=warn
-ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
+ENV SAGE_CHECK_PACKAGES="!cython,!python3,!cysignals,!linbox,!ppl,!cmake,!rpy2,!sage_sws2rst"
 #:toolchain:
 $RUN $CHECK_STATUS_THEN make \${USE_MAKEFLAGS} base-toolchain $ENDRUN $THEN_SAVE_STATUS
 
@@ -332,7 +332,7 @@ ARG NUMPROC=8
 ENV MAKE="make -j\${NUMPROC}"
 ARG USE_MAKEFLAGS="-k V=0"
 ENV SAGE_CHECK=warn
-ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
+ENV SAGE_CHECK_PACKAGES="!cython,!python3,!cysignals,!linbox,!ppl,!cmake,!rpy2,!sage_sws2rst"
 #:make:
 ARG TARGETS_PRE="all-sage-local"
 $RUN $CHECK_STATUS_THEN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS_PRE} $ENDRUN $THEN_SAVE_STATUS
@@ -342,7 +342,7 @@ ARG NUMPROC=8
 ENV MAKE="make -j\${NUMPROC}"
 ARG USE_MAKEFLAGS="-k V=0"
 ENV SAGE_CHECK=warn
-ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
+ENV SAGE_CHECK_PACKAGES="!cython,!python3,!cysignals,!linbox,!ppl,!cmake,!rpy2,!sage_sws2rst"
 $ADD .gitignore /new/.gitignore
 $ADD src /new/src
 RUN cd /new && rm -rf .git && \
@@ -364,7 +364,7 @@ ARG NUMPROC=8
 ENV MAKE="make -j\${NUMPROC}"
 ARG USE_MAKEFLAGS="-k V=0"
 ENV SAGE_CHECK=warn
-ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!rpy2,!sage_sws2rst"
+ENV SAGE_CHECK_PACKAGES="!cython,!python3,!cysignals,!linbox,!ppl,!cmake,!rpy2,!sage_sws2rst"
 ARG TARGETS_OPTIONAL="ptest"
 $RUN $CHECK_STATUS_THEN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS_OPTIONAL} || echo "(error ignored)" $ENDRUN $THEN_SAVE_STATUS
 

diff --git a/...eam-9-python3.9-minimal/devcontainer.json → ...centos-stream-9-minimal/devcontainer.json b/...eam-9-python3.9-minimal/devcontainer.json → ...centos-stream-9-minimal/devcontainer.json
@@ -3,12 +3,12 @@
 //      from .devcontainer/portability-devcontainer.json.in
 // See https://aka.ms/devcontainer.json for format details.
 {
-    "name": "centos-stream-9-python3.9-minimal (≥ 8-core)",
+    "name": "centos-stream-9-minimal (≥ 8-core)",
     "build": {
         "dockerfile": "portability-Dockerfile",
         // See tox.ini for definitions
         "args": {
-            "SYSTEM_FACTOR": "centos-stream-9-python3.9",
+            "SYSTEM_FACTOR": "centos-stream-9",
             "PACKAGE_FACTOR": "minimal",
             "DOCKER_TARGET": "with-targets",
             "DOCKER_TAG": "dev"

diff --git a/...-python3.9-minimal/portability-Dockerfile → ...s-stream-9-minimal/portability-Dockerfile b/...-python3.9-minimal/portability-Dockerfile → ...s-stream-9-minimal/portability-Dockerfile
diff --git a/.devcontainer/portability-centos-stream-9-python3.12-minimal/devcontainer.json b/.devcontainer/portability-centos-stream-9-python3.12-minimal/devcontainer.json
@@ -0,0 +1,25 @@
+// The command "tox -e update_docker_platforms"
+//   creates .devcontainer/portability-*-*/devcontainer.json
+//      from .devcontainer/portability-devcontainer.json.in
+// See https://aka.ms/devcontainer.json for format details.
+{
+    "name": "centos-stream-9-python3.12-minimal (≥ 8-core)",
+    "build": {
+        "dockerfile": "portability-Dockerfile",
+        // See tox.ini for definitions
+        "args": {
+            "SYSTEM_FACTOR": "centos-stream-9-python3.12",
+            "PACKAGE_FACTOR": "minimal",
+            "DOCKER_TARGET": "with-targets",
+            "DOCKER_TAG": "dev"
+        }
+    },
+    "containerEnv": {
+        "MAKE": "make -j4"
+    },
+    "onCreateCommand": ".devcontainer/onCreate.sh",
+    "updateContentCommand": ".devcontainer/portability-updateContent.sh",
+    "extensions": [
+        "ms-python.python"
+    ]
+}
diff --git a/...python3.9-standard/portability-Dockerfile → ...python3.12-minimal/portability-Dockerfile b/...python3.9-standard/portability-Dockerfile → ...python3.12-minimal/portability-Dockerfile
diff --git a/.devcontainer/portability-centos-stream-9-python3.12-standard/devcontainer.json b/.devcontainer/portability-centos-stream-9-python3.12-standard/devcontainer.json
@@ -0,0 +1,25 @@
+// The command "tox -e update_docker_platforms"
+//   creates .devcontainer/portability-*-*/devcontainer.json
+//      from .devcontainer/portability-devcontainer.json.in
+// See https://aka.ms/devcontainer.json for format details.
+{
+    "name": "centos-stream-9-python3.12-standard (≥ 8-core)",
+    "build": {
+        "dockerfile": "portability-Dockerfile",
+        // See tox.ini for definitions
+        "args": {
+            "SYSTEM_FACTOR": "centos-stream-9-python3.12",
+            "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"
+    ]
+}
diff --git a/.devcontainer/portability-centos-stream-9-python3.12-standard/portability-Dockerfile b/.devcontainer/portability-centos-stream-9-python3.12-standard/portability-Dockerfile
@@ -0,0 +1 @@
+../portability-Dockerfile
diff --git a/...am-9-python3.9-standard/devcontainer.json → ...entos-stream-9-standard/devcontainer.json b/...am-9-python3.9-standard/devcontainer.json → ...entos-stream-9-standard/devcontainer.json
@@ -3,12 +3,12 @@
 //      from .devcontainer/portability-devcontainer.json.in
 // See https://aka.ms/devcontainer.json for format details.
 {
-    "name": "centos-stream-9-python3.9-standard (≥ 8-core)",
+    "name": "centos-stream-9-standard (≥ 8-core)",
     "build": {
         "dockerfile": "portability-Dockerfile",
         // See tox.ini for definitions
         "args": {
-            "SYSTEM_FACTOR": "centos-stream-9-python3.9",
+            "SYSTEM_FACTOR": "centos-stream-9",
             "PACKAGE_FACTOR": "standard",
             "DOCKER_TARGET": "with-targets",
             "DOCKER_TAG": "dev"

diff --git a/.devcontainer/portability-centos-stream-9-standard/portability-Dockerfile b/.devcontainer/portability-centos-stream-9-standard/portability-Dockerfile
@@ -0,0 +1 @@
+../portability-Dockerfile
diff --git a/.devcontainer/portability-fedora-41-minimal/devcontainer.json b/.devcontainer/portability-fedora-41-minimal/devcontainer.json
@@ -0,0 +1,25 @@
+// The command "tox -e update_docker_platforms"
+//   creates .devcontainer/portability-*-*/devcontainer.json
+//      from .devcontainer/portability-devcontainer.json.in
+// See https://aka.ms/devcontainer.json for format details.
+{
+    "name": "fedora-41-minimal (≥ 8-core)",
+    "build": {
+        "dockerfile": "portability-Dockerfile",
+        // See tox.ini for definitions
+        "args": {
+            "SYSTEM_FACTOR": "fedora-41",
+            "PACKAGE_FACTOR": "minimal",
+            "DOCKER_TARGET": "with-targets",
+            "DOCKER_TAG": "dev"
+        }
+    },
+    "containerEnv": {
+        "MAKE": "make -j4"
+    },
+    "onCreateCommand": ".devcontainer/onCreate.sh",
+    "updateContentCommand": ".devcontainer/portability-updateContent.sh",
+    "extensions": [
+        "ms-python.python"
+    ]
+}
diff --git a/.devcontainer/portability-fedora-41-minimal/portability-Dockerfile b/.devcontainer/portability-fedora-41-minimal/portability-Dockerfile
@@ -0,0 +1 @@
+../portability-Dockerfile
diff --git a/.devcontainer/portability-fedora-41-standard/devcontainer.json b/.devcontainer/portability-fedora-41-standard/devcontainer.json
@@ -0,0 +1,25 @@
+// The command "tox -e update_docker_platforms"
+//   creates .devcontainer/portability-*-*/devcontainer.json
+//      from .devcontainer/portability-devcontainer.json.in
+// See https://aka.ms/devcontainer.json for format details.
+{
+    "name": "fedora-41-standard (≥ 8-core)",
+    "build": {
+        "dockerfile": "portability-Dockerfile",
+        // See tox.ini for definitions
+        "args": {
+            "SYSTEM_FACTOR": "fedora-41",
+            "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"
+    ]
+}
diff --git a/.devcontainer/portability-fedora-41-standard/portability-Dockerfile b/.devcontainer/portability-fedora-41-standard/portability-Dockerfile
@@ -0,0 +1 @@
+../portability-Dockerfile
diff --git a/.github/workflows/ci-linux-incremental.yml b/.github/workflows/ci-linux-incremental.yml
@@ -60,9 +60,9 @@ jobs:
           uninstall_targets=$(echo $(for a in '' ${{ steps.changed-files.outputs.configures_all_changed_files }}; do echo $a | sed -E 's,build/pkgs/([a-z0-9][_.a-z0-9]*)/spkg-configure[.]m4 *,\1-uninstall,'; done | sort -u))
           build_targets=$(echo $(for a in '' ${{ steps.changed-files.outputs.pkgs_all_changed_files }}; do SPKG=$(echo $a | sed -E 's,-,_,g;s,(build/)?pkgs/([a-z0-9][-_.a-z0-9]*)/[^ ]* *,\2,;'); if [ -f "build/pkgs/$SPKG/checksums.ini" -o -f "build/pkgs/$SPKG/requirements.txt" -o -f "build/pkgs/$SPKG/spkg-install" ]; then echo "$SPKG-ensure"; fi; done | sort -u))
           if [ -n "$uninstall_targets" ]; then
-              echo "build_targets=$uninstall_targets reconfigure $build_targets ci-build-with-fallback" >> $GITHUB_OUTPUT
+              echo "build_targets=$uninstall_targets reconfigure $build_targets" >> $GITHUB_OUTPUT
           else
-              echo "build_targets=$build_targets ci-build-with-fallback" >> $GITHUB_OUTPUT
+              echo "build_targets=$build_targets" >> $GITHUB_OUTPUT
           fi
           cat $GITHUB_OUTPUT
       - uses: actions/checkout@v4
@@ -92,7 +92,7 @@ jobs:
       from_docker_target: "with-targets"
       from_docker_tag: "dev"
       docker_targets: "with-targets"
-      targets: "${{needs.changed_files.outputs.build_targets}} doc-html ptest-nodoc"
+      targets: "${{needs.changed_files.outputs.build_targets}} ci-build-with-fallback doc-html ptest-nodoc"
       tox_system_factors: >-
         ["ubuntu-focal",
          "ubuntu-noble",
@@ -108,6 +108,29 @@ jobs:
       docker_push_repository: ghcr.io/${{ github.repository }}/
       max_parallel: 8
 
+  constraints_pkgs-norequirements:
+    needs: [changed_files]
+    uses: ./.github/workflows/docker.yml
+    with:
+      # Build incrementally from published Docker image
+      incremental: true
+      free_disk_space: true
+      from_docker_repository: ghcr.io/sagemath/sage/
+      from_docker_target: "with-targets-pre"
+      from_docker_tag: "dev"
+      docker_targets: "with-targets-pre"
+      targets_pre: "${{needs.changed_files.outputs.build_targets}} all-sage-local python3-ensure tox-ensure sagelib-tox-sagepython-constraints_pkgs-norequirements"
+      tox_system_factors: >-
+        ["ubuntu-focal",
+         "ubuntu-noble",
+         "debian-bookworm",
+         "fedora-40",
+         "debian-bullseye-i386"]
+      tox_packages_factors: >-
+          ["standard"]
+      docker_push_repository: ghcr.io/${{ github.repository }}/
+      max_parallel: 16
+
   site:
     needs: [changed_files]
     uses: ./.github/workflows/docker.yml