fast-dev-cli 0.22.0__tar.gz → 0.23.0__tar.gz

{fast_dev_cli-0.22.0 → fast_dev_cli-0.23.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.22.0
+Version: 0.23.0
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta

fast_dev_cli-0.23.0/fast_dev_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.23.0"

{fast_dev_cli-0.22.0 → fast_dev_cli-0.23.0}/fast_dev_cli/cli.py

@@ -15,7 +15,6 @@ from pathlib import Path
 from typing import TYPE_CHECKING, Any, Literal, cast, get_args, overload
 
 import typer
-from click import UsageError
 from typer import Exit, Option, echo, secho
 from typer.models import ArgumentInfo, OptionInfo
 
@@ -98,6 +97,14 @@ def is_windows() -> bool:
     return platform.system() == "Windows"
 
 
+@functools.cache
+def prefer_uv_tool() -> bool:
+    if shutil.which("uv") is None:
+        return False
+    cmd = "uv tool list"
+    return Shell(cmd).capture_output() != "No tools installed"
+
+
 def yellow_warn(msg: str) -> None:
     if is_windows() and (encoding := sys.stdout.encoding) != "utf-8":
         msg = msg.encode(encoding, errors="ignore").decode(encoding)
@@ -281,7 +288,7 @@ def _get_frontend_version() -> tuple[Path, str] | None:
     except ImportError:
         from json import loads as json_loads  # type:ignore[assignment]
     content = frontend_version_file.read_bytes()
-    metadata: dict[str, str] = json_loads(content)  # type:ignore[assignment]
+    metadata: dict[str, str] = json_loads(content)  # type:ignore
     try:
         current_version = metadata["version"]
     except (KeyError, TypeError):
@@ -1078,7 +1085,7 @@ class GitTag(DryRun):
 
     def run(self) -> None:
         if self.mark_tag() and not self.dry:
-            echo("You may want to publish package:\n poetry publish --build")
+            echo("You may want to publish package:\n pdm publish")
 
 
 @cli.command()
@@ -1173,17 +1180,21 @@ class LintCode(DryRun):
     ) -> str:
         if paths != "." and all(i.endswith(".html") for i in paths.split()):
             return f"prettier -w {paths}"
-        cmd = ""
-        ruff_check = "ruff check --extend-select=I,B,SIM" + " --fix" * ruff_check_fix
+        ruff_rules = ["I", "B"]
+        if ruff_check_sim and not load_bool("FASTDEVCLI_NO_SIM"):
+            ruff_rules.append("SIM")
+        if ruff_check_up or load_bool("FASTDEVCLI_UP"):
+            ruff_rules.append("UP")
+        ruff_check = "ruff check --extend-select=" + ",".join(ruff_rules)
+        if (
+            ruff_check_fix
+            and not check_only
+            and (not load_bool("NO_FIX") and not load_bool("FASTDEVCLI_NO_FIX"))
+        ):
+            ruff_check += " --fix"
         tools = ["ruff format", ruff_check, "mypy"]
         if check_only:
             tools[0] += " --check"
-        if check_only or load_bool("NO_FIX"):
-            tools[1] = tools[1].replace(" --fix", "")
-        if ruff_check_up or load_bool("FASTDEVCLI_UP"):
-            tools[1] = tools[1].replace(",SIM", ",SIM,UP")
-        if not ruff_check_sim or load_bool("FASTDEVCLI_NO_SIM"):
-            tools[1] = tools[1].replace(",SIM", "")
         if skip_mypy or load_bool("SKIP_MYPY") or load_bool("FASTDEVCLI_NO_MYPY"):
             # Sometimes mypy is too slow
             tools = tools[:-1]
@@ -1195,23 +1206,11 @@ class LintCode(DryRun):
                     tools[-1] += " --ignore-missing-imports"
                 if mypy_strict or load_bool("FASTDEVCLI_STRICT"):
                     tools[-1] += " --strict"
-        lint_them = " && ".join(
-            "{0}{" + str(i) + "} {1}" for i in range(2, len(tools) + 2)
-        )
-        if ruff_exists := cls.check_lint_tool_installed():
-            # `ruff <command>` get the same result with `pdm run ruff <command>`
-            # While `mypy .`(installed global and env not activated),
-            #   does not the same as `pdm run mypy .`
-            lint_them = " && ".join(
-                ("" if tool.startswith("ruff") else "{0}")
-                + (
-                    "{%d} {1}" % i  # noqa: UP031
-                )
-                for i, tool in enumerate(tools, 2)
-            )
+        ruff_exists = cls.check_lint_tool_installed()
         prefix = ""
         should_run_by_tool = with_prefix
-        if not should_run_by_tool and "mypy" in str(tools):
+        requires_mypy = any(tool.startswith("mypy") for tool in tools)
+        if requires_mypy and not should_run_by_tool:
             if is_venv() and Path(sys.argv[0]).parent != Path.home().joinpath(
                 ".local/bin"
             ):  # Virtual environment activated and fast-dev-cli is installed in it
@@ -1221,6 +1220,8 @@ class LintCode(DryRun):
                     if shutil.which("pipx") is None:
                         ensure_pipx = "pip install --user pipx\n  pipx ensurepath\n  "
                         command = ensure_pipx + command
+                    elif prefer_uv_tool():
+                        command = "uv tool install ruff"
                     yellow_warn(
                         "You may need to run the following command"
                         f" to install ruff:\n\n  {command}\n"
@@ -1228,7 +1229,7 @@ class LintCode(DryRun):
                 elif cls.missing_mypy_exec():
                     should_run_by_tool = True
                     if check_call('python -c "import fast_dev_cli"'):
-                        command = 'python -m pip install -U "fast-dev-cli"'
+                        command = "python -m pip install -U mypy"
                         yellow_warn(
                             "You may need to run the following command"
                             f" to install lint tools:\n\n  {command}\n"
@@ -1255,7 +1256,17 @@ class LintCode(DryRun):
                         prefix = bin_dir
         if cls.prefer_dmypy(paths, tools, use_dmypy=use_dmypy):
             tools[-1] = "dmypy run"
-        cmd += lint_them.format(prefix, paths, *tools)
+        cmd = " && ".join(
+            (
+                tool
+                # `ruff <command>` get the same result with `pdm run ruff <command>`.
+                # Other tools should run inside the selected environment.
+                if ruff_exists and tool.startswith("ruff")
+                else prefix + tool
+            )
+            + f" {paths}"
+            for tool in tools
+        )
         if bandit or load_bool("FASTDEVCLI_BANDIT"):
             command = prefix + "bandit"
             if Path("pyproject.toml").exists():
@@ -1717,7 +1728,7 @@ class MakeDeps(DryRun):
             if self.should_ensure_pip():
                 cmd = f"python -m ensurepip && {upgrade} && {cmd}"
             elif self.should_upgrade_pip():
-                cmd = "{upgrade} && {cmd}"
+                cmd = f"{upgrade} && {cmd}"
             return cmd
 
 
@@ -1743,7 +1754,10 @@ def make_deps(
 ) -> None:
     """Run: ruff check/format to reformat code and then mypy to check"""
     if use_uv + use_pdm + use_pip + use_poetry > 1:
-        raise UsageError("`--uv/--pdm/--pip/--poetry` can only choose one!")
+        raise typer.BadParameter(
+            "can only choose one",
+            param_hint=("--uv", "--pdm", "--pip", "--poetry"),
+        )
     if use_uv:
         tool = "uv"
     elif use_pdm:

{fast_dev_cli-0.22.0 → fast_dev_cli-0.23.0}/pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
     "typer>=0.24.0,<1",
     "tomli >=2.0.1,<3; python_version < '3.11'",
 ]
-version = "0.22.0"
+version = "0.23.0"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"
@@ -52,9 +52,7 @@ fast = "fast_dev_cli.cli:main"
 
 [dependency-groups]
 dev = [
-    "twine>=6.1.0",
     "asynctor>=0.10.0",
-    "mypy>=1.19.1",
 ]
 
 [build-system]

{fast_dev_cli-0.22.0 → fast_dev_cli-0.23.0}/tests/test_deps.py

@@ -1,7 +1,19 @@
-from fast_dev_cli.cli import MakeDeps, capture_cmd_output
+import re
+
+from fast_dev_cli.cli import MakeDeps, capture_cmd_output, run_and_echo
+
+ANSI_RE = re.compile(r"\x1b\[[0-9;]*m")
+
+
+def strip_ansi(text: str) -> str:
+    return ANSI_RE.sub("", text)
 
 
 def test_make_deps_class():
+    class PipDepsWithoutEnsure(MakeDeps):
+        def should_ensure_pip(self) -> bool:
+            return False
+
     assert (
         MakeDeps("uv", prod=False).gen()
         == "uv sync --inexact --active --all-extras --all-groups"
@@ -27,6 +39,10 @@ def test_make_deps_class():
         MakeDeps("pip", prod=True).gen()
         == "python -m ensurepip && python -m pip install --upgrade pip && python -m pip install -e ."
     )
+    assert (
+        PipDepsWithoutEnsure("pip", prod=False).gen()
+        == "python -m pip install --upgrade pip && python -m pip install -e . --group dev"
+    )
 
 
 def test_fast_deps():
@@ -50,6 +66,14 @@ def test_fast_deps():
     assert out == "--> uv sync --all-extras --all-groups"
 
 
+def test_fast_deps_mutually_exclusive_options():
+    cmd = "fast deps --uv --pdm --dry"
+    assert run_and_echo(cmd, verbose=False) == 2
+    out = strip_ansi(capture_cmd_output(cmd))
+    assert "Invalid value for '--uv' / '--pdm' / '--pip' / '--poetry'" in out
+    assert "can only choose" in out
+
+
 def test_smart_fast_deps(tmp_work_dir, monkeypatch):
     toml_file = tmp_work_dir.joinpath("pyproject.toml")
     if toml_file.exists():

{fast_dev_cli-0.22.0 → fast_dev_cli-0.23.0}/tests/test_functions.py

@@ -4,7 +4,8 @@ from io import StringIO
 from pathlib import Path
 
 import pytest
-import typer
+from typer import Exit as TyperExit
+from typer import Option
 
 from fast_dev_cli.cli import (
     DryRun,
@@ -85,7 +86,7 @@ def test_run_shell():
         )
     with pytest.raises(FileNotFoundError):
         exit_if_run_failed("in_valid_command", _exit=True, capture_output=True)
-    with pytest.raises(typer.Exit):
+    with pytest.raises(TyperExit):
         exit_if_run_failed(
             "in_valid_command", _exit=False, capture_output=True, shell=True
         )
@@ -111,8 +112,8 @@ def test_get_version_in_poetry_project(tmp_path: Path):
 def test_ensure_bool():
     assert _ensure_bool(True) is True
     assert _ensure_bool(False) is False
-    opt = typer.Option(False, "--check-only", "-c")
+    opt = Option(False, "--check-only", "-c")
     assert opt
     assert _ensure_bool(opt) is False
-    opt = typer.Option(True, "--check-only", "-c")
+    opt = Option(True, "--check-only", "-c")
     assert _ensure_bool(opt) is True

{fast_dev_cli-0.22.0 → fast_dev_cli-0.23.0}/tests/test_lint.py

@@ -12,6 +12,7 @@ from fast_dev_cli.cli import (
     LintCode,
     Project,
     capture_cmd_output,
+    is_windows,
     lint,
     make_style,
     only_check,
@@ -61,6 +62,11 @@ def mock_ty_0(monkeypatch):
     monkeypatch.setenv("FASTDEVCLI_TY", "0")
 
 
+def get_bin_dir() -> str:
+    return ".venv" + ("\\Scripts\\" if is_windows() else "/bin/")
+
+
+BIN_DIR = get_bin_dir()
 SEP = " && "
 _CMD = "ruff format{} . && ruff check --extend-select=I,B,SIM{} . && mypy ."
 LINT_CMD = _CMD.format("", " --fix")
@@ -72,7 +78,8 @@ def test_check(mock_no_dmypy, monkeypatch, mocker):
     for cmd in CHECK_CMD.split(SEP):
         assert cmd in command
     command2 = capture_cmd_output("fast check --bandit --dry")
-    assert command2 == command + " && bandit -c pyproject.toml -r ."
+    bandit_check = "bandit -c pyproject.toml -r ."
+    assert command2 == command + " && " + BIN_DIR + bandit_check
     monkeypatch.setenv("FASTDEVCLI_BANDIT", "1")
     command3 = capture_cmd_output("fast check --dry")
     assert command3 == command2
@@ -160,7 +167,9 @@ def test_check_skip_mypy(mock_skip_mypy_0, mocker):
     command = capture_cmd_output(cmd)
     command2 = capture_cmd_output(cmd2)
     expected = "--> " + SEP.join(
-        filter(lambda i: not i.startswith("mypy"), CHECK_CMD.split(SEP))
+        filter(
+            lambda i: not i.strip().split()[0].endswith("mypy"), CHECK_CMD.split(SEP)
+        )
     )
     assert command == command2 == expected
 
@@ -187,10 +196,11 @@ def test_lint_cmd(mock_no_dmypy, monkeypatch):
         assert cmd in command
     assert capture_cmd_output(f"{lint_cmd} --dry") == command
     out = capture_cmd_output(f"{run}fast lint --dry")
-    assert out == "--> " + LINT_CMD
+    expected_lint_cmd = LINT_CMD.replace("&& mypy", "&& " + BIN_DIR + "mypy")
+    assert expected_lint_cmd in out
     assert capture_cmd_output(f"{lint_cmd} .") == capture_cmd_output(f"{lint_cmd}")
     out = capture_cmd_output(f"{run}fast lint")
-    assert LINT_CMD in out
+    assert expected_lint_cmd in out
     assert "mypy --strict" in capture_cmd_output("fast lint --strict --dry")
     monkeypatch.setenv("FASTDEVCLI_STRICT", "1")
     assert "mypy --strict" in capture_cmd_output("fast lint --dry")
@@ -279,7 +289,7 @@ def test_make_style(mock_skip_mypy_0, mocker, mock_no_dmypy):
         make_style(["."], check_only=False, dry=True)
     assert expected in stream.getvalue()
     with capture_stdout() as stream:
-        make_style(".", check_only=False, dry=True)  # type:ignore[arg-type]
+        make_style(".", check_only=False, dry=True)  # type:ignore
     assert expected in stream.getvalue()
     with capture_stdout() as stream:
         make_style(["."], check_only=True, dry=True)
@@ -332,7 +342,7 @@ def test_lint_without_ruff_installed(mocker, mock_no_dmypy):
     with capture_stdout() as stream:
         lint(".", dry=True)
     output = stream.getvalue()
-    cmd = "pipx install ruff"
+    cmd = "uv tool install ruff"
     assert cmd in output
     tip = "You may need to run the following command to install ruff"
     assert tip in output
@@ -345,7 +355,7 @@ def test_lint_without_mypy_installed(mocker, mock_no_dmypy):
     with capture_stdout() as stream:
         lint(".", dry=True)
     output = stream.getvalue()
-    cmd = 'python -m pip install -U "fast-dev-cli"'
+    cmd = "python -m pip install -U mypy"
     assert cmd in output
     tip = "You may need to run the following command to install lint tools"
     assert tip in output

{fast_dev_cli-0.22.0 → fast_dev_cli-0.23.0}/tests/test_runserver.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import functools
 
-import fast_dev_cli
+import fast_dev_cli.cli
 from fast_dev_cli.cli import dev, main, run_and_echo, runserver
 
 
@@ -133,4 +133,4 @@ def test_run_by_module(tmp_path):
 def test_main(mocker):
     mocker.patch("fast_dev_cli.cli.cli")
     main()
-    fast_dev_cli.cli.cli.assert_called_once()  # type:ignore[attr-defined]
+    fast_dev_cli.cli.cli.assert_called_once()  # type:ignore

{fast_dev_cli-0.22.0 → fast_dev_cli-0.23.0}/tests/test_tag.py

@@ -32,7 +32,7 @@ def test_echo_when_not_dry(mocker, capsys):
     git_tag = GitTag("", dry=False)
     mocker.patch.object(git_tag, "mark_tag", return_value=True)
     git_tag.run()
-    assert "poetry publish --build" in capsys.readouterr().out
+    assert "pdm publish" in capsys.readouterr().out
 
 
 @contextmanager

{fast_dev_cli-0.22.0 → fast_dev_cli-0.23.0}/tests/test_upgrade.py

@@ -5,7 +5,8 @@ from io import StringIO
 from pathlib import Path
 
 import pytest
-import typer
+from typer import Exit
+from typer.colors import YELLOW
 
 import fast_dev_cli
 from fast_dev_cli.cli import (
@@ -314,8 +315,8 @@ def test_upgrade_unknown_tool(mocker):
     assert run_and_echo(cmd, verbose=False) == 1
     assert run_and_echo("pdm run " + cmd, verbose=False) == 1
     mocker.patch("fast_dev_cli.cli.secho")
-    with pytest.raises(typer.Exit):
+    with pytest.raises(Exit):
         upgrade(tool="pipenv")
     fast_dev_cli.cli.secho.assert_called_once_with(  # type:ignore
-        "Unknown tool 'pipenv'", fg=typer.colors.YELLOW
+        "Unknown tool 'pipenv'", fg=YELLOW
     )

fast_dev_cli-0.22.0/fast_dev_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.22.0"