spin 0.18__tar.gz → 0.19__tar.gz

{spin-0.18/spin.egg-info → spin-0.19}/PKG-INFO

@@ -1,44 +1,14 @@
 Metadata-Version: 2.4
 Name: spin
-Version: 0.18
+Version: 0.19
 Summary: Developer tool for scientific Python libraries
 Maintainer-email: Scientific Python <spin@discuss.scientific-python.org>
-License: BSD 3-Clause License
-        
-        Copyright (c) 2021--2024, Scientific Python project
-        All rights reserved.
-        
-        Redistribution and use in source and binary forms, with or without
-        modification, are permitted provided that the following conditions are met:
-        
-        1. Redistributions of source code must retain the above copyright notice, this
-           list of conditions and the following disclaimer.
-        
-        2. Redistributions in binary form must reproduce the above copyright notice,
-           this list of conditions and the following disclaimer in the documentation
-           and/or other materials provided with the distribution.
-        
-        3. Neither the name of the copyright holder nor the names of its
-           contributors may be used to endorse or promote products derived from
-           this software without specific prior written permission.
-        
-        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-        AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-        IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-        DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-        FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-        DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-        SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-        CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-        OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-        OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-        
+License-Expression: BSD-3-Clause
 Project-URL: homepage, https://github.com/scientific-python/spin
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
@@ -46,16 +16,17 @@ 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.15
 Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: click!=8.3.0,<8.4,>=8
+Requires-Dist: click!=8.3.0,<8.6,>=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.3.0; extra == "lint"
+Requires-Dist: pre-commit==4.6.2; extra == "lint"
 Provides-Extra: dev
 Requires-Dist: changelist==0.5; extra == "dev"
 Dynamic: license-file

{spin-0.18 → spin-0.19}/pyproject.toml

@@ -1,9 +1,14 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
 [project]
 name = "spin"
 requires-python = ">=3.10"  # Oldest non-EOL Python here
 description = "Developer tool for scientific Python libraries"
 readme = "README.md"
-license = {file = "LICENSE"}
+license = "BSD-3-Clause"
+license-files = ["LICENSE"]
 maintainers = [
   {name = "Scientific Python", email = "spin@discuss.scientific-python.org"}
 ]
@@ -12,7 +17,6 @@ classifiers = [
   "Programming Language :: Python",
   "Intended Audience :: Developers",
   "Intended Audience :: Science/Research",
-  "License :: OSI Approved :: BSD License",
   "Operating System :: OS Independent",
   "Programming Language :: Python :: 3",
   "Programming Language :: Python :: 3.10",
@@ -20,10 +24,11 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
   "Programming Language :: Python :: 3.14",
+  "Programming Language :: Python :: 3.15",
   "Programming Language :: Python :: 3 :: Only",
 ]
 dependencies = [
-  "click>=8,!=8.3.0,<8.4",
+  "click>=8,!=8.3.0,<8.6",
   "tomli; python_version < '3.11'",
   "colorama; platform_system == 'Windows'",
   "importlib_metadata >= 7"
@@ -34,7 +39,7 @@ dynamic = ['version']
 spin = "spin.__main__:main"
 
 [project.optional-dependencies]
-lint = ["pre-commit == 4.3.0"]
+lint = ["pre-commit == 4.6.2"]
 dev = ["changelist == 0.5"]
 
 [project.urls]

{spin-0.18 → spin-0.19}/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.18"
+__version__ = "0.19"
 
 from .cmds import util
 

{spin-0.18 → spin-0.19}/spin/__main__.py

@@ -1,6 +1,7 @@
 import collections
 import importlib
 import importlib.util
+import io
 import os
 import pathlib
 import sys
@@ -42,6 +43,10 @@ def _detect_config_dir(path: pathlib.Path) -> pathlib.Path | None:
 
 
 def main():
+    # Replace characters, such as emoji, that the stdout encoding cannot represent
+    if isinstance(sys.stdout, io.TextIOWrapper):
+        sys.stdout.reconfigure(errors="replace")
+
     # Alias `spin help` to `spin --help`
     if (len(sys.argv) == 2) and (sys.argv[1] == "help"):
         sys.argv[1] = "--help"

{spin-0.18 → spin-0.19}/spin/cmds/meson.py

@@ -385,6 +385,8 @@ def build(
     if not (os.path.exists(build_dir) and _meson_version_configured(build_dir)):
         p = _run(setup_cmd, sys_exit=False, output=not quiet)
         if p.returncode != 0:
+            if quiet:
+                print(p.stdout.decode("utf-8"), end="")
             raise RuntimeError(
                 "Meson configuration failed; please try `spin build` again with the `--clean` flag."
             )

{spin-0.18 → spin-0.19}/spin/tests/test_build_cmds.py

@@ -201,3 +201,12 @@ def test_parallel_builds(example_pkg):
     assert "build-install" in example_pkg_path
     assert "parallel/build-install" in example_pkg_parallel_path
     assert "parallel/build-install" not in example_pkg_path
+
+
+@skip_py_lt_311  # python command does not run on older pythons
+def test_unencodable_output(example_pkg):
+    # `spin python` prints an emoji, which ASCII cannot encode
+    p = spin(
+        "python", "--", "-c", "pass", env={**os.environ, "PYTHONIOENCODING": "ascii"}
+    )
+    assert p.returncode == 0

{spin-0.18 → spin-0.19}/spin/tests/test_meson.py

@@ -4,11 +4,72 @@ import tempfile
 from os.path import join as pjoin
 from os.path import normpath
 
+import click
 import pytest
 
 from spin.cmds import meson
 from spin.containers import DotDict
 
+# Fake meson: prints to stdout and stderr, and fails for subcommands in FAILING_CMDS
+FAKE_MESON = """
+import sys
+
+FAILING_CMDS = {failing_cmds!r}
+
+subcommand = sys.argv[1]
+print("fake meson " + subcommand + ": stdout")
+print("fake meson " + subcommand + ": stderr", file=sys.stderr)
+sys.exit(1 if subcommand in FAILING_CMDS else 0)
+"""
+
+
+@pytest.fixture
+def fake_meson(tmp_path, monkeypatch):
+    """Return a factory that installs a fake meson and returns a build dir."""
+
+    def make(failing_cmds=()):
+        script = tmp_path / "meson.py"
+        script.write_text(FAKE_MESON.format(failing_cmds=list(failing_cmds)))
+        # Run the fake script in place of the meson binary
+        monkeypatch.setattr(meson, "_meson_cli", lambda: [sys.executable, str(script)])
+        monkeypatch.setattr(meson, "get_config", lambda: DotDict({}))
+        return str(tmp_path / "build")
+
+    return make
+
+
+def test_quiet_configuration_failure_output(fake_meson, capfd):
+    build_dir = fake_meson(failing_cmds=["setup"])
+    with pytest.raises(RuntimeError, match="Meson configuration failed"):
+        meson.build.callback(
+            meson_args=(), build_dir=build_dir, prefix="/usr", quiet=True
+        )
+    captured = capfd.readouterr()
+    output = captured.out + captured.err
+    assert output.count("fake meson setup: stdout") == 1
+    assert output.count("fake meson setup: stderr") == 1
+
+
+def test_run_configuration_failure_output(fake_meson, monkeypatch, capfd):
+    build_dir = fake_meson(failing_cmds=["setup"])
+    monkeypatch.setattr(meson, "_get_configured_command", lambda name: meson.build)
+    with (
+        click.Context(meson.run),
+        pytest.raises(RuntimeError, match="Meson configuration failed"),
+    ):
+        meson.run.callback(args=("unused-command",), build=True, build_dir=build_dir)
+    captured = capfd.readouterr()
+    assert "fake meson setup: stdout" in captured.err
+    assert "fake meson setup: stderr" in captured.err
+    assert "fake meson setup" not in captured.out
+
+
+def test_successful_quiet_build_output(fake_meson, capfd):
+    build_dir = fake_meson()
+    meson.build.callback(meson_args=(), build_dir=build_dir, prefix="/usr", quiet=True)
+    captured = capfd.readouterr()
+    assert "fake meson" not in captured.out + captured.err
+
 
 def make_paths(root, paths):
     for p in paths:

{spin-0.18 → spin-0.19/spin.egg-info}/PKG-INFO

@@ -1,44 +1,14 @@
 Metadata-Version: 2.4
 Name: spin
-Version: 0.18
+Version: 0.19
 Summary: Developer tool for scientific Python libraries
 Maintainer-email: Scientific Python <spin@discuss.scientific-python.org>
-License: BSD 3-Clause License
-        
-        Copyright (c) 2021--2024, Scientific Python project
-        All rights reserved.
-        
-        Redistribution and use in source and binary forms, with or without
-        modification, are permitted provided that the following conditions are met:
-        
-        1. Redistributions of source code must retain the above copyright notice, this
-           list of conditions and the following disclaimer.
-        
-        2. Redistributions in binary form must reproduce the above copyright notice,
-           this list of conditions and the following disclaimer in the documentation
-           and/or other materials provided with the distribution.
-        
-        3. Neither the name of the copyright holder nor the names of its
-           contributors may be used to endorse or promote products derived from
-           this software without specific prior written permission.
-        
-        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-        AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-        IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-        DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-        FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-        DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-        SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-        CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-        OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-        OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-        
+License-Expression: BSD-3-Clause
 Project-URL: homepage, https://github.com/scientific-python/spin
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
@@ -46,16 +16,17 @@ 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.15
 Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: click!=8.3.0,<8.4,>=8
+Requires-Dist: click!=8.3.0,<8.6,>=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.3.0; extra == "lint"
+Requires-Dist: pre-commit==4.6.2; extra == "lint"
 Provides-Extra: dev
 Requires-Dist: changelist==0.5; extra == "dev"
 Dynamic: license-file

{spin-0.18 → spin-0.19}/spin.egg-info/requires.txt

@@ -1,4 +1,4 @@
-click!=8.3.0,<8.4,>=8
+click!=8.3.0,<8.6,>=8
 importlib_metadata>=7
 
 [:platform_system == "Windows"]
@@ -11,4 +11,4 @@ tomli
 changelist==0.5
 
 [lint]
-pre-commit==4.3.0
+pre-commit==4.6.2