Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
Merge tag '9.6.rc3' into t/33295/refactor_sage_conf
Browse files Browse the repository at this point in the history
SageMath version 9.6.rc3, Release Date: 2022-04-29
  • Loading branch information
Matthias Koeppe committed May 3, 2022
2 parents 70c2e95 + eb1a786 commit ffb5344
Show file tree
Hide file tree
Showing 2,006 changed files with 143,970 additions and 29,436 deletions.
64 changes: 64 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: Build & Test

on:
push:
workflow_dispatch:
# Allow to run manually

concurrency:
# Cancel previous runs of this workflow for the same branch
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build:
runs-on: ubuntu-latest
container: ghcr.io/sagemath/sage/sage-docker-ubuntu-focal-standard-with-targets:dev
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Set up node to install pyright
uses: actions/setup-node@v1
with:
node-version: '12'

- name: Install pyright
# Fix to v232 due to bug https://github.com/microsoft/pyright/issues/3239
run: npm install -g [email protected]

- name: Prepare
run: |
# Reuse built SAGE_LOCAL contained in the Docker image
./bootstrap
./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv --enable-editable --enable-download-from-upstream-url
# Install test tools
apt-get install -y git
- name: Static code check with pyright
run: pyright

- name: Build
run: make build
env:
MAKE: make -j2
SAGE_NUM_THREADS: 2

- name: Test
run: |
../sage -python -m pip install coverage
../sage -python -m coverage run ./bin/sage-runtests --all -p2
working-directory: ./src

- name: Prepare coverage results
if: always()
run: |
./venv/bin/python3 -m coverage combine src/.coverage/
./venv/bin/python3 -m coverage xml
find . -name *coverage*
- name: Upload coverage to codecov
if: always()
uses: codecov/codecov-action@v2
with:
files: ./coverage.xml
107 changes: 107 additions & 0 deletions .github/workflows/ci-conda.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
name: Build & Test using Conda

on:
pull_request:
types: [opened, synchronize]
push:
tags:
- '*'
branches:
- 'public/build/**-runci'
workflow_dispatch:
# Allow to run manually

concurrency:
# Cancel previous runs of this workflow for the same branch
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
name: Conda
runs-on: ${{ matrix.os }}

strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest]
python: [3.8, 3.9]
conda-env: [environment, environment-optional]

steps:
- uses: actions/checkout@v2

- name: Check for Miniconda
id: check_conda
run: echo ::set-output name=installed::$CONDA

# Miniconda is installed by default in the ubuntu-latest, however not in the act-image to run it locally
- name: Install Miniconda
if: steps.check_conda.outputs.installed == ''
run: |
wget https://repo.anaconda.com/miniconda/Miniconda3-py39_4.10.3-Linux-x86_64.sh -O ~/miniconda.sh
bash ~/miniconda.sh -b -p $HOME/miniconda
echo "CONDA=$HOME/miniconda" >> $GITHUB_ENV
- name: Install bootstrap prerequisites
run: |
export PATH="$(pwd)/build/bin:$PATH"
SYSTEM=$(sage-guess-package-system)
eval $(sage-print-system-package-command $SYSTEM --sudo install $(sage-get-system-packages $SYSTEM _bootstrap))
# Create conda environment file
- name: Bootstrap
run: ./bootstrap

- name: Cache conda packages
uses: actions/cache@v2
with:
path: ~/conda_pkgs_dir
key:
${{ runner.os }}-conda-${{ hashFiles('src/environment.yml') }}

- name: Setup Conda
uses: conda-incubator/setup-miniconda@v2
with:
python-version: ${{ matrix.python }}
mamba-version: "*"
channels: conda-forge,defaults
channel-priority: true
activate-environment: sage-build
environment-file: src/${{ matrix.conda-env }}.yml

- name: Print Conda environment
shell: bash -l {0}
run: |
conda info
conda list
- name: Configure
shell: bash -l {0}
continue-on-error: true
run: |
echo "::add-matcher::.github/workflows/configure-systempackage-problem-matcher.json"
./configure --enable-build-as-root --with-python=$CONDA_PREFIX/bin/python --prefix=$CONDA_PREFIX $(for pkg in $(./sage -package list :standard: --has-file spkg-configure.m4 --has-file distros/conda.txt); do echo --with-system-$pkg=force; done)
echo "::remove-matcher owner=configure-system-package-warning::"
echo "::remove-matcher owner=configure-system-package-error::"
- name: Build
shell: bash -l {0}
run: |
pip install --no-build-isolation -v -v -e pkgs/sage-conf pkgs/sage-setup
pip install --no-build-isolation -v -v -e src
env:
SAGE_NUM_THREADS: 2

- name: Test
shell: bash -l {0}
run: ./sage -t --all -p0

- name: Print logs
run: |
for file in $(find . -type f -name "*.log"); do
echo "::group::$file"
cat "$file"
echo "::endgroup::"
done
if: always()
34 changes: 17 additions & 17 deletions .github/workflows/ci-cygwin-minimal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- name: tox
run: |
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- name: tox
run: |
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -217,7 +217,7 @@ jobs:
env:
STAGE: ii-b
PREVIOUS_STAGES: i-*
TARGETS: singular maxima gap pari gfan palp flintqs ratpoints arb ecm givaro
TARGETS: singular maxima gap pari gfan palp flintqs arb ecm givaro
LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}

Expand All @@ -238,7 +238,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -306,7 +306,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -353,7 +353,7 @@ jobs:
env:
STAGE: ii-d
PREVIOUS_STAGES: i-*
TARGETS: ipython ipywidgets notebook thebe
TARGETS: ipython ipywidgets notebook
LOCAL_ARTIFACT_NAME: sage-local-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}
LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-cygwin-${{ matrix.pkgs }}

Expand All @@ -374,7 +374,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -442,7 +442,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -514,7 +514,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -586,7 +586,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -658,7 +658,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -728,7 +728,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -796,7 +796,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -864,7 +864,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -932,7 +932,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -1000,7 +1000,7 @@ jobs:
shell: bash {0}
run: |
choco --version
PACKAGES="python38 python38-pip"
PACKAGES="python39 python39-pip"
choco install $PACKAGES --source cygwin
- uses: actions/download-artifact@v2
with:
Expand Down
Loading

0 comments on commit ffb5344

Please sign in to comment.