fast-dev-cli 0.12.0__tar.gz → 0.13.0__tar.gz

{fast_dev_cli-0.12.0 → fast_dev_cli-0.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.12.0
+Version: 0.13.0
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta
@@ -25,8 +25,8 @@ Requires-Dist: typer<1,>=0.12.3
 Requires-Dist: emoji<3,>=2.12.1
 Requires-Dist: tomli<3,>=2.0.1; python_version < "3.11"
 Requires-Dist: coverage<8,>=7.5.1
-Requires-Dist: ruff<1,>=0.4.4
-Requires-Dist: mypy<2,>=1.10.0
+Requires-Dist: ruff<1,>=0.6.0
+Requires-Dist: mypy<2,>=1.15.0
 Requires-Dist: bumpversion2<2,>=1.4.3
 Requires-Dist: pytest<9,>=8.2.0
 Requires-Dist: packaging>=20.5
@@ -35,7 +35,7 @@ Requires-Dist: all; extra == "include-optional-dependencies"
 Description-Content-Type: text/markdown
 
 <p align="center">
-  <img src="https://fastdevcli.waketzheng.top/img/logo-margin/logo-teal.png" alt="FastDevCli">
+  <img src="https://raw.githubusercontent.com/waketzheng/fast-dev-cli/main/img/logo-teal.png" alt="FastDevCli">
 </p>
 <p align="center">
     <em>Toolkit for python code lint/test/bump ...</em>
@@ -77,6 +77,11 @@ Description-Content-Type: text/markdown
 
 Python 3.9+
 
+## Features
+
+- Support poetry/pdm/uv
+- Support Windows/MacOS/Linux
+
 ## Installation
 
 <div class="termy">

{fast_dev_cli-0.12.0 → fast_dev_cli-0.13.0}/README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="https://fastdevcli.waketzheng.top/img/logo-margin/logo-teal.png" alt="FastDevCli">
+  <img src="https://raw.githubusercontent.com/waketzheng/fast-dev-cli/main/img/logo-teal.png" alt="FastDevCli">
 </p>
 <p align="center">
     <em>Toolkit for python code lint/test/bump ...</em>
@@ -41,6 +41,11 @@
 
 Python 3.9+
 
+## Features
+
+- Support poetry/pdm/uv
+- Support Windows/MacOS/Linux
+
 ## Installation
 
 <div class="termy">

fast_dev_cli-0.13.0/fast_dev_cli/__init__.py

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

{fast_dev_cli-0.12.0 → fast_dev_cli-0.13.0}/fast_dev_cli/cli.py

@@ -8,7 +8,7 @@ import subprocess  # nosec:B404
 import sys
 from functools import cached_property
 from pathlib import Path
-from typing import Literal, Optional, get_args
+from typing import Literal, Optional, get_args  # Optional is required by typers
 
 import emoji
 import typer
@@ -96,7 +96,7 @@ def capture_cmd_output(command: list[str] | str, *, raises=False, **kw) -> str:
     r = _run_shell(command, capture_output=True, encoding="utf-8", **kw)
     if raises and r.returncode != 0:
         raise ShellCommandError(r.stderr)
-    return r.stdout.strip()
+    return r.stdout.strip() or r.stderr
 
 
 def _parse_version(line: str, pattern: re.Pattern) -> str:
@@ -127,7 +127,7 @@ def read_version_from_file(
         secho("WARNING: __init__.py file does not exist!")
         return "0.0.0"
     pattern = re.compile(r"__version__\s*=")
-    for line in init_file.read_text().splitlines():
+    for line in init_file.read_text("utf-8").splitlines():
         if pattern.match(line):
             return _parse_version(line, pattern)
     secho(f"WARNING: can not find '__version__' var in {init_file}!")
@@ -260,15 +260,25 @@ class BumpUp(DryRun):
             except KeyError:
                 packages = []
             else:
-                packages = [j for i in package_item if (j := i.get("include"))]
+                packages = [
+                    (j, i.get("from", ""))
+                    for i in package_item
+                    if (j := i.get("include"))
+                ]
             # In case of managed by `poetry-plugin-version`
             cwd = Path.cwd()
             pattern = re.compile(r"__version__\s*=\s*['\"]")
-            ds = [cwd / i for i in packages] + [cwd / poetry_module_name(cwd.name), cwd]
+            ds: list[Path] = []
+            for package_name, source_dir in packages:
+                ds.append(cwd / package_name)
+                ds.append(cwd / "src" / package_name)
+                if source_dir and source_dir != "src":
+                    ds.append(cwd / source_dir / package_name)
+            module_name = poetry_module_name(cwd.name)
+            ds.extend([cwd / module_name, cwd / "src" / module_name, cwd])
             for d in ds:
-                if (init_file := d / "__init__.py").exists() and pattern.search(
-                    init_file.read_text()
-                ):
+                init_file = d / "__init__.py"
+                if init_file.exists() and pattern.search(init_file.read_text("utf8")):
                     break
             else:
                 raise ParseError("Version file not found! Where are you now?")
@@ -666,11 +676,13 @@ class LintCode(DryRun):
         dry=False,
         bandit=False,
         skip_mypy=False,
+        dmypy=False,
     ) -> None:
         self.args = args
         self.check_only = check_only
         self._bandit = bandit
         self._skip_mypy = skip_mypy
+        self._use_dmypy = dmypy
         super().__init__(_exit, dry)
 
     @staticmethod
@@ -678,11 +690,11 @@ class LintCode(DryRun):
         return check_call("ruff --version")
 
     @staticmethod
-    def prefer_dmypy(paths: str, tools: list[str]) -> bool:
+    def prefer_dmypy(paths: str, tools: list[str], use_dmypy=False) -> bool:
         return (
             paths == "."
             and any(t.startswith("mypy") for t in tools)
-            and not load_bool("NO_DMYPY")
+            and (use_dmypy or load_bool("FASTDEVCLI_DMYPY"))
         )
 
     @staticmethod
@@ -696,7 +708,12 @@ class LintCode(DryRun):
 
     @classmethod
     def to_cmd(
-        cls: type[Self], paths=".", check_only=False, bandit=False, skip_mypy=False
+        cls: type[Self],
+        paths=".",
+        check_only=False,
+        bandit=False,
+        skip_mypy=False,
+        use_dmypy=False,
     ) -> str:
         cmd = ""
         tools = ["ruff format", "ruff check --extend-select=I,B,SIM --fix", "mypy"]
@@ -725,7 +742,7 @@ class LintCode(DryRun):
             should_run_by_tool = True
         if should_run_by_tool and (manage_tool := Project.get_manage_tool()):
             prefix = manage_tool + " run "
-        if cls.prefer_dmypy(paths, tools):
+        if cls.prefer_dmypy(paths, tools, use_dmypy=use_dmypy):
             tools[-1] = "dmypy run"
         cmd += lint_them.format(prefix, paths, *tools)
         if bandit or load_bool("FASTDEVCLI_BANDIT"):
@@ -737,24 +754,32 @@ class LintCode(DryRun):
 
     def gen(self: Self) -> str:
         paths = " ".join(map(str, self.args)) if self.args else "."
-        return self.to_cmd(paths, self.check_only, self._bandit, self._skip_mypy)
+        return self.to_cmd(
+            paths, self.check_only, self._bandit, self._skip_mypy, self._use_dmypy
+        )
 
 
 def parse_files(args: list[str] | tuple[str, ...]) -> list[str]:
     return [i for i in args if not i.startswith("-")]
 
 
-def lint(files=None, dry=False, skip_mypy=False) -> None:
+def lint(files=None, dry=False, skip_mypy=False, dmypy=False) -> None:
     if files is None:
         files = parse_files(sys.argv[1:])
     if files and files[0] == "lint":
         files = files[1:]
-    LintCode(files, dry=dry, skip_mypy=skip_mypy).run()
+    LintCode(files, dry=dry, skip_mypy=skip_mypy, dmypy=dmypy).run()
 
 
-def check(files=None, dry=False, bandit=False, skip_mypy=False) -> None:
+def check(files=None, dry=False, bandit=False, skip_mypy=False, dmypy=False) -> None:
     LintCode(
-        files, check_only=True, _exit=True, dry=dry, bandit=bandit, skip_mypy=skip_mypy
+        files,
+        check_only=True,
+        _exit=True,
+        dry=dry,
+        bandit=bandit,
+        skip_mypy=skip_mypy,
+        dmypy=dmypy,
     ).run()
 
 
@@ -763,6 +788,9 @@ def make_style(
     files: Optional[list[Path]] = typer.Argument(default=None),  # noqa:B008
     check_only: bool = Option(False, "--check-only", "-c"),
     skip_mypy: bool = Option(False, "--skip-mypy"),
+    use_dmypy: bool = Option(
+        False, "--dmypy", help="Use `dmypy run` instead of `mypy`"
+    ),
     dry: bool = Option(False, "--dry", help="Only print, not really run shell command"),
 ) -> None:
     """Run: ruff check/format to reformat code and then mypy to check"""
@@ -771,10 +799,11 @@ def make_style(
     elif isinstance(files, str):
         files = [files]
     skip = _ensure_bool(skip_mypy)
+    dmypy = _ensure_bool(use_dmypy)
     if _ensure_bool(check_only):
-        check(files, dry=dry, skip_mypy=skip)
+        check(files, dry=dry, skip_mypy=skip, dmypy=dmypy)
     else:
-        lint(files, dry=dry, skip_mypy=skip)
+        lint(files, dry=dry, skip_mypy=skip, dmypy=dmypy)
 
 
 @cli.command(name="check")

{fast_dev_cli-0.12.0 → fast_dev_cli-0.13.0}/pyproject.toml

@@ -36,13 +36,13 @@ dependencies = [
     "emoji >=2.12.1,<3",
     "tomli>=2.0.1,<3; python_version < '3.11'",
     "coverage >=7.5.1,<8",
-    "ruff >=0.4.4,<1",
-    "mypy >=1.10.0,<2",
+    "ruff >=0.6.0,<1",
+    "mypy >=1.15.0,<2",
     "bumpversion2 >=1.4.3,<2",
     "pytest >=8.2.0,<9",
     "packaging>=20.5",
 ]
-version = "0.12.0"
+version = "0.13.0"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"

{fast_dev_cli-0.12.0 → fast_dev_cli-0.13.0}/scripts/check.py

@@ -19,11 +19,12 @@ def run_and_echo(cmd, tool=TOOL, verbose=True):
     return os.system(cmd)
 
 
-if run_and_echo("fast check", verbose=False) != 0:
+if run_and_echo("fast check --skip-mypy", verbose=False) != 0:
     print("\033[1m Please run './scripts/format.py' to auto-fix style issues \033[0m")
     sys.exit(1)
-
 package_name = os.path.basename(work_dir).replace("-", "_").replace(" ", "_")
+if run_and_echo("mypy {} {}".format(package_name, "tests")) != 0:
+    sys.exit(1)
 if run_and_echo("bandit -r {}".format(package_name)) != 0:
     sys.exit(1)
 print("Done. ✨ 🍰 ✨")

{fast_dev_cli-0.12.0 → fast_dev_cli-0.13.0}/tests/test_lint.py

@@ -79,7 +79,10 @@ def test_check_bandit(tmp_path):
     with chdir(tmp_path):
         assert LintCode.get_package_name() == "."
         run_and_echo(f"poetry new {package_path.name}")
-    shutil.rmtree(package_path / package_path.name)
+    src_dir = package_path / "src"
+    if not src_dir.exists():  # For poetry<2.1
+        src_dir = src_dir.parent / package_path.name
+    shutil.rmtree(src_dir)
     with chdir(package_path):
         command = capture_cmd_output("fast check --bandit --dry")
     assert "bandit -r ." in command
@@ -107,8 +110,7 @@ def test_fast_check_0(mock_no_dmypy_0):
 
 def _fast_check():
     command = capture_cmd_output("fast check --dry")
-    expected = CHECK_CMD.replace("mypy", "dmypy run")
-    for cmd in expected.split(SEP):
+    for cmd in CHECK_CMD.split(SEP):
         assert cmd in command
 
 
@@ -130,9 +132,14 @@ def test_lint_cmd(mock_no_dmypy):
     )
 
 
-def test_dmypy_run(mocker):
-    mocker.patch("fast_dev_cli.cli.LintCode.prefer_dmypy", return_value=True)
-    command = capture_cmd_output("fast lint --dry .")
+def test_with_dmypy():
+    command = capture_cmd_output("fast lint --dmypy --dry .")
+    assert "dmypy run ." in command
+
+
+def test_dmypy_run(monkeypatch):
+    monkeypatch.setenv("FASTDEVCLI_DMYPY", "1")
+    command = capture_cmd_output("python -m fast_dev_cli lint --dry .")
     assert "dmypy run ." in command
 
 

{fast_dev_cli-0.12.0 → fast_dev_cli-0.13.0}/tests/test_poetry_version_plugin.py

@@ -1,4 +1,3 @@
-import os
 import shutil
 import sys
 from collections.abc import Generator
@@ -41,6 +40,10 @@ def _prepare_package(
         b += f'\npackages = [{{include = "{package_name}"}}]'
     with chdir(package_path.parent):
         run_and_echo(f'poetry new "{package_path.name}"')
+    src_dir = package_path / "src"
+    if is_src_layout := src_dir.exists():
+        # poetry v2 default to use src/<package_name> layout
+        init_file = src_dir / package_name / init_file.name
     toml_file.unlink()
     py_version = "{}.{}".format(*sys.version_info)
     with chdir(package_path):
@@ -52,19 +55,23 @@ def _prepare_package(
             )
         toml_file.write_text(text + CONF)
         if package_path.name != package_name:
-            shutil.move(package_path.name, package_name)
+            if is_src_layout:
+                shutil.move(src_dir / package_path.name, src_dir / package_name)
+            else:
+                shutil.move(package_path.name, package_name)
         init_file.write_text('__version__ = "0.0.1"\n')
         yield init_file
 
 
-def _build_bump_cmd(init_file: Path) -> str:
-    relative_path = os.path.join(init_file.parent.name, init_file.name)
+def _build_bump_cmd(init_file: Path, project_path: Path) -> str:
+    relative_path = init_file.relative_to(project_path).as_posix()
     return rf'bumpversion --parse "(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)" --current-version="0.0.1" patch {relative_path} --allow-dirty'
 
 
 def test_version_plugin(tmp_path: Path) -> None:
-    with _prepare_package(tmp_path / "helloworld") as init_file:
-        command = _build_bump_cmd(init_file)
+    project_path = tmp_path / "helloworld"
+    with _prepare_package(project_path) as init_file:
+        command = _build_bump_cmd(init_file, project_path)
         assert BumpUp(part="patch", commit=False, dry=True).gen() == command
         run_and_echo("poetry run fast bump patch")
         assert init_file.read_text() == '__version__ = "0.0.2"\n'
@@ -74,8 +81,9 @@ def test_version_plugin(tmp_path: Path) -> None:
 
 
 def test_version_plugin_2(tmp_path: Path) -> None:
-    with _prepare_package(tmp_path / "helloworld", mark="0.0.0") as init_file:
-        command = _build_bump_cmd(init_file)
+    project_path = tmp_path / "helloworld"
+    with _prepare_package(project_path, mark="0.0.0") as init_file:
+        command = _build_bump_cmd(init_file, project_path)
         assert BumpUp(part="patch", commit=False, dry=True).gen() == command
         run_and_echo("poetry run fast bump patch")
         assert init_file.read_text() == '__version__ = "0.0.2"\n'
@@ -85,16 +93,18 @@ def test_version_plugin_2(tmp_path: Path) -> None:
 
 
 def test_version_plugin_include_defined(tmp_path: Path) -> None:
-    with _prepare_package(tmp_path / "hello world", True) as init_file:
-        command = _build_bump_cmd(init_file)
+    project_path = tmp_path / "hello world"
+    with _prepare_package(project_path, True) as init_file:
+        command = _build_bump_cmd(init_file, project_path)
         assert BumpUp(part="patch", commit=False, dry=True).gen() == command
         run_and_echo("poetry run fast bump patch")
         assert init_file.read_text() == '__version__ = "0.0.2"\n'
 
 
 def test_version_plugin_include_defined_2(tmp_path: Path) -> None:
-    with _prepare_package(tmp_path / "hello world", True, mark="0.0.0") as init_file:
-        command = _build_bump_cmd(init_file)
+    project_path = tmp_path / "hello world"
+    with _prepare_package(project_path, True, mark="0.0.0") as init_file:
+        command = _build_bump_cmd(init_file, project_path)
         assert BumpUp(part="patch", commit=False, dry=True).gen() == command
         run_and_echo("poetry run fast bump patch")
         assert init_file.read_text() == '__version__ = "0.0.2"\n'

fast_dev_cli-0.12.0/fast_dev_cli/__init__.py

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