From 525be8b679e262052f7a8c5875f4b0ec0a21350e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Tue, 21 Jan 2025 15:39:53 -0300 Subject: [PATCH 1/5] ci.yml: remove cygwin (broken, see #218) --- .github/workflows/ci.yml | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3cc1413..36d64ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,37 +51,6 @@ concurrency: cancel-in-progress: true jobs: - cygwin: - runs-on: windows-latest - strategy: - fail-fast: false - matrix: - python-version-start: [python-3] - python-version: [9] - steps: - - run: | - git config --global core.autocrlf false - git config --global core.symlinks true - - name: Set up the repository - uses: actions/checkout@v4 - with: - submodules: recursive - fetch-depth: 0 - - name: Set up Cygwin - uses: egor-tensin/setup-cygwin@v4 - with: - packages: gcc-core gcc-g++ python3${{ matrix.python-version }}-devel ninja pkgconf - - name: Install dependencies - shell: C:\tools\cygwin\bin\bash.exe --norc -eo pipefail -o igncr '{0}' - run: | - python3.${{ matrix.python-version }} -m pip install --upgrade pip - python3.${{ matrix.python-version }} -m pip install --upgrade -r ./requirements.txt - - name: Build and check - shell: C:\tools\cygwin\bin\bash.exe --norc -eo pipefail -o igncr '{0}' - run: | - pip install --no-build-isolation --config-settings=builddir=builddir . - meson test --print-errorlogs -C builddir - ci: name: CI (${{ matrix.os }} with Python ${{ matrix.python-version }}) runs-on: ${{ matrix.os }} From fa5548f64baa7c4fa1b5e584f45167590df23d90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Tue, 21 Jan 2025 15:40:52 -0300 Subject: [PATCH 2/5] ci.yml: remove outdated comment --- .github/workflows/ci.yml | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 36d64ad..3e6d192 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,41 +1,5 @@ name: CI -## This GitHub Actions workflow provides: -## -## - portability testing, by building and testing this project on many platforms -## (Linux variants and Cygwin), each with two configurations (installed packages), -## -## - continuous integration, by building and testing other software -## that depends on this project. -## -## It runs on every pull request and push of a tag to the GitHub repository. -## -## The testing can be monitored in the "Actions" tab of the GitHub repository. -## -## After all jobs have finished (or are canceled) and a short delay, -## tar files of all logs are made available as "build artifacts". -## -## This GitHub Actions workflow uses the portability testing framework -## of SageMath (https://www.sagemath.org/). For more information, see -## https://doc.sagemath.org/html/en/developer/portability_testing.html - -## The workflow consists of two jobs: -## -## - First, it builds a source distribution of the project -## and generates a script "update-pkgs.sh". It uploads them -## as a build artifact named upstream. -## -## - Second, it checks out a copy of the SageMath source tree. -## It downloads the upstream artifact and replaces the project's -## package in the SageMath distribution by the newly packaged one -## from the upstream artifact, by running the script "update-pkgs.sh". -## Then it builds a small portion of the Sage distribution. -## -## Many copies of the second step are run in parallel for each of the tested -## systems/configurations. - -#on: [push, pull_request] - on: pull_request: types: [opened, synchronize] From b6ad62b9ffa8aab89c04e48f61d985bb843ad586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Tue, 21 Jan 2025 15:41:48 -0300 Subject: [PATCH 3/5] ci.yml: improve names for display --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e6d192..946aad8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: CI +name: Build & Test on: pull_request: @@ -16,7 +16,7 @@ concurrency: jobs: ci: - name: CI (${{ matrix.os }} with Python ${{ matrix.python-version }}) + name: ${{ matrix.os }} with python ${{ matrix.python-version }} runs-on: ${{ matrix.os }} strategy: fail-fast: false From 356d9a21329235ff46154277522ac75eb4e22297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Tue, 21 Jan 2025 15:42:07 -0300 Subject: [PATCH 4/5] ci.yml: python 3.13 is released --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 946aad8..5becbea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: fail-fast: false matrix: os: ['macos-13', 'macos-latest', 'ubuntu-latest', 'windows-latest'] - python-version: ['3.10', '3.11', '3.12', '3.13-dev'] + python-version: ['3.10', '3.11', '3.12', '3.13'] steps: - name: Set up the repository uses: actions/checkout@v4 From 25a9ee58654e294aa2b3e23895bcc139656e82cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Tue, 21 Jan 2025 15:42:25 -0300 Subject: [PATCH 5/5] meson.build: make pytest verbose --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 5209bf2..20565c5 100644 --- a/meson.build +++ b/meson.build @@ -104,7 +104,7 @@ subdir('src') pytest = py_module.find_installation(modules: ['pytest'], required: false) if pytest.found() - test('pytest', pytest, args: ['-m', 'pytest'], workdir: meson.current_source_dir(), timeout: 300) + test('pytest', pytest, args: ['-m', 'pytest'], workdir: meson.current_source_dir(), timeout: 300, verbose: true, is_parallel: false) else message('pytest not found, skipping tests') endif