spin 0.10__tar.gz → 0.11__tar.gz

{spin-0.10/spin.egg-info → spin-0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spin
-Version: 0.10
+Version: 0.11
 Summary: Developer tool for scientific Python libraries
 Maintainer-email: Scientific Python <spin@discuss.scientific-python.org>
 License: BSD 3-Clause License
@@ -55,7 +55,7 @@ Requires-Dist: tomli; python_version < "3.11"
 Requires-Dist: colorama; platform_system == "Windows"
 Requires-Dist: importlib_metadata>=7
 Provides-Extra: lint
-Requires-Dist: pre-commit==3.7.0; extra == "lint"
+Requires-Dist: pre-commit==3.7.1; extra == "lint"
 Provides-Extra: dev
 Requires-Dist: changelist==0.5; extra == "dev"
 

{spin-0.10 → spin-0.11}/pyproject.toml

@@ -34,7 +34,7 @@ dynamic = ['version']
 spin = "spin.__main__:main"
 
 [project.optional-dependencies]
-lint = ["pre-commit == 3.7.0"]
+lint = ["pre-commit == 3.7.1"]
 dev = ["changelist == 0.5"]
 
 [project.urls]

{spin-0.10 → spin-0.11}/spin/__init__.py

@@ -6,7 +6,7 @@ For usage information see `python -m spin`.
 Read more at https://github.com/scientific-python/spin
 """
 
-__version__ = "0.10"
+__version__ = "0.11"
 
 from .cmds import util
 

spin-0.11/spin/cmds/__init__.py

@@ -0,0 +1,3 @@
+__all__ = ["meson"]
+
+from . import meson

{spin-0.10 → spin-0.11}/spin/cmds/meson.py

@@ -45,6 +45,9 @@ def _editable_install_path(distname):
     except importlib_metadata.PackageNotFoundError:
         return None
 
+    if dist.origin is None:
+        return None
+
     if hasattr(dist.origin, "dir_info") and getattr(
         dist.origin.dir_info, "editable", False
     ):
@@ -425,8 +428,35 @@ def test(
     """  # noqa: E501
     cfg = get_config()
     distname = cfg.get("project.name", None)
+    pytest_args = pytest_args or ()
+
+    # User specified tests without -t flag
+    # Rewrite arguments as though they specified using -t and proceed
+    if (len(pytest_args) == 1) and (not tests):
+        tests = pytest_args[0]
+        pytest_args = ()
+
+    package = cfg.get("tool.spin.package", None)
+    if package is None:
+        print(
+            "Please specify `package = packagename` under `tool.spin` section of `pyproject.toml`"
+        )
+        raise SystemExit(1)
+
+    # User did not specify what to test, so we test
+    # the full package
+    if not (pytest_args or tests):
+        pytest_args = ("--pyargs", package)
+    elif tests:
+        if (os.path.sep in tests) or ("/" in tests):
+            # Tests specified as file path
+            pytest_args = pytest_args + (tests,)
+        else:
+            # Otherwise tests given as modules
+            pytest_args = pytest_args + ("--pyargs", tests)
 
-    if gcov and distname and _is_editable_install_of_same_source(distname):
+    is_editable_install = distname and _is_editable_install_of_same_source(distname)
+    if gcov and is_editable_install:
         click.secho(
             "Error: cannot generate coverage report for editable installs",
             fg="bright_red",
@@ -443,16 +473,6 @@ def test(
         else:
             ctx.invoke(build_cmd)
 
-    package = cfg.get("tool.spin.package", None)
-    if package is None:
-        print(
-            "Please specify `package = packagename` under `tool.spin` section of `pyproject.toml`"
-        )
-        raise SystemExit(1)
-
-    if (not pytest_args) and (not tests):
-        tests = package
-
     site_path = _set_pythonpath()
     if site_path:
         print(f'$ export PYTHONPATH="{site_path}"')
@@ -476,8 +496,8 @@ def test(
     if (n_jobs != "1") and ("-n" not in pytest_args):
         pytest_args = ("-n", str(n_jobs)) + pytest_args
 
-    if tests and "--pyargs" not in pytest_args:
-        pytest_args = ("--pyargs", tests) + pytest_args
+    if not any("--import-mode" in arg for arg in pytest_args):
+        pytest_args = ("--import-mode=importlib",) + pytest_args
 
     if verbose:
         pytest_args = ("-v",) + pytest_args
@@ -500,9 +520,12 @@ def test(
     else:
         cmd = ["pytest"]
 
-    pytest_p = _run(
-        cmd + list(pytest_args),
-    )
+    if not os.path.exists(install_dir):
+        os.mkdir(install_dir)
+
+    cwd = os.getcwd()
+    pytest_p = _run(cmd + list(pytest_args), cwd=site_path)
+    os.chdir(cwd)
 
     if gcov:
         # Verify the tools are present
@@ -857,7 +880,10 @@ def docs(
             bold=True,
             fg="bright_blue",
         )
-    _run(["make", "-C", doc_dir, sphinx_target], replace=True)
+
+    make_bat_exists = (Path(doc_dir) / "make.bat").exists()
+    make_cmd = "make.bat" if sys.platform == "win32" and make_bat_exists else "make"
+    _run([make_cmd, sphinx_target], cwd=doc_dir, replace=True)
 
 
 @click.command()

{spin-0.10 → spin-0.11}/spin/cmds/util.py

@@ -41,6 +41,10 @@ def run(
 
     Other arguments and keywords are passed directly to `subprocess.run`.
 
+
+    Returns
+    -------
+    p : CompletedProcess
     """
     if cwd:
         if echo:

{spin-0.10 → spin-0.11}/spin/tests/conftest.py

@@ -18,3 +18,10 @@ def pre_post_test():
         os.chdir(cwd)
         util.run(["git", "clean", "-xdf"], cwd="example_pkg")
         os.chdir(cwd)
+
+
+@pytest.fixture
+def editable_install():
+    util.run(["pip", "install", "--quiet", "--no-build-isolation", "-e", "."])
+    yield
+    util.run(["pip", "uninstall", "--quiet", "-y", "example_pkg"])

{spin-0.10 → spin-0.11}/spin/tests/test_build_cmds.py

@@ -88,16 +88,6 @@ def test_recommend_run_python():
         ), "Failed to recommend `python run python file.py`"
 
 
-def test_test():
-    """Does the test command run?"""
-    spin("test")
-
-
-def test_test_with_pythonpath():
-    """Does `spin test` work when PYTHONPATH is set?"""
-    spin("test", env={**os.environ, "PYTHONPATH": "/tmp"})
-
-
 def test_sdist():
     spin("sdist")
 

{spin-0.10 → spin-0.11}/spin/tests/test_editable.py

@@ -1,15 +1,5 @@
-import pytest
 from testutil import spin, stdout
 
-from spin.cmds.util import run
-
-
-@pytest.fixture
-def editable_install():
-    run(["pip", "install", "--quiet", "--no-build-isolation", "-e", "."])
-    yield
-    run(["pip", "uninstall", "--quiet", "-y", "example_pkg"])
-
 
 def test_detect_editable(editable_install):
     assert "Editable install of same source detected" in stdout(

spin-0.11/spin/tests/test_test.py

@@ -0,0 +1,29 @@
+import os
+
+from testutil import spin
+
+
+def test_test():
+    """Does the test command run?"""
+    spin("test")
+
+
+def test_test_with_pythonpath():
+    """Does `spin test` work when PYTHONPATH is set?"""
+    spin("test", env={**os.environ, "PYTHONPATH": "/tmp"})
+
+
+def test_test_file_spec():
+    spin("test", "example_pkg/submodule/tests/test_submodule.py")
+
+
+def test_test_module_spec():
+    spin("test", "example_pkg.submodule")
+
+
+def test_test_editable_file_spec(editable_install):
+    spin("test", "example_pkg/submodule/tests/test_submodule.py")
+
+
+def test_test_editable_module_spec(editable_install):
+    spin("test", "example_pkg.submodule")

{spin-0.10 → spin-0.11/spin.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spin
-Version: 0.10
+Version: 0.11
 Summary: Developer tool for scientific Python libraries
 Maintainer-email: Scientific Python <spin@discuss.scientific-python.org>
 License: BSD 3-Clause License
@@ -55,7 +55,7 @@ Requires-Dist: tomli; python_version < "3.11"
 Requires-Dist: colorama; platform_system == "Windows"
 Requires-Dist: importlib_metadata>=7
 Provides-Extra: lint
-Requires-Dist: pre-commit==3.7.0; extra == "lint"
+Requires-Dist: pre-commit==3.7.1; extra == "lint"
 Provides-Extra: dev
 Requires-Dist: changelist==0.5; extra == "dev"
 

{spin-0.10 → spin-0.11}/spin.egg-info/SOURCES.txt

@@ -22,4 +22,5 @@ spin/tests/test_build_cmds.py
 spin/tests/test_cli.py
 spin/tests/test_editable.py
 spin/tests/test_meson.py
+spin/tests/test_test.py
 spin/tests/testutil.py

{spin-0.10 → spin-0.11}/spin.egg-info/requires.txt

@@ -11,4 +11,4 @@ tomli
 changelist==0.5
 
 [lint]
-pre-commit==3.7.0
+pre-commit==3.7.1

spin-0.10/spin/cmds/__init__.py

@@ -1,8 +0,0 @@
-from . import meson
-
-# Backward compatibility with older versions
-build = meson.build
-test = meson.test
-ipython = meson.ipython
-python = meson.python
-shell = meson.shell