Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
7979a93
Update build system to use Meson
tobiasdiez Oct 23, 2024
d928230
Finish migration to meson
tobiasdiez Oct 29, 2024
5d7c03b
Fix compilation on Windows
tobiasdiez Oct 29, 2024
203198a
add conda environment
tobiasdiez Oct 29, 2024
3e0ac07
fix ci
tobiasdiez Oct 29, 2024
a847dbb
remove obsolete manifest
tobiasdiez Oct 29, 2024
7f346ad
Run meson setup before tests
tobiasdiez Oct 29, 2024
d2858a7
add ninja as requirement
tobiasdiez Oct 29, 2024
1f22470
try to fix cython
tobiasdiez Oct 29, 2024
91c0d50
Simplify pip install command
tobiasdiez Oct 29, 2024
3ce6cb7
Latest python on cygwin is 3.9
tobiasdiez Oct 30, 2024
200a251
install ninja in cygwin
tobiasdiez Oct 30, 2024
67d9964
Readd preliminary_late_includes_cy28
tobiasdiez Oct 30, 2024
dfc30b1
Run commands in cygwin shell
tobiasdiez Oct 30, 2024
8569e94
Remove MINSIGSTKSZ_IS_CONSTANT
tobiasdiez Oct 30, 2024
3206989
print logs
tobiasdiez Oct 30, 2024
25b67b9
fix cygwin path
tobiasdiez Oct 30, 2024
858bce9
always print logs
tobiasdiez Oct 30, 2024
1865a61
add build as requirements
tobiasdiez Oct 30, 2024
17ed529
fix tests
tobiasdiez Oct 30, 2024
5a2f780
Use pytest
tobiasdiez Oct 30, 2024
3917e36
improve log printing
tobiasdiez Oct 30, 2024
b696583
config pytest
tobiasdiez Oct 30, 2024
8233936
fix example
tobiasdiez Oct 30, 2024
1acd288
use pip install to compile cysignals
tobiasdiez Oct 30, 2024
4e0cb17
fix build of example
tobiasdiez Oct 30, 2024
51ef87e
fix tests
tobiasdiez Oct 30, 2024
243e2e1
include tests
tobiasdiez Oct 30, 2024
a7513e0
try to fix alarm input
tobiasdiez Oct 30, 2024
ad30420
fix remaining imports
tobiasdiez Oct 30, 2024
0440683
fix tests
tobiasdiez Oct 30, 2024
b2a9990
ignore import errors
tobiasdiez Oct 31, 2024
5e11a67
set higher timeout
tobiasdiez Oct 31, 2024
9f58d7f
increase timeout even more
tobiasdiez Oct 31, 2024
1f7016c
add per-test timeout of 30s
tobiasdiez Oct 31, 2024
38a9f75
Migrate to pytest
tobiasdiez Nov 8, 2024
b7da5be
Merge remote-tracking branch 'origin/migrate-pytest' into convert-to-…
tobiasdiez Nov 8, 2024
936734f
Fix dist
tobiasdiez Nov 16, 2024
ef1dbcc
remove duplicate and non-functional dist
tobiasdiez Nov 16, 2024
efd215d
don't run tests before dist
tobiasdiez Nov 16, 2024
e209e71
Remove non-functional sage tests
tobiasdiez Nov 16, 2024
2884a18
Don't install package before testing
tobiasdiez Nov 16, 2024
4635262
improve sdist gen
tobiasdiez Nov 16, 2024
5f1dc0f
do install package
tobiasdiez Nov 16, 2024
b0aa691
fix dist path
tobiasdiez Nov 16, 2024
dddc029
back to pip install
tobiasdiez Nov 16, 2024
8853c40
just run pytest without any files
tobiasdiez Nov 16, 2024
51e84e9
combine macos and linux
tobiasdiez Nov 16, 2024
f926f49
simplify conftest
tobiasdiez Nov 16, 2024
604d1a5
fix format
tobiasdiez Nov 16, 2024
60a9800
remove unused cython instruction
tobiasdiez Nov 16, 2024
180e3ac
Fix failing test
tobiasdiez Nov 17, 2024
5b52757
remove duplicate conftest
tobiasdiez Nov 17, 2024
e1cf135
export sig_raise_exception
tobiasdiez Nov 17, 2024
004b52a
try to fix cygwin
tobiasdiez Nov 17, 2024
80a4e76
don't build wheels for old python
tobiasdiez Nov 17, 2024
ae9aff6
try to fix wheel building
tobiasdiez Nov 17, 2024
7e37e9c
merge cygwin code
tobiasdiez Nov 17, 2024
0b30533
manually install ninja in ci
tobiasdiez Nov 17, 2024
0ac0964
fix meson
tobiasdiez Nov 17, 2024
61cd08b
fix cygwin
tobiasdiez Nov 17, 2024
3d01e71
move cygwin code
tobiasdiez Nov 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
223 changes: 0 additions & 223 deletions .github/workflows/ci-sage.yml

This file was deleted.

111 changes: 111 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
name: Run Sage CI for Linux/Cygwin/macOS

## 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]
push:
tags:
- '*'
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:
cygwin-without-sage:
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 }}
strategy:
fail-fast: false
matrix:
os: ['macos-13', 'macos-latest', 'ubuntu-latest']
python-version: ['3.10', '3.11', '3.12', '3.13-dev']
steps:
- name: Set up the repository
uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
pip install --upgrade pip
pip install --upgrade -r requirements.txt
pip install --upgrade ninja
- name: Build
run: pip install --no-build-isolation --config-settings=builddir=builddir .
- name: Test
run: meson test --print-errorlogs -C builddir
11 changes: 7 additions & 4 deletions .github/workflows/dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,15 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- name: make dist
- name: Install dependencies
run: |
make dist
pip install --upgrade pip
pip install --upgrade -r requirements.txt
- name: Build sdist
run: python -m build --sdist .
- uses: actions/upload-artifact@v4
with:
path: "dist/*.tar.gz"
path: "dist/*.tar.*"
name: dist
- uses: pypa/gh-action-pypi-publish@release/v1
with:
Expand Down Expand Up @@ -82,7 +85,7 @@ jobs:
# Installing pipx follows the approach of https://github.com/pypa/cibuildwheel/pull/1743
id: python
with:
python-version: "3.8 - 3.12"
python-version: "3.9 - 3.12"
update-environment: false

- name: Build platform wheels
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,6 @@ target/

# Auto-generated files
example/cysignals_example.cpp
src/config.h
src/cysignals/signals.pxd
src/cysignals/cysignals_config.h

# C files generated by Cython
src/cysignals/alarm.c
Expand Down
13 changes: 0 additions & 13 deletions MANIFEST.in

This file was deleted.

Loading
Loading