fast-dev-cli 0.8.2__tar.gz → 0.9.0__tar.gz

{fast_dev_cli-0.8.2 → fast_dev_cli-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.8.2
+Version: 0.9.0
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta
@@ -12,17 +12,17 @@ Classifier: Programming Language :: Python :: 3 :: Only
 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: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development
 Classifier: Typing :: Typed
 Classifier: License :: OSI Approved :: MIT License
 Project-URL: Homepage, https://github.com/waketzheng/fast-dev-cli
-Requires-Python: <3.13,>=3.10
+Requires-Python: <4,>=3.10
 Requires-Dist: typer<0.13,>=0.12.3
-Requires-Dist: typing-extensions>=4.8.0
 Requires-Dist: coverage<8,>=7.5.1
-Requires-Dist: ruff<0.5,>=0.4.4
+Requires-Dist: ruff<0.6,>=0.4.4
 Requires-Dist: mypy<2,>=1.10.0
 Requires-Dist: bumpversion<0.7,>=0.6.0
 Requires-Dist: pytest<9,>=8.2.0
@@ -56,12 +56,17 @@ Description-Content-Type: text/markdown
 <a href="https://github.com/python/mypy" target="_blank">
     <img src="https://img.shields.io/badge/mypy-100%25-green.svg" alt="Mypy Coverage">
 </a>
+<a href="https://github.com/PyCQA/bandit" target="_blank">
+    <img src="https://img.shields.io/badge/security-bandit-yellow.svg" alt="security: bandit">
+</a>
 </p>
 
 ---
 
 **Source Code**: <a href="https://github.com/waketzheng/fast-dev-cli" target="_blank">https://github.com/waketzheng/fast-dev-cli</a>
 
+**English** | [中文](./README.zh.md)
+
 ## Requirements
 
 Python 3.10+

{fast_dev_cli-0.8.2 → fast_dev_cli-0.9.0}/README.md

@@ -23,12 +23,17 @@
 <a href="https://github.com/python/mypy" target="_blank">
     <img src="https://img.shields.io/badge/mypy-100%25-green.svg" alt="Mypy Coverage">
 </a>
+<a href="https://github.com/PyCQA/bandit" target="_blank">
+    <img src="https://img.shields.io/badge/security-bandit-yellow.svg" alt="security: bandit">
+</a>
 </p>
 
 ---
 
 **Source Code**: <a href="https://github.com/waketzheng/fast-dev-cli" target="_blank">https://github.com/waketzheng/fast-dev-cli</a>
 
+**English** | [中文](./README.zh.md)
+
 ## Requirements
 
 Python 3.10+

fast_dev_cli-0.9.0/fast_dev_cli/__init__.py

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

fast_dev_cli-0.9.0/fast_dev_cli/__main__.py

@@ -0,0 +1,3 @@
+from .cli import main
+
+main()

{fast_dev_cli-0.8.2 → fast_dev_cli-0.9.0}/fast_dev_cli/cli.py

@@ -3,41 +3,39 @@ from __future__ import annotations
 import importlib.metadata as importlib_metadata
 import os
 import re
-import subprocess
+import subprocess  # nosec:B404
 import sys
 from functools import cached_property
 from pathlib import Path
-from subprocess import CompletedProcess
-from typing import TYPE_CHECKING, Literal, Optional, Type
+from typing import Literal, Optional, Type
 
 import typer
 from typer import Exit, Option, echo, secho
-from typing_extensions import Annotated, Self
+from typer.models import OptionInfo
+
+try:
+    from . import __version__
+except ImportError:  # pragma: no cover
+    from importlib import import_module as _import  # For local unittest
+
+    __version__ = _import(Path(__file__).parent.name).__version__
 
 if sys.version_info >= (3, 11):
     from enum import StrEnum
+    from typing import Annotated, Self
 else:  # pragma: no cover
     from enum import Enum
 
+    from typing_extensions import Annotated, Self
+
     class StrEnum(str, Enum):
         __str__ = str.__str__
 
 
-if TYPE_CHECKING:  # pragma: no cover
-    from typer.models import OptionInfo
-
-
-__version__ = "0.8.2"
-
-
 def parse_files(args: list[str] | tuple[str, ...]) -> list[str]:
     return [i for i in args if not i.startswith("-")]
 
 
-if len(sys.argv) >= 2 and sys.argv[1] == "lint":
-    if not parse_files(sys.argv[2:]):
-        sys.argv.append(".")
-
 TOML_FILE = "pyproject.toml"
 cli = typer.Typer()
 
@@ -55,9 +53,10 @@ def is_venv() -> bool:
     )
 
 
-def _run_shell(cmd: str, **kw) -> CompletedProcess:
-    kw.setdefault("shell", True)
-    return subprocess.run(cmd, **kw)
+def _run_shell(cmd: list[str] | str, **kw) -> subprocess.CompletedProcess:
+    if isinstance(cmd, str):
+        kw.setdefault("shell", True)
+    return subprocess.run(cmd, **kw)  # nosec:B603
 
 
 def run_and_echo(cmd: str, *, dry=False, verbose=True, **kw) -> int:
@@ -77,7 +76,7 @@ def check_call(cmd: str) -> bool:
 def capture_cmd_output(command: list[str] | str, **kw) -> str:
     if isinstance(command, str) and not kw.get("shell"):
         command = command.split()
-    r = subprocess.run(command, capture_output=True, **kw)
+    r = _run_shell(command, capture_output=True, **kw)
     return r.stdout.strip().decode()
 
 
@@ -96,7 +95,7 @@ def get_current_version(
     return capture_cmd_output(cmd)
 
 
-def _ensure_bool(value: bool | "OptionInfo") -> bool:
+def _ensure_bool(value: bool | OptionInfo) -> bool:
     if not isinstance(value, bool):
         value = getattr(value, "default", False)
     return value
@@ -104,10 +103,10 @@ def _ensure_bool(value: bool | "OptionInfo") -> bool:
 
 def exit_if_run_failed(
     cmd: str, env=None, _exit=False, dry=False, **kw
-) -> CompletedProcess:
+) -> subprocess.CompletedProcess:
     run_and_echo(cmd, dry=True)
     if _ensure_bool(dry):
-        return CompletedProcess("", 0)
+        return subprocess.CompletedProcess("", 0)
     if env is not None:
         env = {**os.environ, **env}
     r = _run_shell(cmd, env=env, **kw)
@@ -202,7 +201,7 @@ class BumpUp(DryRun):
 @cli.command()
 def version() -> None:
     """Show the version of this tool"""
-    echo(__version__)
+    echo(f"Fast Dev Cli version: {__version__}")
 
 
 @cli.command(name="bump")
@@ -550,7 +549,7 @@ class LintCode(DryRun):
         return cmd
 
     def gen(self: Self) -> str:
-        paths = " ".join(self.args) if self.args else "."
+        paths = " ".join(map(str, self.args)) if self.args else "."
         return self.to_cmd(paths, self.check_only)
 
 
@@ -568,12 +567,14 @@ def check(files=None, dry=False) -> None:
 
 @cli.command(name="lint")
 def make_style(
-    files: list[str],
+    files: Annotated[Optional[list[Path]], typer.Argument()] = None,
     check_only: bool = Option(False, "--check-only", "-c"),
     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"""
-    if isinstance(files, str):
+    if files is None:
+        files = [Path(".")]
+    elif isinstance(files, str):
         files = [files]
     if _ensure_bool(check_only):
         check(files, dry=dry)
@@ -666,8 +667,8 @@ def upload(
 
 
 def dev(
-    port: int | None | "OptionInfo",
-    host: str | None | "OptionInfo",
+    port: int | None | OptionInfo,
+    host: str | None | OptionInfo,
     file: Optional[str] = None,
     dry=False,
 ) -> None:
@@ -706,5 +707,9 @@ def runserver(
         dev(port, host, dry=dry)
 
 
-if __name__ == "__main__":  # pragma: no cover
+def main() -> None:
     cli()
+
+
+if __name__ == "__main__":  # pragma: no cover
+    main()

{fast_dev_cli-0.8.2 → fast_dev_cli-0.9.0}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
     { name = "Waket Zheng", email = "waketzheng@gmail.com>" },
 ]
 readme = "README.md"
-requires-python = ">=3.10,<3.13"
+requires-python = ">=3.10,<4"
 classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
@@ -23,6 +23,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Software Development :: Libraries",
     "Topic :: Software Development",
@@ -31,14 +32,13 @@ classifiers = [
 ]
 dependencies = [
     "typer>=0.12.3,<0.13",
-    "typing-extensions>=4.8.0",
     "coverage >=7.5.1,<8",
-    "ruff >=0.4.4,<0.5",
+    "ruff >=0.4.4,<0.6",
     "mypy >=1.10.0,<2",
     "bumpversion >=0.6.0,<0.7",
     "pytest >=8.2.0,<9",
 ]
-version = "0.8.2"
+version = "0.9.0"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"
@@ -50,14 +50,14 @@ all = [
 ]
 
 [project.scripts]
-fast = "fast_dev_cli:cli.cli"
+fast = "fast_dev_cli:cli.main"
 
 [tool.pdm]
 distribution = true
 
 [tool.pdm.version]
 source = "file"
-path = "fast_dev_cli/cli.py"
+path = "fast_dev_cli/__init__.py"
 
 [tool.pdm.build]
 source-includes = [
@@ -72,6 +72,9 @@ dev = [
 [tool.waketzheng._internal-slim-build.packages.fastdevcli-slim.project]
 name = "fastdevcli-slim"
 
+[tool.waketzheng._internal-slim-build.packages.fastdevcli-slim.project.scripts]
+fast = "fast_dev_cli:cli.main"
+
 [tool.waketzheng._internal-slim-build.packages.fast-dev-cli]
 include-optional-dependencies = [
     "standard",
@@ -84,7 +87,7 @@ all = [
 ]
 
 [tool.waketzheng._internal-slim-build.packages.fast-dev-cli.project.scripts]
-fast = "fast_dev_cli:cli.cli"
+fast = "fast_dev_cli:cli.main"
 
 [tool.pytest.ini_options]
 testpaths = [
@@ -112,6 +115,7 @@ exclude_lines = [
 ]
 omit = [
     "tests/*",
+    "fast_dev_cli/__main__.py",
 ]
 
 [tool.mypy]

{fast_dev_cli-0.8.2 → fast_dev_cli-0.9.0}/scripts/check.sh

@@ -7,3 +7,5 @@ set -x
 
 pdm run fast check || \
   echo -e "\033[1m Please run './scripts/format.sh' to auto-fix style issues \033[0m"
+
+pdm run bandit -r fast_dev_cli/

{fast_dev_cli-0.8.2 → fast_dev_cli-0.9.0}/tests/test_bump.py

@@ -62,7 +62,7 @@ def test_bump(
 ):
     version = get_current_version()
     patch_without_commit, patch_with_commit, minor_with_commit = _bump_commands(
-        version, "fast_dev_cli/cli.py"
+        version, "fast_dev_cli/__init__.py"
     )
     stream = StringIO()
     with redirect_stdout(stream):

{fast_dev_cli-0.8.2 → fast_dev_cli-0.9.0}/tests/test_lint.py

@@ -49,7 +49,7 @@ def test_lint_cmd():
     )
     assert (
         capture_cmd_output(f"{lint_cmd} .")
-        == capture_cmd_output(f"{lint_cmd} lint")
+        == capture_cmd_output(f"{lint_cmd}")
         == capture_cmd_output(f"{run}fast lint")
     )
 
@@ -57,10 +57,10 @@ def test_lint_cmd():
 def test_make_style(mocker):
     mocker.patch("fast_dev_cli.cli.is_venv", return_value=True)
     with capture_stdout() as stream:
-        make_style(["."], check_only=False, dry=True)
+        make_style([Path(".")], check_only=False, dry=True)
     assert LINT_CMD in stream.getvalue()
     with capture_stdout() as stream:
-        make_style(["."], check_only=True, dry=True)
+        make_style([Path(".")], check_only=True, dry=True)
     assert CHECK_CMD in stream.getvalue()
     with capture_stdout() as stream:
         only_check(dry=True)

fast_dev_cli-0.8.2/fast_dev_cli/__init__.py

@@ -1,31 +0,0 @@
-from .cli import (
-    __version__,
-    bump,
-    bump_version,
-    check,
-    lint,
-    make_style,
-    only_check,
-    sync,
-    tag,
-    test,
-    upgrade,
-    upload,
-    version,
-)
-
-__all__ = (
-    "__version__",
-    "version",
-    "bump_version",
-    "bump",
-    "lint",
-    "check",
-    "upload",
-    "test",
-    "sync",
-    "tag",
-    "upgrade",
-    "make_style",
-    "only_check",
-)

fast_dev_cli-0.8.2/fast_dev_cli/__main__.py

@@ -1,3 +0,0 @@
-from .cli import cli
-
-cli()

fast_dev_cli-0.8.2/tests/test_import.py

@@ -1,12 +0,0 @@
-import importlib
-import sys
-
-from tests.utils import mock_sys_argv
-
-
-def test_pad_dot():
-    with mock_sys_argv(["lint"]):
-        cli = importlib.import_module("fast_dev_cli.cli")
-        assert callable(cli.cli)
-        importlib.reload(cli)
-        assert sys.argv[1:] == ["lint", "."]