diff --git a/.github/workflows/tests.yml b/.github/workflows/tests_macos.yml similarity index 88% rename from .github/workflows/tests.yml rename to .github/workflows/tests_macos.yml index dbebd83..036fffd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests_macos.yml @@ -1,4 +1,4 @@ -name: Tests +name: Tests macOS on: - push @@ -9,7 +9,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [windows-latest, ubuntu-latest, macos-latest] + os: [macos-latest] python-version: ['3.9', '3.10', '3.11'] fail-fast: false steps: diff --git a/.github/workflows/tests_main.yml b/.github/workflows/tests_main.yml new file mode 100644 index 0000000..c2f88bf --- /dev/null +++ b/.github/workflows/tests_main.yml @@ -0,0 +1,26 @@ +name: Tests Windows and Linux + +on: + - push + - pull_request + +jobs: + test: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [windows-latest, ubuntu-latest] + python-version: ['3.9', '3.10', '3.11'] + fail-fast: false + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install tox tox-gh-actions + - name: Test with tox + run: tox \ No newline at end of file diff --git a/README.md b/README.md index d40a945..a21be83 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # MF6RTM: Reactive Transport Model via the MODFLOW 6 and PHREEQCRM APIs -![Tests](https://github.com/p-ortega/mf6rtm/actions/workflows/tests.yml/badge.svg) +![Tests](https://github.com/p-ortega/mf6rtm/actions/workflows/tests_main.yml/badge.svg) +![Tests](https://github.com/p-ortega/mf6rtm/actions/workflows/tests_macos.yml/badge.svg) ## Benchmarks Benchmark comparing model results against PHT3d are in `benchmark/`. Each folder contains a Jupyter notebook to write and execute an MF6RTM model via the MUP3D class. Additionally, PHT3D files are provided in the corresponding `pht3d` directory.