Skip to content
This repository was archived by the owner on Feb 1, 2023. It is now read-only.

Commit 99c4ffd

Browse files
tobiasdieztobiasdiez
committed
Merge branch 'develop' of git://github.com/sagemath/sage into public/build/pytest_config
2 parents 72ae90f + c4a802d commit 99c4ffd

File tree

1,558 files changed

+6772
-6011
lines changed

Some content is hidden

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

1,558 files changed

+6772
-6011
lines changed

‎.github/workflows/ci-cygwin-standard.yml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ jobs:
205205
path: C:\\tools\\cygwin\\tmp
206206
- name: Extract sage-local artifact
207207
run: |
208-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-${{ env.PREVIOUS_STAGES }}.tar'
208+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null local'
209209
- name: configure
210210
run: |
211211
C:\\tools\\cygwin\\bin\\bash -l -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && ./configure $CONFIGURE_ARGS'
@@ -233,7 +233,7 @@ jobs:
233233
# We specifically use the cygwin tar so that symlinks are saved/restored correctly on Windows.
234234
# We remove the local/lib64 link, which will be recreated by the next stage.
235235
run: |
236-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --remove-files local'
236+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --listed-incremental=/tmp/sage-local.snar local'
237237
if: always()
238238
- uses: actions/upload-artifact@v2
239239
# upload-artifact@v2 does not support whitespace in file names.
@@ -285,7 +285,7 @@ jobs:
285285
path: C:\\tools\\cygwin\\tmp
286286
- name: Extract sage-local artifact
287287
run: |
288-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-${{ env.PREVIOUS_STAGES }}.tar'
288+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null local'
289289
- name: configure
290290
run: |
291291
C:\\tools\\cygwin\\bin\\bash -l -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && ./configure $CONFIGURE_ARGS'
@@ -313,7 +313,7 @@ jobs:
313313
# We specifically use the cygwin tar so that symlinks are saved/restored correctly on Windows.
314314
# We remove the local/lib64 link, which will be recreated by the next stage.
315315
run: |
316-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --remove-files local'
316+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --listed-incremental=/tmp/sage-local.snar local'
317317
if: always()
318318
- uses: actions/upload-artifact@v2
319319
with:
@@ -363,7 +363,7 @@ jobs:
363363
path: C:\\tools\\cygwin\\tmp
364364
- name: Extract sage-local artifact
365365
run: |
366-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-${{ env.PREVIOUS_STAGES }}.tar'
366+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null local'
367367
- name: configure
368368
run: |
369369
C:\\tools\\cygwin\\bin\\bash -l -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && ./configure $CONFIGURE_ARGS'
@@ -391,7 +391,7 @@ jobs:
391391
# We specifically use the cygwin tar so that symlinks are saved/restored correctly on Windows.
392392
# We remove the local/lib64 link, which will be recreated by the next stage.
393393
run: |
394-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --remove-files local'
394+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --listed-incremental=/tmp/sage-local.snar local'
395395
if: always()
396396
- uses: actions/upload-artifact@v2
397397
with:
@@ -441,7 +441,7 @@ jobs:
441441
path: C:\\tools\\cygwin\\tmp
442442
- name: Extract sage-local artifact
443443
run: |
444-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-${{ env.PREVIOUS_STAGES }}.tar'
444+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null local'
445445
- name: configure
446446
run: |
447447
C:\\tools\\cygwin\\bin\\bash -l -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && ./configure $CONFIGURE_ARGS'
@@ -469,7 +469,7 @@ jobs:
469469
# We specifically use the cygwin tar so that symlinks are saved/restored correctly on Windows.
470470
# We remove the local/lib64 link, which will be recreated by the next stage.
471471
run: |
472-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --remove-files local'
472+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --listed-incremental=/tmp/sage-local.snar local'
473473
if: always()
474474
- uses: actions/upload-artifact@v2
475475
with:
@@ -519,7 +519,7 @@ jobs:
519519
path: C:\\tools\\cygwin\\tmp
520520
- name: Extract sage-local artifact
521521
run: |
522-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-${{ env.PREVIOUS_STAGES }}.tar'
522+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null local'
523523
- name: configure
524524
run: |
525525
C:\\tools\\cygwin\\bin\\bash -l -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && ./configure $CONFIGURE_ARGS'
@@ -547,7 +547,7 @@ jobs:
547547
# We specifically use the cygwin tar so that symlinks are saved/restored correctly on Windows.
548548
# We remove the local/lib64 link, which will be recreated by the next stage.
549549
run: |
550-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --remove-files local'
550+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --listed-incremental=/tmp/sage-local.snar local'
551551
if: always()
552552
- uses: actions/upload-artifact@v2
553553
with:
@@ -599,7 +599,7 @@ jobs:
599599
path: C:\\tools\\cygwin\\tmp
600600
- name: Extract sage-local artifact
601601
run: |
602-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-${{ env.PREVIOUS_STAGES }}.tar'
602+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null local'
603603
- name: configure
604604
run: |
605605
C:\\tools\\cygwin\\bin\\bash -l -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && ./configure $CONFIGURE_ARGS'
@@ -627,7 +627,7 @@ jobs:
627627
# We specifically use the cygwin tar so that symlinks are saved/restored correctly on Windows.
628628
# We remove the local/lib64 link, which will be recreated by the next stage.
629629
run: |
630-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --remove-files local'
630+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --listed-incremental=/tmp/sage-local.snar local'
631631
if: always()
632632
- uses: actions/upload-artifact@v2
633633
with:
@@ -679,7 +679,7 @@ jobs:
679679
path: C:\\tools\\cygwin\\tmp
680680
- name: Extract sage-local artifact
681681
run: |
682-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-${{ env.PREVIOUS_STAGES }}.tar'
682+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null local'
683683
- name: configure
684684
run: |
685685
C:\\tools\\cygwin\\bin\\bash -l -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && ./configure $CONFIGURE_ARGS'
@@ -707,7 +707,7 @@ jobs:
707707
# We specifically use the cygwin tar so that symlinks are saved/restored correctly on Windows.
708708
# We remove the local/lib64 link, which will be recreated by the next stage.
709709
run: |
710-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --remove-files local'
710+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --listed-incremental=/tmp/sage-local.snar local'
711711
if: always()
712712
- uses: actions/upload-artifact@v2
713713
with:
@@ -757,7 +757,7 @@ jobs:
757757
path: C:\\tools\\cygwin\\tmp
758758
- name: Extract sage-local artifact
759759
run: |
760-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-${{ env.PREVIOUS_STAGES }}.tar'
760+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null local'
761761
- name: configure
762762
run: |
763763
C:\\tools\\cygwin\\bin\\bash -l -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && ./configure $CONFIGURE_ARGS'
@@ -785,7 +785,7 @@ jobs:
785785
# We specifically use the cygwin tar so that symlinks are saved/restored correctly on Windows.
786786
# We remove the local/lib64 link, which will be recreated by the next stage.
787787
run: |
788-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --remove-files local'
788+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --listed-incremental=/tmp/sage-local.snar local'
789789
if: always()
790790
- uses: actions/upload-artifact@v2
791791
with:
@@ -835,7 +835,7 @@ jobs:
835835
path: C:\\tools\\cygwin\\tmp
836836
- name: Extract sage-local artifact
837837
run: |
838-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-${{ env.PREVIOUS_STAGES }}.tar'
838+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && .github/workflows/extract-sage-local.sh /tmp/sage-local-*.tar && tar --create --listed-incremental=/tmp/sage-local.snar --file /dev/null local'
839839
- name: configure
840840
run: |
841841
C:\\tools\\cygwin\\bin\\bash -l -c 'export PATH=/usr/local/bin:/usr/bin && cd $(cygpath -u "$GITHUB_WORKSPACE") && ./configure $CONFIGURE_ARGS'
@@ -863,7 +863,7 @@ jobs:
863863
# We specifically use the cygwin tar so that symlinks are saved/restored correctly on Windows.
864864
# We remove the local/lib64 link, which will be recreated by the next stage.
865865
run: |
866-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --remove-files local'
866+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --listed-incremental=/tmp/sage-local.snar local'
867867
if: always()
868868
- uses: actions/upload-artifact@v2
869869
with:
@@ -941,7 +941,7 @@ jobs:
941941
# We specifically use the cygwin tar so that symlinks are saved/restored correctly on Windows.
942942
# We remove the local/lib64 link, which will be recreated by the next stage.
943943
run: |
944-
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --remove-files local'
944+
C:\\tools\\cygwin\\bin\\bash -l -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && rm -f local/lib64; tar -cf /tmp/sage-local-${{ env.STAGE }}.tar --listed-incremental=/tmp/sage-local.snar local'
945945
if: always()
946946
- uses: actions/upload-artifact@v2
947947
with:

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

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
name: Build & Test WSL
22

3-
on: [push, pull_request]
3+
on:
4+
pull_request:
5+
types: [opened, synchronize]
6+
push:
7+
tags:
8+
- '*'
9+
branches:
10+
- 'public/build/**wsl**'
11+
workflow_dispatch:
412

513
jobs:
614
windows:
715
runs-on: windows-latest
8-
name: Windows (using WSL)
16+
name: Ubuntu 20.04
917
# Following https://trac.sagemath.org/ticket/25206#comment:63
1018
steps:
1119
- name: Configure git
@@ -18,22 +26,10 @@ jobs:
1826
Ubuntu\ubuntu2004.exe install --root
1927
- name: Install dependencies
2028
run: |
21-
Function ExtractPackages
22-
{
23-
param($path)
24-
@(Get-Content $path | Where-Object { !$_.StartsWith("#") })
25-
}
26-
$packages = Get-ChildItem build/pkgs -recurse -Include debian.txt, debian-bootstrap.txt | foreach-object { ExtractPackages $_.FullName } | sort -Unique
27-
# Add tox which is use to build
28-
$packages += 'tox'
29-
echo "Install the following packages:" @packages
30-
# Add deadsnakes so that libpython3.7-dev is found
31-
& wsl sudo add-apt-repository ppa:deadsnakes/ppa
32-
# Install
33-
& wsl sudo apt-get update -y
34-
& wsl sudo apt-get install -y @packages
29+
wsl sudo apt-get update -y
30+
wsl sudo apt-get install -y tox
3531
- name: Build
36-
run: wsl tox -e local -- SAGE_NUM_THREADS=4 build
32+
run: wsl tox -e local-sudo-ubuntu-standard -- SAGE_NUM_THREADS=4 build
3733
env:
3834
# WSL runs everything as root, so we have to enable build as root user
3935
EXTRA_CONFIGURE_ARGS: "--enable-build-as-root"
@@ -42,7 +38,7 @@ jobs:
4238
MAKE: "make -j2"
4339
WSLENV: EXTRA_CONFIGURE_ARGS:MAKE
4440
- name: Test
45-
run: wsl tox -e local -- SAGE_NUM_THREADS=4 ptest
41+
run: wsl tox -e local-sudo-ubuntu-standard -- SAGE_NUM_THREADS=4 ptest
4642
- name: Prepare logs artifact
4743
run: mkdir -p "artifacts/logs"; cp -r .tox/*/log "artifacts/logs"
4844
shell: bash

‎.github/workflows/tox-experimental.yml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737
max-parallel: 6
3838
matrix:
39-
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, centos-7, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-eoan-i386, debian-buster-i386, centos-7-i386]
39+
tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7, centos-8, gentoo, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-focal-i386, debian-buster-i386, centos-7-i386]
4040
tox_packages_factor: [maximal]
4141
targets_pattern: [0-g, h-o, p, q-z]
4242
env:
@@ -99,20 +99,25 @@ jobs:
9999

100100
local-macos:
101101

102-
runs-on: macos-latest
102+
runs-on: ${{ matrix.os }}
103103
strategy:
104104
fail-fast: false
105105
max-parallel: 3
106106
matrix:
107+
os: [ macos-10.15, macos-11.0 ]
107108
tox_system_factor: [homebrew-macos, homebrew-macos-python3_xcode, homebrew-macos-python3_xcode-nokegonly, homebrew-macos-python3_pythonorg, conda-forge-macos]
108109
tox_packages_factor: [maximal]
109110
targets_pattern: [0-g, h-o, p, q-z]
111+
xcode_version_factor: [11.7, default, 12.3]
110112
env:
111113
TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
112-
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
114+
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}
113115
TARGETS_OPTIONAL: "$( echo $(PATH=build/bin:$PATH build/bin/sage-package list :experimental: | grep -v database_stein_watkins\\$ | grep -v polytopes_db_4d | grep '^[${{ matrix.targets_pattern }}]' ) )"
114116
steps:
115117
- uses: actions/checkout@v2
118+
- name: Select Xcode version
119+
run: |
120+
if [ ${{ matrix.xcode_version_factor }} != default ]; then sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode_version_factor }}.app; fi
116121
- name: Install test prerequisites
117122
run: |
118123
brew install tox

0 commit comments

Comments
 (0)