Skip to content

Commit f8caeeb

Browse files
author
Matthias Koeppe
committed
Merge tag '10.0.beta8' into residue_field_modularization
SageMath version 10.0.beta8, Release Date: 2023-04-06
2 parents e8ef99c + 27b077e commit f8caeeb

869 files changed

Lines changed: 37109 additions & 28383 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.

‎.codecov.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# https://docs.codecov.com/docs/pull-request-comments#disable-comment
22
comment: false
3+
# https://docs.codecov.com/docs/codecovyml-reference#codecov
4+
codecov:
5+
require_ci_to_pass: false
36
# https://docs.codecov.com/docs/commit-status
47
coverage:
58
status:

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ concurrency:
2323
jobs:
2424
build:
2525
runs-on: ubuntu-latest
26-
container: ghcr.io/sagemath/sage/sage-docker-${{ github.event.inputs.platform || 'ubuntu-focal-standard' }}-with-targets:${{ github.event.inputs.docker_tag || 'dev'}}
26+
container: ghcr.io/sagemath/sage/sage-${{ github.event.inputs.platform || 'ubuntu-focal-standard' }}-with-targets:${{ github.event.inputs.docker_tag || 'dev'}}
2727
steps:
2828
- name: Checkout
2929
id: checkout

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

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
- '*'
77
branches:
88
- 'public/build/**-runci'
9+
pull_request:
10+
types:
11+
- labeled
912
workflow_dispatch:
1013
# Allow to run manually
1114

@@ -19,6 +22,13 @@ jobs:
1922
name: Conda
2023
runs-on: ${{ matrix.os }}
2124

25+
# Run on push, workflow dispatch and when certain labels are added
26+
if: |
27+
github.event.action != 'labeled' ||
28+
github.event.label.name == 'c: packages: optional' ||
29+
github.event.label.name == 'c: packages: standard' ||
30+
github.event.label.name == 's: run conda ci'
31+
2232
strategy:
2333
fail-fast: false
2434
matrix:
@@ -84,13 +94,22 @@ jobs:
8494
echo "::remove-matcher owner=configure-system-package-warning::"
8595
echo "::remove-matcher owner=configure-system-package-error::"
8696
97+
# Manually install ptyprocess for now, until https://github.com/sagemath/sage/issues/32147 is fixed
98+
pip install --no-build-isolation -v -v ptyprocess==0.5.1
99+
87100
- name: Build
88101
shell: bash -l {0}
89102
run: |
90-
pip install --no-build-isolation -v -v -e ./pkgs/sage-conf ./pkgs/sage-setup
91-
pip install --no-build-isolation -v -v -e ./src
103+
# Use --no-deps and pip check below to verify that all necessary dependencies are installed via conda.
104+
pip install --no-build-isolation --no-deps -v -v -e ./pkgs/sage-conf ./pkgs/sage-setup
105+
pip install --no-build-isolation --no-deps -v -v -e ./src
92106
env:
93107
SAGE_NUM_THREADS: 2
108+
109+
- name: Verify dependencies
110+
if: always()
111+
shell: bash -l {0}
112+
run: pip check
94113

95114
- name: Test
96115
shell: bash -l {0}

‎.github/workflows/doc-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414
jobs:
1515
build-docs:
1616
runs-on: ubuntu-latest
17-
container: ghcr.io/sagemath/sage/sage-docker-ubuntu-focal-standard-with-targets:dev
17+
container: ghcr.io/sagemath/sage/sage-ubuntu-focal-standard-with-targets:dev
1818
steps:
1919
- name: Checkout
2020
uses: actions/checkout@v3

‎.github/workflows/doc-publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ jobs:
3131
uses: actions/github-script@v6.4.0
3232
with:
3333
script: |
34-
var artifacts = await github.actions.listWorkflowRunArtifacts({
34+
var artifacts = await github.rest.actions.listWorkflowRunArtifacts({
3535
owner: context.repo.owner,
3636
repo: context.repo.repo,
3737
run_id: ${{github.event.workflow_run.id }},
3838
});
3939
var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
4040
return artifact.name == "docs"
4141
})[0];
42-
var download = await github.actions.downloadArtifact({
42+
var download = await github.rest.actions.downloadArtifact({
4343
owner: context.repo.owner,
4444
repo: context.repo.repo,
4545
artifact_id: matchArtifact.id,

‎.zenodo.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"description": "Mirror of the Sage https://sagemath.org/ source tree",
33
"license": "other-open",
4-
"title": "sagemath/sage: 10.0.beta6",
5-
"version": "10.0.beta6",
4+
"title": "sagemath/sage: 10.0.beta8",
5+
"version": "10.0.beta8",
66
"upload_type": "software",
7-
"publication_date": "2023-03-26",
7+
"publication_date": "2023-04-06",
88
"creators": [
99
{
1010
"affiliation": "SageMath.org",
@@ -15,7 +15,7 @@
1515
"related_identifiers": [
1616
{
1717
"scheme": "url",
18-
"identifier": "https://github.com/sagemath/sage/tree/10.0.beta6",
18+
"identifier": "https://github.com/sagemath/sage/tree/10.0.beta8",
1919
"relation": "isSupplementTo"
2020
},
2121
{

‎VERSION.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 10.0.beta6, Release Date: 2023-03-26
1+
SageMath version 10.0.beta8, Release Date: 2023-04-06

‎bootstrap-conda‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ STRIP_COMMENTS="sed s/#.*//;"
1111
shopt -s extglob
1212

1313
DEVELOP_SPKG_PATTERN="@(_develop$(for a in $(head -n 1 build/pkgs/_develop/dependencies); do echo -n "|"$a; done))"
14-
1514
BOOTSTRAP_PACKAGES=$(echo $(${STRIP_COMMENTS} build/pkgs/_bootstrap/distros/conda.txt))
1615
SYSTEM_PACKAGES=
1716
OPTIONAL_SYSTEM_PACKAGES=
@@ -37,10 +36,13 @@ for PKG_BASE in $(sage-package list --has-file distros/conda.txt); do
3736
;;
3837
esac
3938
else
40-
case "$PKG_TYPE" in
41-
standard)
39+
case "$PKG_BASE:$PKG_TYPE" in
40+
*:standard)
4241
SAGELIB_SYSTEM_PACKAGES+=" $PKG_SYSTEM_PACKAGES"
4342
;;
43+
$DEVELOP_SPKG_PATTERN:*)
44+
DEVELOP_SYSTEM_PACKAGES+=" $PKG_SYSTEM_PACKAGES"
45+
;;
4446
*)
4547
SAGELIB_OPTIONAL_SYSTEM_PACKAGES+=" $PKG_SYSTEM_PACKAGES"
4648
;;

‎build/bin/sage-clone-source‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,13 @@ CONFBALL="$SRC/upstream/configure-$CONFVERSION.tar.gz"
3131
rm -rf "$DST"
3232
mkdir -p "$DST"
3333

34-
git clone --origin trac "$SRC" "$DST"
34+
git clone --origin upstream "$SRC" "$DST"
3535

3636
cd "$DST"
37-
git remote set-url trac "$SAGE_REPO_ANONYMOUS"
38-
git remote set-url --push trac "$SAGE_REPO_AUTHENTICATED"
37+
git remote set-url upstream "$SAGE_REPO_ANONYMOUS"
38+
git remote set-url --push upstream "do not push to upstream"
39+
git remote add trac https://github.com/sagemath/sagetrac-mirror.git
40+
git remote set-url --push trac "do not push to trac"
3941

4042
# Save space
4143
git gc --aggressive --prune=now

‎build/pkgs/argon2_cffi/dependencies‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$(PYTHON) six | $(PYTHON_TOOLCHAIN) cffi
1+
$(PYTHON) argon2_cffi_bindings | $(PYTHON_TOOLCHAIN) flit_core
22

33
----------
44
All lines of this file are ignored except the first.

0 commit comments

Comments
 (0)