Skip to content

Commit

Permalink
Merge branch 'release-0.7.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
LourensVeen committed Aug 1, 2024
2 parents 20239e3 + e480e71 commit f46dda2
Show file tree
Hide file tree
Showing 127 changed files with 6,503 additions and 4,753 deletions.
1 change: 0 additions & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[run]

source =
muscle_manager
libmuscle/python/libmuscle
integration_test

Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/ci_macos12_clang.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,15 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: latest

- name: Install dependencies
run: |
python3 -m pip install --upgrade pip
pip3 install tox tox-gh-actions
brew install openmpi
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install openmpi
- name: Run all tests on macOS Monterey 12 with Clang
run: cd ${GITHUB_WORKSPACE} && make test test_examples
8 changes: 6 additions & 2 deletions .github/workflows/ci_macos12_gcc_gfortran.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,14 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: latest

- name: Install dependencies
run: |
brew install gcc
brew install openmpi
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install gcc
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install openmpi
python3 -m pip install --upgrade pip
pip3 install tox tox-gh-actions
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/ci_macos13_clang.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,14 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: latest

- name: Install dependencies
run: |
brew install openmpi
brew install pkg-config
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install openmpi
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install pkg-config
python3 -m pip install --upgrade pip
pip3 install tox tox-gh-actions
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/ci_macos13_gcc_gfortran.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,15 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: latest

- name: Install dependencies
run: |
brew install gcc
brew install openmpi
brew install pkg-config
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install gcc
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install openmpi
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install pkg-config
python3 -m pip install --upgrade pip
pip3 install tox tox-gh-actions
Expand Down
Original file line number Diff line number Diff line change
@@ -1,29 +1,34 @@
# Run Continuous Integration on macOS 11 Big Sur, with native Clang and
# Run Continuous Integration on macOS 14 Sonoma, with native Clang and
# without Fortran.

# This mainly checks for issues/regressions in the native build
name: compatibility_macos_bigsur_11_clang
name: compatibility_macos_sonoma_14_clang
on:
schedule:
- cron: '30 0 * * 6'
- cron: '30 8 * * 6'
push:
branches:
- 'release-*'
- fix_native_compatibility_ci
jobs:
build:
runs-on: macos-11
runs-on: macos-14
timeout-minutes: 30

steps:
- uses: actions/checkout@v4

- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: latest

- name: Install dependencies
run: |
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install openmpi
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install pkg-config
python3 -m pip install --upgrade pip
pip3 install tox tox-gh-actions
brew install openmpi
- name: Run all tests on macOS Big Sur 11 with Clang
- name: Run all tests on macOS Sonoma 14 with Clang
run: cd ${GITHUB_WORKSPACE} && make test test_examples

Original file line number Diff line number Diff line change
@@ -1,26 +1,31 @@
# Run Continuous Integration on macOS 11 Big Sur with GCC
# Run Continuous Integration on macOS 14 Sonoma with GCC
# This includes Fortran support
# This mainly checks for issues/regressions in the native build
name: compatibility_macos_bigsur_11_gcc_gfortran
name: compatibility_macos_sonoma_14_gcc_gfortran
on:
schedule:
- cron: '00 1 * * 6'
- cron: '00 8 * * 6'
push:
branches:
- 'release-*'
- fix_native_compatibility_ci
jobs:
build:
runs-on: macos-11
runs-on: macos-14
timeout-minutes: 30

steps:
- uses: actions/checkout@v4

- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: latest

- name: Install dependencies
run: |
brew install gcc
brew install openmpi
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install gcc
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install openmpi
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install pkg-config
python3 -m pip install --upgrade pip
pip3 install tox tox-gh-actions
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_python_compatibility.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
timeout-minutes: 5
strategy:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]

steps:
- name: Check out the source code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_python_macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
timeout-minutes: 10
strategy:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]

steps:
- name: Check out the source code
Expand Down
Loading

0 comments on commit f46dda2

Please sign in to comment.