invert fn name / alias for requires_package

Author: wpbonelli

autotest/test_markers.py

@@ -14,7 +14,7 @@
     require_program,
     require_python,
     requires_exe,
-    requires_pkg,
+    requires_package,
     requires_platform,
     requires_program,
     requires_python,
@@ -40,15 +40,15 @@ def test_require_exe_multiple():
     assert all(which(exe) for exe in exes)
 
 
-@requires_pkg(pkg)
+@requires_package(pkg)
 def test_requires_pkg():
     import numpy
 
     assert numpy is not None
     require_package(pkg)
 
 
-@requires_pkg(pkg, "pluggy")
+@requires_package(pkg, "pluggy")
 def test_requires_pkg_multiple():
     import pluggy
     import pytest
@@ -79,7 +79,7 @@ def test_requires_python(version):
 
 
 @no_parallel
-@requires_pkg("pytest-xdist", name_map={"pytest-xdist": "xdist"})
+@requires_package("pytest-xdist", name_map={"pytest-xdist": "xdist"})
 def test_no_parallel(worker_id):
     """
     Should only run with xdist disabled, in which case:

modflow_devtools/markers.py

@@ -47,7 +47,7 @@ def requires_python(version, bound="lower"):
         )
 
 
-def requires_pkg(*pkgs, name_map: dict[str, str] | None = None):
+def requires_package(*pkgs, name_map: dict[str, str] | None = None):
     missing = {pkg for pkg in pkgs if not has_pkg(pkg, strict=True, name_map=name_map)}
     return pytest.mark.skipif(
         missing,
@@ -104,9 +104,9 @@ def excludes_branch(branch):
 require_program = requires_exe
 requires_program = requires_exe
 require_python = requires_python
-require_pkg = requires_pkg
-require_package = requires_pkg
-requires_package = requires_pkg
+require_pkg = requires_package
+requires_pkg = requires_package
+require_package = requires_package
 require_platform = requires_platform
 exclude_platform = excludes_platform
 require_branch = requires_branch