* update coverage upload

.github/workflows/main.yml

@@ -85,4 +85,4 @@ jobs:
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
-          file: ./autotest/coverage.xml
+          file: coverage.xml

.github/workflows/pymake-gcc.yml

@@ -85,4 +85,4 @@ jobs:
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
-          file: ./autotest/coverage.xml
+          file: coverage.xml

autotest/test_gridgen.py

@@ -32,7 +32,7 @@ def pm(module_tmpdir, target) -> pymake.Pymake:
     pm.appdir = str(module_tmpdir)
     pm.cc = environ.get("CXX", "g++")
     pm.fc = environ.get("FC", "gfortran")
-    if system() == "Darwin":
+    if system() == "Darwin" and pm.cc == "g++":
         pm.syslibs = "-Wl,-ld_classic"
     pm.inplace = True
     pm.makeclean = True

autotest/test_mf6_existing_meson.py

@@ -1,7 +1,9 @@
 import os
 import sys
 from pathlib import Path
+from platform import system
 from typing import List
+from modflow_devtools.ostags import get_binary_suffixes
 
 import pytest
 
@@ -11,14 +13,8 @@
 @pytest.fixture(scope="module")
 def targets() -> List[Path]:
     target = "mf6"
-    ext = ""
-    shared_ext = ".so"
+    ext, shared_ext = get_binary_suffixes()
     executables = [target, "zbud6", "mf5to6", "libmf6"]
-    if sys.platform.lower() == "win32":
-        ext = ".exe"
-        shared_ext = ".dll"
-    elif sys.platform.lower() == "darwin":
-        shared_ext = ".dylib"
     for idx, _ in enumerate(executables[:3]):
         executables[idx] += ext
     executables[3] += shared_ext
@@ -40,6 +36,9 @@ def pm(workspace, targets) -> pymake.Pymake:
     pm = pymake.Pymake(verbose=True)
     pm.target = str(targets[0])
     pm.appdir = str(workspace / "bin")
+    pm.fc = os.environ.get("FC", "gfortran")
+    if system() == "Darwin" and pm.fc == "gfortran":
+        pm.syslibs = "-Wl,-ld_classic"
     pm.meson = True
     pm.makeclean = True
     pm.mesondir = str(workspace)

pymake/utils/_compiler_language_files.py

@@ -1,6 +1,7 @@
 """Private functions for processing c/c++ and fortran files"""
 
 import os
+import pathlib as pl
 
 from ._dag import _order_c_source_files, _order_f_source_files
 
@@ -295,7 +296,9 @@ def _get_srcfiles(srcdir, include_subdir):
             or file.lower().endswith(".c")
             or file.lower().endswith(".cpp")
         ):
-            srcfiles.append(os.path.relpath(file, os.getcwd()))
+            # srcfiles.append(os.path.relpath(file, os.getcwd()))
+            file_rel = pl.Path(file).relative_to(os.getcwd())
+            srcfiles.append(str(file_rel))
     return sorted(srcfiles)