Skip to content

Commit b66918e

Browse files
committed
Less testing, minor cleanup
1 parent a004d61 commit b66918e

File tree

4 files changed

+33
-8
lines changed

4 files changed

+33
-8
lines changed

.github/workflows/ci_pipeline.yml

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,13 @@ jobs:
3535
run: |
3636
flakeheaven lint --benchmark pySDC
3737
38-
user_cpu_tests:
38+
user_cpu_tests_linux:
39+
runs-on: ubuntu-latest
40+
3941
strategy:
4042
matrix:
4143
python: ['3.7', '3.8', '3.9', '3.10']
4244
env: ['base', 'fenics', 'mpi4py', 'petsc']
43-
os: ['macos-12', 'ubuntu-latest']
44-
45-
runs-on: ${{ matrix.os }}
4645

4746
defaults:
4847
run:
@@ -74,14 +73,40 @@ jobs:
7473
coverage_${{ matrix.env }}_3.10.dat
7574
7675
76+
user_cpu_tests_macos:
77+
runs-on: macos-12
78+
79+
strategy:
80+
matrix:
81+
env: ['base', 'fenics', 'mpi4py', 'petsc']
82+
83+
defaults:
84+
run:
85+
shell: bash -l {0}
86+
87+
steps:
88+
- name: Checkout
89+
uses: actions/checkout@v3
90+
91+
- name: Install Conda environment with Micromamba
92+
uses: mamba-org/provision-with-micromamba@main
93+
with:
94+
environment-file: "etc/environment-${{ matrix.env }}.yml"
95+
96+
- name: Run pytest for CPU stuff
97+
run: |
98+
pytest --continue-on-collection-errors -v --durations=0 pySDC/tests -m ${{ matrix.env }}
99+
100+
101+
77102
post-processing:
78103
runs-on: ubuntu-latest
79104

80105
if: ${{ github.repository_owner == 'Parallel-in-Time'}}
81106

82107
needs:
83108
- lint
84-
- user_cpu_tests
109+
- user_cpu_tests_linux
85110

86111
defaults:
87112
run:

CHANGELOG.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Changelog
22
---------
33

4-
- September 23, 2022: Version 5 comes with many changes, both visible and invisible ones. Some of those break the existing API, but
4+
- October 7, 2022: Version 5 comes with many changes, both visible and invisible ones. Some of those break the existing API, but
55
if you are using tests, you should be fine. Major changes include:
66

77
- **New convergence controllers**: Checking whether a step has converged can be tricky, so we made separate modules out of these
@@ -20,6 +20,7 @@ Changelog
2020
- **Toward GPU computing**: We included a new data type based on `CuPy <https://cupy.dev/>`_ making GPU computing possible.
2121
Thanks to `@timo2705 <https://github.com/timo2705>`_!
2222
- **Better testing**: The CI pipeline got a complete overhaul (again), now enabling simultaneous tests, faster/earlier linting, benchmarking (at least, in principal), separate environments and so on.
23+
The code is tested under Ubuntu and MacOS.
2324
- **Better code formatting**: `pySDC` now uses `black <https://black.readthedocs.io>`_ and `flakeheaven <https://flakeheaven.readthedocs.io>`_ for cleaner source code.
2425
After complaints here and there about linting "errors" the recommended way now is to run ``black`` before submission.
2526

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Features
1616
- Many different examples, collocation types, data types already implemented
1717
- Works with `FEniCS <https://fenicsproject.org/>`_, `mpi4py-fft <https://mpi4py-fft.readthedocs.io/en/latest/>`_ and `PETSc <http://www.mcs.anl.gov/petsc/>`_ (through `petsc4py <https://bitbucket.org/petsc/petsc4py>`_)
1818
- Continuous integration via `GitHub Actions <https://github.com/Parallel-in-Time/pySDC/actions>`_ and `Gitlab CI <https://gitlab.hzdr.de/r.speck/pysdc/-/pipelines>`_
19-
- Fully compatible with Python 3.7 - 3.10
19+
- Fully compatible with Python 3.7 - 3.10, runs at least on Ubuntu and MacOS
2020

2121

2222
Getting started

pySDC/tests/README.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
Most of the code is supported by tests, mainly realized by using the tutorial as the test routines with clearly defined results. Also, projects are accompanied by tests.
2-
The codes also provides some `benchmarks <./benchmarks/index.html>`_.
32

43
Github Action reports: |badge-ga|
54

0 commit comments

Comments
 (0)