Skip to content

Commit

Permalink
Merge branch 'develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
teschlg authored Aug 28, 2023
2 parents 3be7da8 + 6695bec commit acbce52
Show file tree
Hide file tree
Showing 622 changed files with 23,734 additions and 17,457 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
#
CIBW_ARCHS: ${{ matrix.arch }}
# https://cibuildwheel.readthedocs.io/en/stable/options/#requires-python
CIBW_PROJECT_REQUIRES_PYTHON: ">=3.8"
CIBW_PROJECT_REQUIRES_PYTHON: ">=3.9"
# Environment during wheel build
CIBW_ENVIRONMENT: "PATH=$(pwd)/local/bin:$PATH CPATH=$(pwd)/local/include:$CPATH LIBRARY_PATH=$(pwd)/local/lib:$LIBRARY_PATH PKG_CONFIG_PATH=$(pwd)/local/share/pkgconfig:$PKG_CONFIG_PATH ACLOCAL_PATH=/usr/share/aclocal"
# Use 'build', not 'pip wheel'
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,23 @@ on:
default: >-
["ubuntu-trusty-toolchain-gcc_9",
"ubuntu-xenial-toolchain-gcc_9",
"ubuntu-bionic-gcc_8-python3.8",
"ubuntu-focal",
"ubuntu-jammy",
"ubuntu-kinetic",
"ubuntu-lunar",
"ubuntu-mantic",
"debian-buster",
"debian-buster-gcc_spkg",
"debian-bullseye",
"debian-bookworm",
"debian-trixie",
"debian-sid",
"linuxmint-19-gcc_8-python3.8",
"linuxmint-19.3-gcc_8-python3.8",
"linuxmint-20.1",
"linuxmint-20.2",
"linuxmint-20.3",
"linuxmint-21",
"linuxmint-21.1",
"linuxmint-21.2",
"fedora-29-python3.8",
"fedora-30-python3.8",
"fedora-30",
"fedora-31",
"fedora-32",
"fedora-33",
Expand All @@ -61,7 +58,6 @@ on:
"opensuse-tumbleweed-python3.10",
"conda-forge",
"ubuntu-bionic-gcc_8-i386",
"debian-buster-i386",
"debian-bullseye-i386",
]
tox_packages_factors:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: 3.9
- name: Install pycodestyle
run: pip install tox pycodestyle
- name: Lint using pycodestyle
Expand All @@ -31,7 +31,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: 3.9
- name: Install relint
run: pip install tox relint
- name: Lint using relint
Expand All @@ -45,7 +45,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: 3.9
- name: Install tox
run: pip install tox
- name: Lint using tox -e rst
Expand Down
126 changes: 126 additions & 0 deletions .github/workflows/push_to_docker_hub.yml
Original file line number Diff line number Diff line change
@@ -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
27 changes: 0 additions & 27 deletions .zenodo.json

This file was deleted.

4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -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.beta0
doi: 10.5281/zenodo.593563
date-released: 2023-08-20
date-released: 2023-08-27
repository-code: "https://github.com/sagemath/sage"
url: "https://www.sagemath.org/"
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ in the Installation Guide.

3. [Linux, WSL] Install the required minimal build prerequisites.

- Compilers: `gcc`, `gfortran`, `g++` (GCC 8.x to 12.x and recent
versions of Clang (LLVM) are supported).
- Compilers: `gcc`, `gfortran`, `g++` (GCC versions from 8.4.0 to 13.x
and recent versions of Clang (LLVM) are supported).
See [build/pkgs/gcc/SPKG.rst](build/pkgs/gcc/SPKG.rst) and
[build/pkgs/gfortran/SPKG.rst](build/pkgs/gfortran/SPKG.rst)
for a discussion of suitable compilers.
Expand All @@ -201,7 +201,7 @@ in the Installation Guide.
more details.

- Python 3.4 or later, or Python 2.7, a full installation including
`urllib`; but ideally version 3.8.x, 3.9.x, or 3.10.x, which
`urllib`; but ideally version 3.9.x, 3.10.x, or 3.11.x, which
will avoid having to build Sage's own copy of Python 3.
See [build/pkgs/python3/SPKG.rst](build/pkgs/python3/SPKG.rst)
for more details.
Expand Down
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SageMath version 10.1, Release Date: 2023-08-20
SageMath version 10.2.beta0, Release Date: 2023-08-27
1 change: 0 additions & 1 deletion build/pkgs/_python3.8/distros/arch.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/_python3.8/distros/cygwin.txt

This file was deleted.

4 changes: 0 additions & 4 deletions build/pkgs/_python3.8/distros/debian.txt

This file was deleted.

2 changes: 0 additions & 2 deletions build/pkgs/_python3.8/distros/fedora.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/_python3.8/distros/freebsd.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/_python3.8/distros/homebrew.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/_python3.8/distros/macports.txt

This file was deleted.

2 changes: 0 additions & 2 deletions build/pkgs/_python3.8/distros/opensuse.txt

This file was deleted.

18 changes: 0 additions & 18 deletions build/pkgs/backports_zoneinfo/SPKG.rst

This file was deleted.

5 changes: 0 additions & 5 deletions build/pkgs/backports_zoneinfo/checksums.ini

This file was deleted.

4 changes: 0 additions & 4 deletions build/pkgs/backports_zoneinfo/dependencies

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/backports_zoneinfo/distros/conda.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/backports_zoneinfo/install-requires.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/backports_zoneinfo/package-version.txt

This file was deleted.

6 changes: 0 additions & 6 deletions build/pkgs/backports_zoneinfo/spkg-install.in

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/backports_zoneinfo/type

This file was deleted.

6 changes: 3 additions & 3 deletions build/pkgs/configure/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=configure-VERSION.tar.gz
sha1=15c6dc9764f4e9dfc526e7131483989b8ea72430
md5=c46a0fd95ab6860f6d7185ca467b1df2
cksum=427186534
sha1=d0a3737795390fc46d2cec3bf0f8c6548da2e08f
md5=10be304a3521209b8c8590824ef76587
cksum=602858466
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
aa220c4a1e34607d75d86b5abe022bd0c0358644
b1ba78aff8355d0e4fc4cdea6ec08a521303e327
6 changes: 3 additions & 3 deletions build/pkgs/cython/checksums.ini
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion build/pkgs/cython/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.29.32.p2
0.29.36
Loading

0 comments on commit acbce52

Please sign in to comment.