Merge branch 'develop' into ci_portability_on_label

.github/workflows/doc-build.yml

@@ -82,6 +82,7 @@ jobs:
         # incremental docbuild may introduce broken links (inter-file references) though build succeeds
         run: |
           set -ex
+          export SAGE_USE_CDNS=yes
           mv /sage/local/share/doc/sage/html/en/.git /sage/.git-doc
           make doc-clean doc-uninstall sagelib-clean && git clean -fx src/sage
           mkdir -p /sage/local/share/doc/sage/html/en/ && mv /sage/.git-doc /sage/local/share/doc/sage/html/en/.git

.github/workflows/push_to_docker_hub.yml

@@ -0,0 +1,126 @@
+name: Build Docker images and push to DockerHub
+
+on:
+  workflow_dispatch:
+    # Allow to run manually
+    branches:
+      - 'develop'
+      - 'docker_hub_gha'
+  push:
+    tags:
+      # Just create image on pushing a tag
+      - '*'
+
+jobs:
+  sagemath-dev:
+    name: Build Docker image on target make-build and push to DockerHub sagemath-dev
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set tag
+        # docker/metadata-action@v4 is not used since we need to distinguish
+        # between latest and develop tags
+        id: set_tag
+        run: |
+          git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+          TAG_NAME=$(git tag --sort=v:refname | tail -1)
+          TAG="sagemath/sagemath-dev:$TAG_NAME"
+          TAG_LIST="$TAG, sagemath/sagemath-dev:develop"
+          TAG_LIST="$TAG" # don't tag develop until meaning of sagemath-dev is clear
+          echo "TAG_NAME=$TAG_NAME" >> $GITHUB_ENV
+          echo "TAG=$TAG" >> $GITHUB_ENV
+          echo "TAG_LIST=$TAG_LIST" >> $GITHUB_ENV
+
+      - name: Update Tag List
+        id: upd_tag_list
+        run: |
+          TAG_LIST="${{ env.TAG_LIST }}, sagemath/sagemath-dev:latest"
+          TAG_LIST="${{ env.TAG_LIST }}"  # don't tag latest until meaning of sagemath-dev is clear
+          echo "TAG_LIST=$TAG_LIST" >> $GITHUB_ENV
+        if: "!contains(env.TAG_NAME, 'beta') && !contains(env.TAG_NAME, 'rc')"
+
+      - name: Check env
+        run: |
+          echo ${{ env.TAG_NAME }}
+          echo ${{ env.TAG }}
+          echo ${{ env.TAG_LIST }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push make-build
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: docker/Dockerfile
+          target: make-build    # see the corresponding header-note
+          push: true
+          tags: ${{ env.TAG_LIST }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+  sagemath:
+    needs: sagemath-dev
+    name: Build Docker image on target sagemath and push to DockerHub sagemath
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set tag
+        # docker/metadata-action@v4 is not used since we need to distinguish
+        # between latest and develop tags
+        id: set_tag
+        run: |
+          git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+          TAG_NAME=$(git tag --sort=v:refname | tail -1)
+          TAG="sagemath/sagemath:$TAG_NAME"
+          TAG_LIST="$TAG, sagemath/sagemath:develop"
+          BASE="sagemath/sagemath-dev:$TAG_NAME"
+          echo "TAG_NAME=$TAG_NAME" >> $GITHUB_ENV
+          echo "TAG=$TAG" >> $GITHUB_ENV
+          echo "TAG_LIST=$TAG_LIST" >> $GITHUB_ENV
+          echo "BASE=$BASE" >> $GITHUB_ENV
+
+      - name: Update Tag List
+        id: upd_tag_list
+        run: |
+          TAG_LIST="${{ env.TAG_LIST }}, sagemath/sagemath:latest"
+          echo "TAG_LIST=$TAG_LIST" >> $GITHUB_ENV
+        if: "!contains(env.TAG_NAME, 'beta') && !contains(env.TAG_NAME, 'rc')"
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push sagemath
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: docker/Dockerfile
+          build-args: |
+            MAKE_BUILD=${{ env.BASE }}
+          target: sagemath
+          push: true
+          tags: ${{ env.TAG_LIST }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

CITATION.cff

@@ -4,8 +4,8 @@ title: SageMath
 abstract: SageMath is a free open-source mathematics software system.
 authors:
 - name: "The SageMath Developers"
-version: 10.1
+version: 10.2.beta1
 doi: 10.5281/zenodo.593563
-date-released: 2023-08-20
+date-released: 2023-09-01
 repository-code: "https://github.com/sagemath/sage"
 url: "https://www.sagemath.org/"

VERSION.txt

@@ -1 +1 @@
-SageMath version 10.1, Release Date: 2023-08-20
+SageMath version 10.2.beta1, Release Date: 2023-09-01

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=15c6dc9764f4e9dfc526e7131483989b8ea72430
-md5=c46a0fd95ab6860f6d7185ca467b1df2
-cksum=427186534
+sha1=80ee52a3b6855149693204f0816bd0690947e7ae
+md5=4292c175bba9299bd057980cec7060fd
+cksum=3914108326

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-aa220c4a1e34607d75d86b5abe022bd0c0358644
+57852a89c5c274ec6dbdd9269042972c7343e3ec

build/pkgs/cython/checksums.ini

@@ -1,5 +1,5 @@
 tarball=Cython-VERSION.tar.gz
-sha1=015b737107304a5777f5c6552ffb12713684c924
-md5=91c36ea86c00adcc5c1c11cf48b733c0
-cksum=1793363471
+sha1=762987c737acfe7532cb3da38b450fb6e0cf1d7b
+md5=a4d0f9fbc9c137f1a88937cd40e8c5ee
+cksum=2260471737
 upstream_url=https://pypi.io/packages/source/C/Cython/Cython-VERSION.tar.gz

build/pkgs/cython/package-version.txt

@@ -1 +1 @@
-0.29.32.p2
+0.29.36