fast-dev-cli 0.9.7__tar.gz → 0.9.8__tar.gz

{fast_dev_cli-0.9.7 → fast_dev_cli-0.9.8}/PKG-INFO

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

fast_dev_cli-0.9.8/fast_dev_cli/__init__.py

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

{fast_dev_cli-0.9.7 → fast_dev_cli-0.9.8}/fast_dev_cli/cli.py

@@ -573,6 +573,12 @@ class LintCode(DryRun):
     def check_lint_tool_installed() -> bool:
         return check_call("ruff --version")
 
+    @staticmethod
+    def prefer_dmypy(paths: str, tools: list[str]) -> bool:
+        return (
+            paths == "." and tools[-1].startswith("mypy") and not load_bool("NO_DMYPY")
+        )
+
     @classmethod
     def to_cmd(cls: Type[Self], paths=".", check_only=False) -> str:
         cmd = ""
@@ -600,6 +606,8 @@ class LintCode(DryRun):
             should_run_by_tool = True
         if should_run_by_tool:
             prefix = Project.get_manage_tool() + " run "
+        if cls.prefer_dmypy(paths, tools):
+            tools[-1] = "dmypy run"
         cmd += lint_them.format(prefix, paths, *tools)
         return cmd
 

{fast_dev_cli-0.9.7 → fast_dev_cli-0.9.8}/pyproject.toml

@@ -40,7 +40,7 @@ dependencies = [
     "pytest >=8.2.0,<9",
     "emoji >=2.12.1,<3",
 ]
-version = "0.9.7"
+version = "0.9.8"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"

{fast_dev_cli-0.9.7 → fast_dev_cli-0.9.8}/tests/test_lint.py

@@ -30,6 +30,16 @@ def mock_skip_mypy_0(monkeypatch):
     monkeypatch.setenv("SKIP_MYPY", "0")
 
 
+@pytest.fixture
+def mock_no_dmypy(monkeypatch):
+    monkeypatch.setenv("NO_DMYPY", "1")
+
+
+@pytest.fixture
+def mock_no_dmypy_0(monkeypatch):
+    monkeypatch.setenv("NO_DMYPY", "0")
+
+
 @pytest.fixture
 def mock_ignore_missing_imports(monkeypatch):
     monkeypatch.setenv("IGNORE_MISSING_IMPORTS", "1")
@@ -46,13 +56,28 @@ LINT_CMD = _CMD.format("", " --fix")
 CHECK_CMD = _CMD.format(" --check", "")
 
 
-def test_check():
+def test_check(mock_no_dmypy):
     command = capture_cmd_output("fast check --dry")
     for cmd in CHECK_CMD.split(SEP):
         assert cmd in command
 
 
-def test_lint_cmd():
+def test_fast_check():
+    _fast_check()
+
+
+def test_fast_check_0(mock_no_dmypy_0):
+    _fast_check()
+
+
+def _fast_check():
+    command = capture_cmd_output("fast check --dry")
+    expected = CHECK_CMD.replace("mypy", "dmypy run")
+    for cmd in expected.split(SEP):
+        assert cmd in command
+
+
+def test_lint_cmd(mock_no_dmypy):
     run = "pdm run "
     lint_cmd = f"{run}python fast_dev_cli/cli.py lint"
     command = capture_cmd_output(f"{lint_cmd} . --dry")
@@ -70,7 +95,20 @@ def test_lint_cmd():
     )
 
 
-def test_make_style(mocker):
+def test_dmypy_run(mocker):
+    mocker.patch("fast_dev_cli.cli.LintCode.prefer_dmypy", return_value=True)
+    command = capture_cmd_output("fast lint --dry .")
+    assert "dmypy run ." in command
+
+
+def test_lint_with_prefix(mocker):
+    mocker.patch("fast_dev_cli.cli.is_venv", return_value=False)
+    with capture_stdout() as stream:
+        make_style([Path(".")], check_only=False, dry=True)
+    assert "pdm run" in stream.getvalue()
+
+
+def test_make_style(mocker, mock_no_dmypy):
     mocker.patch("fast_dev_cli.cli.is_venv", return_value=True)
     with capture_stdout() as stream:
         make_style([Path(".")], check_only=False, dry=True)
@@ -83,7 +121,7 @@ def test_make_style(mocker):
     assert CHECK_CMD in stream.getvalue()
 
 
-def test_lint_class(mocker):
+def test_lint_class(mocker, mock_no_dmypy):
     mocker.patch("fast_dev_cli.cli.is_venv", return_value=True)
     assert LintCode(".").gen() == LINT_CMD
     check = LintCode(".", check_only=True)
@@ -92,7 +130,7 @@ def test_lint_class(mocker):
     assert LintCode(".").gen() == LINT_CMD
 
 
-def test_lint_func(mocker):
+def test_lint_func(mocker, mock_no_dmypy):
     mocker.patch("fast_dev_cli.cli.is_venv", return_value=True)
     with capture_stdout() as stream:
         lint(".", dry=True)
@@ -102,7 +140,7 @@ def test_lint_func(mocker):
     assert LINT_CMD.replace(" .", " tests") in stream.getvalue()
 
 
-def test_lint_without_ruff_installed(mocker):
+def test_lint_without_ruff_installed(mocker, mock_no_dmypy):
     mocker.patch("fast_dev_cli.cli.is_venv", return_value=True)
     mocker.patch(
         "fast_dev_cli.cli.LintCode.check_lint_tool_installed", return_value=False
@@ -117,7 +155,7 @@ def test_lint_without_ruff_installed(mocker):
     assert f"{tip}:\n\n  {cmd}" in output
 
 
-def test_no_fix(mock_no_fix, mocker):
+def test_no_fix(mock_no_fix, mocker, mock_no_dmypy):
     mocker.patch("fast_dev_cli.cli.is_venv", return_value=True)
     assert LintCode(".").gen() == LINT_CMD.replace(" --fix", "")
 
@@ -128,24 +166,24 @@ def test_skip_mypy(mock_skip_mypy, mocker):
     assert LintCode(".").gen() == SEP.join(i for i in cmds if not i.startswith("mypy"))
 
 
-def test_skip_mypy_0(mock_skip_mypy_0, mocker):
+def test_skip_mypy_0(mock_skip_mypy_0, mocker, mock_no_dmypy):
     mocker.patch("fast_dev_cli.cli.is_venv", return_value=True)
     assert LintCode(".").gen() == LINT_CMD
 
 
-def test_ignore_missing_imports(mock_ignore_missing_imports, mocker):
+def test_ignore_missing_imports(mock_ignore_missing_imports, mocker, mock_no_dmypy):
     mocker.patch("fast_dev_cli.cli.is_venv", return_value=True)
     assert LintCode(".").gen() == LINT_CMD.replace(
         "mypy ", "mypy --ignore-missing-imports "
     )
 
 
-def test_ignore_missing_imports_0(mock_ignore_missing_imports_0, mocker):
+def test_ignore_missing_imports_0(mock_ignore_missing_imports_0, mocker, mock_no_dmypy):
     mocker.patch("fast_dev_cli.cli.is_venv", return_value=True)
     assert LintCode(".").gen() == LINT_CMD
 
 
-def test_not_in_root(mocker):
+def test_not_in_root(mocker, mock_no_dmypy):
     mocker.patch("fast_dev_cli.cli.is_venv", return_value=True)
     root = Path(__file__).parent.parent
     with chdir(root / "fast_dev_cli"):

fast_dev_cli-0.9.7/fast_dev_cli/__init__.py

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