Skip to content

Commit b6ee3a2

Browse files
gmou3gmou3
committed
Merge tag '10.4.rc1' into docstrings_var_type_after_doubledash
SageMath version 10.4.rc1, Release Date: 2024-06-27
2 parents 5696a97 + b7dd28d commit b6ee3a2

100 files changed

Lines changed: 12199 additions & 13253 deletions

File tree

Some content is hidden

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

‎.github/workflows/ci-conda-known-test-failures.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@
5353
"sage.rings.function_field.drinfeld_modules.morphism": {
5454
"failed": "unreported random failure seen in https://github.com/sagemath/sage/actions/runs/6840502530/job/18599835766#step:11:10107"
5555
},
56+
"sage.rings.number_field.galois_group": {
57+
"failed": "unreported failure on macOS (sort order) in GaloisGroup_v2.artin_symbol, https://github.com/sagemath/sage/actions/runs/9525536510/job/26259809272?pr=37998"
58+
},
59+
"sage.rings.number_field.number_field": {
60+
"failed": "unreported failure on macOS (sort order) in NumberField_absolute.[optimized_]subfields, https://github.com/sagemath/sage/actions/runs/9525536510/job/26259809272?pr=37998"
61+
},
5662
"sage.rings.polynomial.multi_polynomial_ideal": {
5763
"failed": true
5864
},
@@ -65,6 +71,9 @@
6571
"sage.rings.polynomial.skew_polynomial_finite_field": {
6672
"failed": true
6773
},
74+
"sage.rings.qqbar": {
75+
"failed": "unreported failure on macOS seen in https://github.com/sagemath/sage/actions/runs/9525536510/job/26259809272?pr=37998"
76+
},
6877
"sage.schemes.elliptic_curves.descent_two_isogeny": {
6978
"failed": "random segfault (macOS) https://github.com/sagemath/sage/issues/36949"
7079
},

‎.github/workflows/ci-conda.yml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,16 @@ concurrency:
1818
jobs:
1919
test:
2020
name: Conda
21-
runs-on: ${{ matrix.os }}-latest
21+
runs-on: ${{ matrix.os }}
2222

2323
strategy:
24+
fail-fast: false
2425
matrix:
2526
# On pushes to tags or branches, test the whole matrix.
2627
os: >-
2728
${{ github.event_name == 'pull_request'
28-
&& fromJson('["ubuntu"]')
29-
|| fromJson('["ubuntu", "macos"]') }}
29+
&& fromJson('["ubuntu-latest"]')
30+
|| fromJson('["ubuntu-latest", "macos-latest", "macos-13"]') }}
3031
python: >-
3132
${{ github.event_name == 'pull_request'
3233
&& fromJson('["3.9"]')
@@ -35,12 +36,12 @@ jobs:
3536
# environment: [environment, environment-optional]
3637
conda-env: [environment]
3738
# On pull requests, only test two jobs:
38-
# Ubuntu with Python 3.9, macOS with Python 3.11.
39+
# Ubuntu with Python 3.9, macOS (arm64) with Python 3.11.
3940
# Build & Test currently uses Python 3.10 (on ubuntu-jammy).
4041
# Together, they cover the supported minor Python versions.
4142
include: >-
4243
${{ github.event_name == 'pull_request'
43-
&& fromJson('[{"os": "macos", "python": "3.11", "conda-env": "environment"}]')
44+
&& fromJson('[{"os": "macos-latest", "python": "3.11", "conda-env": "environment"}]')
4445
|| fromJson('[]') }}
4546
4647
steps:
@@ -69,7 +70,7 @@ jobs:
6970
channels: conda-forge
7071
channel-priority: true
7172
activate-environment: sage
72-
environment-file: src/${{ matrix.conda-env }}-${{ matrix.python }}-${{ startsWith(matrix.os, 'macos') && 'macos' || 'linux' }}.yml
73+
environment-file: src/${{ matrix.conda-env }}-${{ matrix.python }}-${{ startsWith(matrix.os, 'macos') && (startsWith(runner.arch, 'ARM') && 'macos' || 'macos-x86_64') || 'linux' }}.yml
7374

7475
- name: Print Conda environment
7576
shell: bash -l {0}
@@ -89,8 +90,8 @@ jobs:
8990
# Use --no-deps and pip check below to verify that all necessary dependencies are installed via conda.
9091
pip install --no-build-isolation --no-deps --config-settings editable_mode=compat -v -v -e ./src
9192
env:
92-
SAGE_NUM_THREADS: 2
93-
93+
SAGE_NUM_THREADS: 5
94+
9495
- name: Verify dependencies
9596
if: success() || failure()
9697
shell: bash -l {0}

‎.github/workflows/conda-lock-update.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
platforms = {
1212
"linux-64": "linux",
1313
"linux-aarch64": "linux-aarch64",
14-
"osx-64": "macos",
15-
"osx-arm64": "macos-arm64"
14+
"osx-64": "macos-x86_64",
15+
"osx-arm64": "macos"
1616
#"win-64": "win",
1717
}
1818
pythons = ["3.9", "3.10", "3.11"]

‎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.4.rc0
7+
version: 10.4.rc1
88
doi: 10.5281/zenodo.8042260
9-
date-released: 2024-06-22
9+
date-released: 2024-06-27
1010
repository-code: "https://github.com/sagemath/sage"
1111
url: "https://www.sagemath.org/"

‎VERSION.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 10.4.rc0, Release Date: 2024-06-22
1+
SageMath version 10.4.rc1, Release Date: 2024-06-27

‎build/pkgs/_prereq/distros/conda.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# One package per line. No need to escape special characters.
88
# Everything on a line after a # character is ignored.
99
#
10-
compilers<=1.6.0 # 1.7 pulls in c-compiler v.16
10+
compilers
1111
make
1212
m4
1313
perl

‎build/pkgs/configure/checksums.ini‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=44fc3d7b5ad99c9b59153bf24d2a982eb690d5c2
3-
sha256=4e9e0fada9495365f673f83de311d7dbbc1fbcf9e5f7163209cf396c4ccd5479
2+
sha1=7e1e01d82e171303935202d5876e0c109d431f8b
3+
sha256=eec0d494a20c6eff61a1ccc679cca149efd78cb191f88ade0446468b45abee00

‎build/pkgs/configure/package-version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
b7e60e161981964b92657e427662fa6e69938428
1+
19bd20218effcdb6b242bfb18b113ff85c6d8497

‎build/pkgs/gap/distros/conda.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
gap-defaults>=4.12.2
1+
gap-defaults>=4.12.2,<4.13.0

‎build/pkgs/gap/spkg-configure.m4‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,21 @@ SAGE_SPKG_CONFIGURE([gap], [
33
sage_spkg_install_gap=yes
44
55
m4_pushdef([GAP_MINVER],["4.12.2"])
6+
m4_pushdef([GAP_LTVER],["4.13.0"])
67
78
SAGE_SPKG_DEPCHECK([ncurses readline zlib], [
89
AC_PATH_PROG(GAP, gap)
910
AS_IF([test -n "${GAP}"], [
10-
AC_MSG_CHECKING([for gap version GAP_MINVER or newer])
11-
12-
# GAP will later add the "user" path to the list of root paths
13-
# so long as we don't initialize GAP with -r in Sage. But we
14-
# don't want to include it in the hard-coded list.
11+
AC_MSG_CHECKING([for gap version >= GAP_MINVER, < GAP_LTVER])
12+
dnl GAP will later add the "user" path to the list of root paths
13+
dnl so long as we don't initialize GAP with -r in Sage. But we
14+
dnl don't want to include it in the hard-coded list.
1515
GAPRUN="${GAP} -r -q --bare --nointeract -c"
1616
_cmd='Display(GAPInfo.KernelInfo.KERNEL_VERSION);'
1717
GAP_VERSION=$( ${GAPRUN} "${_cmd}" 2>/dev/null )
18-
AX_COMPARE_VERSION(["${GAP_VERSION}"], [ge], [GAP_MINVER], [
18+
AX_COMPARE_VERSION(["${GAP_VERSION}"], [ge], [GAP_MINVER], [dnl
19+
AC_MSG_RESULT([yes])
20+
AX_COMPARE_VERSION(["${GAP_VERSION}"], [lt], [GAP_LTVER], [dnl
1921
AC_MSG_RESULT([yes])
2022
AC_MSG_CHECKING([for gap root paths])
2123
_cmd='Display(JoinStringsWithSeparator(GAPInfo.RootPaths,";"));'
@@ -66,18 +68,20 @@ SAGE_SPKG_CONFIGURE([gap], [
6668
AC_LANG_POP
6769
LIBS="${_old_libs}"
6870
])
69-
], [
70-
# The gap command itself failed
71+
], [dnl The gap command itself failed
7172
AC_MSG_RESULT([no (package check command failed)])
7273
])
7374
])
74-
],[
75-
# Version too old
75+
], [dnl Version too new
7676
AC_MSG_RESULT([no])
7777
])
78+
], [dnl Version too old
79+
AC_MSG_RESULT([no])
80+
])
7881
])
7982
])
8083
84+
m4_popdef([GAP_LTVER])
8185
m4_popdef([GAP_MINVER])
8286
],[],[],[
8387
# This is the post-check phase, where we make sage-conf

0 commit comments

Comments
 (0)