Skip to content

Commit

Permalink
Merge branch 'MODFLOW-USGS:develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
jlarsen-usgs authored Aug 21, 2024
2 parents 83c7bf7 + 31ec761 commit 930b2d9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest, macos-latest, windows-latest ]
os: [ ubuntu-latest, macos-13, windows-latest ]
python-version: [ 3.9, "3.10", "3.11", "3.12" ]
defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion autotest/pytest.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[pytest]
addopts = -ra
addopts = -ra --color=yes
python_files =
test_*.py
markers =
Expand Down

0 comments on commit 930b2d9

Please sign in to comment.