Merge branch 'develop' into t/34693/MPL3.6_docbuilding

Author: kwankyu

.github/workflows/ci-linux.yml

@@ -51,6 +51,7 @@ jobs:
     with:
       # Build incrementally from previous stage (pre)
       incremental: true
+      free_disk_space: true
       from_docker_repository: ghcr.io/${{ github.repository }}/
       from_docker_target: "with-targets-pre"
       docker_targets: "with-targets with-targets-optional"
@@ -82,21 +83,23 @@ jobs:
     with:
       # Build incrementally from previous stage (pre)
       incremental: true
+      free_disk_space: true
       from_docker_repository: ghcr.io/${{ github.repository }}/
       from_docker_target: "with-targets-pre"
       docker_targets: "with-targets with-targets-optional"
       # FIXME: duplicated from env.TARGETS
       targets: build doc-html
       targets_optional: ptest
       tox_packages_factors: >-
-          ["minimal]
+          ["minimal"]
       docker_push_repository: ghcr.io/${{ github.repository }}/
 
   maximal-pre:
     if: ${{ success() || failure() }}
     needs: [minimal]
     uses: ./.github/workflows/docker.yml
     with:
+      free_disk_space: true
       # Build from scratch
       docker_targets: "with-system-packages configured with-targets-pre"
       # FIXME: duplicated from env.TARGETS
@@ -111,6 +114,7 @@ jobs:
     uses: ./.github/workflows/docker.yml
     with:
       incremental: true
+      free_disk_space: true
       from_docker_repository: ghcr.io/${{ github.repository }}/
       from_docker_target: "with-targets-pre"
       tox_packages_factors: >-
@@ -125,6 +129,7 @@ jobs:
     uses: ./.github/workflows/docker.yml
     with:
       incremental: true
+      free_disk_space: true
       from_docker_repository: ghcr.io/${{ github.repository }}/
       from_docker_target: "with-targets-pre"
       tox_packages_factors: >-
@@ -138,6 +143,7 @@ jobs:
     uses: ./.github/workflows/docker.yml
     with:
       incremental: true
+      free_disk_space: true
       from_docker_repository: ghcr.io/${{ github.repository }}/
       from_docker_target: "with-targets-pre"
       tox_packages_factors: >-
@@ -151,6 +157,7 @@ jobs:
     uses: ./.github/workflows/docker.yml
     with:
       incremental: true
+      free_disk_space: true
       from_docker_repository: ghcr.io/${{ github.repository }}/
       from_docker_target: "with-targets-pre"
       tox_packages_factors: >-

.github/workflows/ci-macos.yml

@@ -42,12 +42,8 @@ jobs:
         # python3_xcode is only accepted if enough packages are available from the system
         # --> to test "minimal", we would need https://trac.sagemath.org/ticket/30949
         tox_env: [homebrew-macos-usrlocal-minimal, homebrew-macos-usrlocal-standard, homebrew-macos-usrlocal-maximal, homebrew-macos-usrlocal-python3_xcode-standard, conda-forge-macos-minimal, conda-forge-macos-standard, conda-forge-macos-maximal]
-        # As of 2021-12, default xcode
-        # - on macos-10.15:               12.4
-        # - on macos-latest (= macos-11): 13.1
-        # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md#xcode
         xcode_version_factor: [default]
-        os: [ macos-10.15, macos-latest ]
+        os: [ macos-11, macos-12 ]
     env:
       TOX_ENV: local-${{ matrix.tox_env }}
       LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-tox-local-${{ matrix.tox_env }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}
@@ -158,22 +154,10 @@ jobs:
       fail-fast: false
       max-parallel: 4
       matrix:
-        os: [ macos-10.15, macos-11.0 ]
-        tox_system_factor: [macos-nobootstrap, macos-nobootstrap-python3_pythonorg]
+        os: [ macos-11, macos-12 ]
+        tox_system_factor: [macos-nobootstrap]
         tox_packages_factor: [minimal]
-        # As of 2021-03, default is 12.4
-        # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md#xcode
         xcode_version_factor: [default]
-        include:
-          # Test xcode 11.7 only on macos-10.15
-          - tox_system_factor: macos-nobootstrap
-            tox_packages_factor: minimal
-            xcode_version_factor: 11.7
-            os: macos-10.15
-          - tox_system_factor: macos-nobootstrap-python3_pythonorg
-            tox_packages_factor: minimal
-            xcode_version_factor: 11.7
-            os: macos-10.15
     env:
       TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
       LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-xcode_${{ matrix.xcode_version_factor }}
@@ -198,13 +182,6 @@ jobs:
       - name: Install test prerequisites
         run: |
           sudo /usr/bin/python3 -m pip install tox
-      - name: Install python3 from python.org
-        # As of 2020-03-30 (https://github.com/actions/virtual-environments/blob/master/images/macos/macos-10.15-Readme.md),
-        # Python 3.7.7 is installed on GitHub Actions runners.  But we install our own copy from the python.org binary package.
-        run: |
-          curl -o python3.pkg https://www.python.org/ftp/python/3.7.7/python-3.7.7-macosx10.9.pkg
-          sudo installer -verbose -pkg python3.pkg -target /
-        if: contains(matrix.tox_system_factor, 'python3_pythonorg')
       - name: Build and test with tox
         # We use a high parallelization on purpose in order to catch possible parallelization bugs in the build scripts.
         # For doctesting, we use a lower parallelization to avoid timeouts.

.github/workflows/docker.yml

@@ -18,22 +18,22 @@ on:
         default: >-
           ["ubuntu-trusty-toolchain-gcc_9",
            "ubuntu-xenial-toolchain-gcc_9",
-           "ubuntu-bionic-gcc_8",
+           "ubuntu-bionic-gcc_8-python3.8",
            "ubuntu-focal",
            "ubuntu-jammy",
            "ubuntu-kinetic",
            "debian-buster",
            "debian-bullseye",
            "debian-bookworm",
            "debian-sid",
-           "linuxmint-19-gcc_8",
-           "linuxmint-19.3-gcc_8",
+           "linuxmint-19-gcc_8-python3.8",
+           "linuxmint-19.3-gcc_8-python3.8",
            "linuxmint-20.1",
            "linuxmint-20.2",
            "linuxmint-20.3",
            "linuxmint-21",
-           "fedora-29",
-           "fedora-30",
+           "fedora-29-python3.8",
+           "fedora-30-python3.8",
            "fedora-31",
            "fedora-32",
            "fedora-33",
@@ -42,17 +42,16 @@ on:
            "fedora-36",
            "fedora-37",
            "centos-7-devtoolset-gcc_11",
-           "centos-stream-8",
-           "centos-stream-9",
+           "centos-stream-8-python3.9",
+           "centos-stream-9-python3.9",
            "gentoo-python3.9",
            "gentoo-python3.10",
            "archlinux-latest",
-           "opensuse-15.3-gcc_11",
-           "opensuse-15.4-gcc_11",
-           "opensuse-tumbleweed",
+           "opensuse-15.3-gcc_11-python3.9",
+           "opensuse-15.4-gcc_11-python3.10",
+           "opensuse-tumbleweed-python3.10",
            "conda-forge",
-           "ubuntu-bionic-i386",
-           "manylinux-2_24-i686",
+           "ubuntu-bionic-gcc_8-i386",
            "debian-buster-i386",
            ]
       tox_packages_factors:
@@ -62,9 +61,16 @@ on:
           ["minimal",
            "standard",
            ]
+      extra_sage_packages:
+        description: 'Extra Sage packages to install as system packages'
+        type: string
+        default: ""
       max_parallel:
         type: number
         default: 24
+      free_disk_space:
+        default: false
+        type: boolean
       #
       # Publishing to GitHub Packages
       #
@@ -128,14 +134,15 @@ jobs:
       FROM_DOCKER_REPOSITORY: ${{ inputs.from_docker_repository }}
       FROM_DOCKER_TARGET: ${{ inputs.from_docker_target }}
       FROM_DOCKER_TAG:    ${{ inputs.from_docker_tag }}
-
+      EXTRA_CONFIGURE_ARGS: --enable-fat-binary
+      EXTRA_SAGE_PACKAGES:  ${{ inputs.extra_sage_packages }}
     steps:
       - name: Check out SageMath
         uses: actions/checkout@v2
         with:
           repository: ${{ inputs.sage_repo }}
           ref: ${{ inputs.sage_ref }}
-          fetch-depth: 2000
+          fetch-depth: 10000
       - name: fetch tags
         run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
       - name: free disk space
@@ -149,6 +156,7 @@ jobs:
           dpkg-query -Wf '${Installed-Size}\t${Package}\n' | sort -n | tail -n 50
           sudo apt-get --fix-broken --yes remove $(dpkg-query -f '${Package}\n' -W | grep -E '^(ghc-|google-cloud-sdk|google-chrome|firefox|mysql-server|dotnet-sdk|hhvm|mono)') || echo "(error ignored)"
           df -h
+        if: inputs.free_disk_space
       - name: Check out git-trac-command
         uses: actions/checkout@v2
         with:
@@ -190,7 +198,7 @@ jobs:
               TOKEN="${{ secrets.GITHUB_TOKEN }}"
             fi
             if echo "$TOKEN" | docker login ghcr.io -u ${{ github.actor }} --password-stdin; then
-              echo "DOCKER_PUSH_REPOSITORY=${{ inputs.docker_push_repository }}" >> $GITHUB_ENV
+              echo "DOCKER_PUSH_REPOSITORY=$(echo ${{ inputs.docker_push_repository }} | tr "[:upper:]" "[:lower:]")" >> $GITHUB_ENV
               echo "DOCKER_CONFIG_FILE=$HOME/.docker/config.json" >> $GITHUB_ENV
             fi
             # From the docker documentation via .ci/update-env.sh:

.lgtm.yml

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

.zenodo.json

@@ -1 +1 @@
-SageMath version 9.8.beta2, Release Date: 2022-10-16
+SageMath version 9.8.beta4, Release Date: 2022-11-21

VERSION.txt

@@ -63,11 +63,15 @@ EOF
 RUN sed -i.bak $DIST_UPGRADE /etc/apt/sources.list && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade
 EOF
                 fi
-                if [ -n "$EXTRA_REPOSITORY" ]; then
+                if [ -n "$EXTRA_REPOSITORIES" ]; then
                     cat <<EOF
 RUN $UPDATE $INSTALL software-properties-common && ($INSTALL gpg gpg-agent || echo "(ignored)")
-RUN $SUDO add-apt-repository $EXTRA_REPOSITORY
 EOF
+                    for repo in $EXTRA_REPOSITORIES; do
+                        cat <<EOF
+RUN $SUDO add-apt-repository $repo
+EOF
+                    done
                 fi
         esac
         ;;

build/bin/write-dockerfile.sh

@@ -443,8 +443,9 @@ $(foreach pkgname, $(NORMAL_PACKAGES) $(SCRIPT_PACKAGES),\
 #
 # Since Python's self-tests seem to fail on all platforms, we disable
 # its test suite by default.
+# meson_python 0.10.0 fails on some platforms, so we reduce it to warnings.
 # However, if SAGE_CHECK=warn, we do not do that.
-SAGE_CHECK_PACKAGES_DEFAULT_yes := !python3
+SAGE_CHECK_PACKAGES_DEFAULT_yes := !python3,?meson_python
 SAGE_CHECK_PACKAGES_DEFAULT_warn :=
 SAGE_CHECK_PACKAGES_DEFAULT_no :=
 comma := ,

build/make/Makefile.in

@@ -1 +1 @@
-_bootstrap git pytest pytest_xdist
+_bootstrap git pytest pytest_xdist github_cli

build/pkgs/_develop/dependencies

@@ -0,0 +1 @@
+python310