Skip to content

Commit a179563

Browse files
dcoudertdcoudert
authored
Merge branch 'develop' into graphs/python_style_loops_in_graphs
2 parents f4609f6 + 6695bec commit a179563

File tree

622 files changed

+23734
-17457
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

622 files changed

+23734
-17457
lines changed

‎.github/workflows/dist.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
#
101101
CIBW_ARCHS: ${{ matrix.arch }}
102102
# https://cibuildwheel.readthedocs.io/en/stable/options/#requires-python
103-
CIBW_PROJECT_REQUIRES_PYTHON: ">=3.8"
103+
CIBW_PROJECT_REQUIRES_PYTHON: ">=3.9"
104104
# Environment during wheel build
105105
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"
106106
# Use 'build', not 'pip wheel'

‎.github/workflows/docker.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,23 @@ on:
1818
default: >-
1919
["ubuntu-trusty-toolchain-gcc_9",
2020
"ubuntu-xenial-toolchain-gcc_9",
21-
"ubuntu-bionic-gcc_8-python3.8",
2221
"ubuntu-focal",
2322
"ubuntu-jammy",
2423
"ubuntu-kinetic",
2524
"ubuntu-lunar",
2625
"ubuntu-mantic",
27-
"debian-buster",
26+
"debian-buster-gcc_spkg",
2827
"debian-bullseye",
2928
"debian-bookworm",
29+
"debian-trixie",
3030
"debian-sid",
31-
"linuxmint-19-gcc_8-python3.8",
32-
"linuxmint-19.3-gcc_8-python3.8",
3331
"linuxmint-20.1",
3432
"linuxmint-20.2",
3533
"linuxmint-20.3",
3634
"linuxmint-21",
3735
"linuxmint-21.1",
3836
"linuxmint-21.2",
39-
"fedora-29-python3.8",
40-
"fedora-30-python3.8",
37+
"fedora-30",
4138
"fedora-31",
4239
"fedora-32",
4340
"fedora-33",
@@ -61,7 +58,6 @@ on:
6158
"opensuse-tumbleweed-python3.10",
6259
"conda-forge",
6360
"ubuntu-bionic-gcc_8-i386",
64-
"debian-buster-i386",
6561
"debian-bullseye-i386",
6662
]
6763
tox_packages_factors:

‎.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Python
1818
uses: actions/setup-python@v4
1919
with:
20-
python-version: 3.8
20+
python-version: 3.9
2121
- name: Install pycodestyle
2222
run: pip install tox pycodestyle
2323
- name: Lint using pycodestyle
@@ -31,7 +31,7 @@ jobs:
3131
- name: Set up Python
3232
uses: actions/setup-python@v4
3333
with:
34-
python-version: 3.8
34+
python-version: 3.9
3535
- name: Install relint
3636
run: pip install tox relint
3737
- name: Lint using relint
@@ -45,7 +45,7 @@ jobs:
4545
- name: Set up Python
4646
uses: actions/setup-python@v4
4747
with:
48-
python-version: 3.8
48+
python-version: 3.9
4949
- name: Install tox
5050
run: pip install tox
5151
- name: Lint using tox -e rst

‎.github/workflows/push_to_docker_hub.yml

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
name: Build Docker images and push to DockerHub
2+
3+
on:
4+
workflow_dispatch:
5+
# Allow to run manually
6+
branches:
7+
- 'develop'
8+
- 'docker_hub_gha'
9+
push:
10+
tags:
11+
# Just create image on pushing a tag
12+
- '*'
13+
14+
jobs:
15+
sagemath-dev:
16+
name: Build Docker image on target make-build and push to DockerHub sagemath-dev
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v3
21+
22+
- name: Set tag
23+
# docker/metadata-action@v4 is not used since we need to distinguish
24+
# between latest and develop tags
25+
id: set_tag
26+
run: |
27+
git fetch --depth=1 origin +refs/tags/*:refs/tags/*
28+
TAG_NAME=$(git tag --sort=v:refname | tail -1)
29+
TAG="sagemath/sagemath-dev:$TAG_NAME"
30+
TAG_LIST="$TAG, sagemath/sagemath-dev:develop"
31+
TAG_LIST="$TAG" # don't tag develop until meaning of sagemath-dev is clear
32+
echo "TAG_NAME=$TAG_NAME" >> $GITHUB_ENV
33+
echo "TAG=$TAG" >> $GITHUB_ENV
34+
echo "TAG_LIST=$TAG_LIST" >> $GITHUB_ENV
35+
36+
- name: Update Tag List
37+
id: upd_tag_list
38+
run: |
39+
TAG_LIST="${{ env.TAG_LIST }}, sagemath/sagemath-dev:latest"
40+
TAG_LIST="${{ env.TAG_LIST }}" # don't tag latest until meaning of sagemath-dev is clear
41+
echo "TAG_LIST=$TAG_LIST" >> $GITHUB_ENV
42+
if: "!contains(env.TAG_NAME, 'beta') && !contains(env.TAG_NAME, 'rc')"
43+
44+
- name: Check env
45+
run: |
46+
echo ${{ env.TAG_NAME }}
47+
echo ${{ env.TAG }}
48+
echo ${{ env.TAG_LIST }}
49+
50+
- name: Set up QEMU
51+
uses: docker/setup-qemu-action@v2
52+
53+
- name: Set up Docker Buildx
54+
uses: docker/setup-buildx-action@v2
55+
56+
- name: Login to Docker Hub
57+
uses: docker/login-action@v2
58+
with:
59+
username: ${{ secrets.DOCKERHUB_USERNAME }}
60+
password: ${{ secrets.DOCKERHUB_TOKEN }}
61+
62+
- name: Build and push make-build
63+
uses: docker/build-push-action@v4
64+
with:
65+
context: .
66+
file: docker/Dockerfile
67+
target: make-build # see the corresponding header-note
68+
push: true
69+
tags: ${{ env.TAG_LIST }}
70+
cache-from: type=gha
71+
cache-to: type=gha,mode=max
72+
73+
sagemath:
74+
needs: sagemath-dev
75+
name: Build Docker image on target sagemath and push to DockerHub sagemath
76+
runs-on: ubuntu-latest
77+
steps:
78+
- name: Checkout
79+
uses: actions/checkout@v3
80+
81+
- name: Set tag
82+
# docker/metadata-action@v4 is not used since we need to distinguish
83+
# between latest and develop tags
84+
id: set_tag
85+
run: |
86+
git fetch --depth=1 origin +refs/tags/*:refs/tags/*
87+
TAG_NAME=$(git tag --sort=v:refname | tail -1)
88+
TAG="sagemath/sagemath:$TAG_NAME"
89+
TAG_LIST="$TAG, sagemath/sagemath:develop"
90+
BASE="sagemath/sagemath-dev:$TAG_NAME"
91+
echo "TAG_NAME=$TAG_NAME" >> $GITHUB_ENV
92+
echo "TAG=$TAG" >> $GITHUB_ENV
93+
echo "TAG_LIST=$TAG_LIST" >> $GITHUB_ENV
94+
echo "BASE=$BASE" >> $GITHUB_ENV
95+
96+
- name: Update Tag List
97+
id: upd_tag_list
98+
run: |
99+
TAG_LIST="${{ env.TAG_LIST }}, sagemath/sagemath:latest"
100+
echo "TAG_LIST=$TAG_LIST" >> $GITHUB_ENV
101+
if: "!contains(env.TAG_NAME, 'beta') && !contains(env.TAG_NAME, 'rc')"
102+
103+
- name: Set up QEMU
104+
uses: docker/setup-qemu-action@v2
105+
106+
- name: Set up Docker Buildx
107+
uses: docker/setup-buildx-action@v2
108+
109+
- name: Login to Docker Hub
110+
uses: docker/login-action@v2
111+
with:
112+
username: ${{ secrets.DOCKERHUB_USERNAME }}
113+
password: ${{ secrets.DOCKERHUB_TOKEN }}
114+
115+
- name: Build and push sagemath
116+
uses: docker/build-push-action@v4
117+
with:
118+
context: .
119+
file: docker/Dockerfile
120+
build-args: |
121+
MAKE_BUILD=${{ env.BASE }}
122+
target: sagemath
123+
push: true
124+
tags: ${{ env.TAG_LIST }}
125+
cache-from: type=gha
126+
cache-to: type=gha,mode=max

‎.zenodo.json

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎CITATION.cff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ title: SageMath
44
abstract: SageMath is a free open-source mathematics software system.
55
authors:
66
- name: "The SageMath Developers"
7-
version: 10.1
7+
version: 10.2.beta0
88
doi: 10.5281/zenodo.593563
9-
date-released: 2023-08-20
9+
date-released: 2023-08-27
1010
repository-code: "https://github.com/sagemath/sage"
1111
url: "https://www.sagemath.org/"

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ in the Installation Guide.
189189

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

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

203203
- Python 3.4 or later, or Python 2.7, a full installation including
204-
`urllib`; but ideally version 3.8.x, 3.9.x, or 3.10.x, which
204+
`urllib`; but ideally version 3.9.x, 3.10.x, or 3.11.x, which
205205
will avoid having to build Sage's own copy of Python 3.
206206
See [build/pkgs/python3/SPKG.rst](build/pkgs/python3/SPKG.rst)
207207
for more details.

‎VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 10.1, Release Date: 2023-08-20
1+
SageMath version 10.2.beta0, Release Date: 2023-08-27

‎build/pkgs/_python3.8/distros/arch.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎build/pkgs/_python3.8/distros/cygwin.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)