Skip to content

Commit

Permalink
* update
Browse files Browse the repository at this point in the history
  • Loading branch information
jdhughes-usgs committed Jun 10, 2024
1 parent b8afe0d commit 59ad3f6
Show file tree
Hide file tree
Showing 5 changed files with 132 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,4 @@ jobs:
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
file: coverage.xml
file: ./autotest/coverage.xml
2 changes: 1 addition & 1 deletion .github/workflows/pymake-gcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,4 @@ jobs:
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
file: coverage.xml
file: ./autotest/coverage.xml
9 changes: 6 additions & 3 deletions autotest/test_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ def test_build(function_tmpdir, target: str) -> None:
pm = pymake.Pymake(verbose=True)
pm.target = target
pm.inplace = True
if system() == "Darwin":
fc = os.environ.get("FC", "gfortran")
if system() == "Darwin" and fc == "gfortran":
pm.syslibs = "-Wl,-ld_classic"
assert (
pymake.build_apps(
Expand All @@ -87,7 +88,8 @@ def test_build(function_tmpdir, target: str) -> None:
@pytest.mark.parametrize("target", targets_meson)
def test_meson_build(function_tmpdir, target: str) -> None:
kwargs = {}
if system() == "Darwin":
fc = os.environ.get("FC", "gfortran")
if system() == "Darwin" and fc == "gfortran":
kwargs["LDFLAGS"] = "-Wl,-ld_classic"
with set_dir(function_tmpdir), set_env(**kwargs):
assert (
Expand All @@ -113,7 +115,8 @@ def test_makefile_build(function_tmpdir, target: str) -> None:
pm.inplace = True
pm.dryrun = True
pm.makeclean = False
if system() == "Darwin":
fc = os.environ.get("FC", "gfortran")
if system() == "Darwin" and fc == "gfortran":
pm.syslibs = "-Wl,-ld_classic"

with set_dir(function_tmpdir):
Expand Down
119 changes: 119 additions & 0 deletions pixi.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ version = "1.2.10.dev0"
[dependencies]
appdirs = "*"
codespell = "*"
coverage = "*"
filelock = "*"
flaky = "*"
flopy = "*"
Expand All @@ -20,6 +21,7 @@ pip = "*"
pydotplus = "*"
pytest = "!=8.1.0"
pytest-benchmark = "*"
pytest-cov = "*"
pytest-dotenv = "*"
pytest-order = "*"
pytest-xdist = "*"
Expand All @@ -39,6 +41,6 @@ test = "meson test --verbose --no-rebuild -C"

# test
download-examples = {cmd = "python ci_setup.py", cwd = "autotest"}
autotest = { cmd = "pytest -v -n auto --dist=loadfile -m='base or regression' --durations 0 --keep-failed .failed", cwd = "autotest" }
autotest-base = { cmd = "pytest -v -n auto --dist=loadfile -m='base' --durations 0 --keep-failed .failed", cwd = "autotest" }
autotest-Windows = { cmd = "pytest -v -m='base' --durations 0 --keep-failed .failed", cwd = "autotest" }
autotest = { cmd = "pytest -v -n auto --dist=loadfile -m='base or regression' --durations 0 --cov=pymake --cov-report=xml --basetemp=pytest_temp --keep-failed .failed", cwd = "autotest" }
autotest-base = { cmd = "pytest -v -n auto --dist=loadfile -m='base' --durations 0 --cov=pymake --cov-report=xml --basetemp=pytest_temp --keep-failed .failed", cwd = "autotest" }
autotest-Windows = { cmd = "pytest -v -m='base' --durations 0 --cov=pymake --cov-report=xml --basetemp=pytest_temp --keep-failed .failed", cwd = "autotest" }

0 comments on commit 59ad3f6

Please sign in to comment.