spin 0.14__tar.gz → 0.15__tar.gz

{spin-0.14/spin.egg-info → spin-0.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spin
-Version: 0.14
+Version: 0.15
 Summary: Developer tool for scientific Python libraries
 Maintainer-email: Scientific Python <spin@discuss.scientific-python.org>
 License: BSD 3-Clause License
@@ -46,16 +46,17 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: click
+Requires-Dist: click<8.3,>=8
 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==4.2.0; extra == "lint"
+Requires-Dist: pre-commit==4.3.0; extra == "lint"
 Provides-Extra: dev
 Requires-Dist: changelist==0.5; extra == "dev"
 Dynamic: license-file

{spin-0.14 → spin-0.15}/pyproject.toml

@@ -20,10 +20,11 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
   "Programming Language :: Python :: 3 :: Only",
 ]
 dependencies = [
-  "click",
+  "click>=8,<8.3",
   "tomli; python_version < '3.11'",
   "colorama; platform_system == 'Windows'",
   "importlib_metadata >= 7"
@@ -34,7 +35,7 @@ dynamic = ['version']
 spin = "spin.__main__:main"
 
 [project.optional-dependencies]
-lint = ["pre-commit == 4.2.0"]
+lint = ["pre-commit == 4.3.0"]
 dev = ["changelist == 0.5"]
 
 [project.urls]

{spin-0.14 → spin-0.15}/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.14"
+__version__ = "0.15"
 
 from .cmds import util
 

{spin-0.14 → spin-0.15}/spin/__main__.py

@@ -1,11 +1,11 @@
 import collections
 import importlib
 import importlib.util
-import inspect
 import os
 import pathlib
 import sys
 import textwrap
+import traceback
 from typing import Union
 
 import click
@@ -199,17 +199,16 @@ def main():
 
     try:
         group()
-    except Exception as e:
+    except Exception:
         click.secho(
-            textwrap.dedent(
-                f"""\
-
-            {type(e).__name__}: {e}
-
-            This exception was raised from:
-
-              {inspect.trace()[-1].filename}
+            "\n" + "".join(traceback.format_exception(*sys.exc_info(), limit=-1)),
+            fg="red",
+            bold=True,
+            file=sys.stderr,
+        )
 
+        click.secho(
+            textwrap.dedent(f"""\
             If you suspect this is a bug in `spin`, please file a report at:
 
               https://github.com/scientific-python/spin
@@ -218,9 +217,8 @@ def main():
 
               spin: {__version__}, package: {proj_name}
 
-            Aborting."""
-            ),
-            fg="red",
+            Aborting."""),
+            fg="yellow",
             bold=True,
             file=sys.stderr,
         )

{spin-0.14 → spin-0.15}/spin/cmds/meson.py

@@ -8,6 +8,7 @@ import signal
 import sys
 from enum import Enum
 from pathlib import Path
+from typing import Union
 
 import click
 
@@ -35,7 +36,15 @@ def _meson_cli():
         return [meson_cli]
 
 
-def _editable_install_path(distname):
+def editable_install_path(distname: str) -> Union[str, None]:
+    """Return path of the editable install for package `distname`.
+
+    If the package is not an editable install, return None.
+
+    See Also
+    --------
+    is_editable_install
+    """
     import importlib_metadata
 
     try:
@@ -57,16 +66,34 @@ def _editable_install_path(distname):
         return None
 
 
-def _is_editable_install(distname):
-    return _editable_install_path(distname) is not None
+# backward compat
+_editable_install_path = editable_install_path
+
+
+def is_editable_install(distname: str, verify_path: bool = False) -> bool:
+    """Whether or not an editable install of `distname` is present.
+
+    Parameters
+    ----------
+    `distname` : str
+        Name of the package. E.g., ``numpy`` or ``scikit-image``.
+        Not always the same as the module name (``numpy`` and
+        ``skimage`` for the above).
+    """
+    return editable_install_path(distname) is not None
+
+
+# backward compat
+_is_editable_install = is_editable_install
 
 
-def _is_editable_install_of_same_source(distname):
-    editable_path = _editable_install_path(distname)
-    return editable_path and os.path.samefile(_editable_install_path(distname), ".")
+def _is_editable_install_of_same_source(distname: str) -> bool:
+    """Check whether the editable install was made from the current directory."""
+    editable_path = editable_install_path(distname)
+    return (editable_path is not None) and os.path.samefile(editable_path, ".")
 
 
-def _set_pythonpath(build_dir, quiet=False):
+def _set_pythonpath(build_dir: str, quiet: bool = False) -> str:
     """Set first entry of PYTHONPATH to site packages directory.
 
     For editable installs, leave the PYTHONPATH alone.
@@ -78,12 +105,12 @@ def _set_pythonpath(build_dir, quiet=False):
     cfg = get_config()
     distname = cfg.get("project.name", None)
     if distname:
-        if _is_editable_install(distname):
+        if is_editable_install(distname):
             if _is_editable_install_of_same_source(distname):
                 if not (quiet):
                     click.secho(
                         "Editable install of same source directory detected; not setting PYTHONPATH",
-                        fg="bright_red",
+                        fg="yellow",
                     )
                 return ""
             else:
@@ -114,11 +141,11 @@ def _set_pythonpath(build_dir, quiet=False):
     return site_packages
 
 
-def _get_install_dir(build_dir):
+def _get_install_dir(build_dir: str) -> str:
     return f"{build_dir}-install"
 
 
-def _get_site_packages(build_dir):
+def _get_site_packages(build_dir: str) -> str:
     install_dir = _get_install_dir(build_dir)
     try:
         cfg = get_config()
@@ -140,13 +167,12 @@ def _get_site_packages(build_dir):
     site_packages = None
     if any(f"python{X}." in p for p in candidate_paths):
         # We have a system that uses `python3.X/site-packages` or `python3.X/dist-packages`
-        site_packages = [p for p in candidate_paths if f"python{X}.{Y}" in p]
-        if len(site_packages) == 0:
+        site_packages_paths = [p for p in candidate_paths if f"python{X}.{Y}" in p]
+        if len(site_packages_paths) == 0:
             raise FileNotFoundError(
                 f"No site-packages found in {install_dir} for Python {X}.{Y}"
             )
-        else:
-            site_packages = site_packages[0]
+        site_packages = site_packages_paths[0]
     else:
         # A naming scheme that does not encode the Python major/minor version is used, so return
         # whatever site-packages path was found
@@ -165,22 +191,22 @@ def _get_site_packages(build_dir):
     return site_packages
 
 
-def _meson_version():
+def _meson_version() -> Union[str, None]:
     try:
         p = _run(_meson_cli() + ["--version"], output=False, echo=False)
         return p.stdout.decode("ascii").strip()
     except:
-        pass
+        return None
 
 
-def _meson_version_configured(build_dir):
+def _meson_version_configured(build_dir: str) -> Union[str, None]:
     try:
         meson_info_fn = os.path.join(build_dir, "meson-info", "meson-info.json")
         with open(meson_info_fn) as f:
             meson_info = json.load(f)
         return meson_info["meson_version"]["full"]
     except:
-        pass
+        return None
 
 
 def _meson_coverage_configured() -> bool:
@@ -199,7 +225,7 @@ def _meson_coverage_configured() -> bool:
     return False
 
 
-def _check_coverage_tool_installation(coverage_type: GcovReportFormat, build_dir):
+def _check_coverage_tool_installation(coverage_type: GcovReportFormat, build_dir: str):
     requirements = {  # https://github.com/mesonbuild/meson/blob/6e381714c7cb15877e2bcaa304b93c212252ada3/docs/markdown/Unit-tests.md?plain=1#L49-L62
         GcovReportFormat.html: ["Gcovr/GenHTML", "lcov"],
         GcovReportFormat.xml: ["Gcovr (version 3.3 or higher)"],
@@ -336,7 +362,7 @@ def build(
         if not quiet:
             click.secho(
                 "Editable install of same source detected; skipping build",
-                fg="bright_red",
+                fg="yellow",
             )
         return
 
@@ -487,7 +513,7 @@ def test(
 
     To run test modules, functions, classes, or methods:
 
-      spin -t numpy.random
+      spin test -t numpy.random
 
     To report the durations of the N slowest tests:
 

{spin-0.14 → spin-0.15}/spin/cmds/pip.py

@@ -1,3 +1,5 @@
+import sys
+
 import click
 
 from .util import run as _run
@@ -37,7 +39,7 @@ def install(*, pip_args, editable, verbose, verbose_import):
       pip install . --no-build-isolation --editable --no-clean
     """
     pip_args = list(pip_args)
-    pip_cmd = ["pip", "install"]
+    pip_cmd = [sys.executable, "-m", "pip", "install"]
     pip_args += ["--no-build-isolation"]
 
     if editable:

{spin-0.14 → spin-0.15}/spin/cmds/util.py

@@ -168,7 +168,7 @@ def extend_command(
             return user_func(*args, parent_callback=parent_cmd, **kwargs)
 
         my_cmd.callback = click.pass_context(callback_with_parent_callback)
-        my_cmd.callback._parent = user_func
+        my_cmd.callback._parent = user_func  # type: ignore[attr-defined]
 
         if doc is not None:
             my_cmd.help = doc

{spin-0.14 → spin-0.15/spin.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spin
-Version: 0.14
+Version: 0.15
 Summary: Developer tool for scientific Python libraries
 Maintainer-email: Scientific Python <spin@discuss.scientific-python.org>
 License: BSD 3-Clause License
@@ -46,16 +46,17 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: click
+Requires-Dist: click<8.3,>=8
 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==4.2.0; extra == "lint"
+Requires-Dist: pre-commit==4.3.0; extra == "lint"
 Provides-Extra: dev
 Requires-Dist: changelist==0.5; extra == "dev"
 Dynamic: license-file

{spin-0.14 → spin-0.15}/spin.egg-info/requires.txt

@@ -1,4 +1,4 @@
-click
+click<8.3,>=8
 importlib_metadata>=7
 
 [:platform_system == "Windows"]
@@ -11,4 +11,4 @@ tomli
 changelist==0.5
 
 [lint]
-pre-commit==4.2.0
+pre-commit==4.3.0