fast-dev-cli 0.7.0__tar.gz → 0.7.2__tar.gz

{fast_dev_cli-0.7.0 → fast_dev_cli-0.7.2}/PKG-INFO

@@ -1,21 +1,24 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.7.0
+Version: 0.7.2
 Summary: 
 Author: Waket Zheng
 Author-email: waketzheng@gmail.com
-Requires-Python: >=3.11,<4.0
+Requires-Python: >=3.10,<4.0
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: all
 Requires-Dist: bumpversion (>=0.6.0,<0.7.0) ; extra == "all"
 Requires-Dist: click (>=7.1.1)
 Requires-Dist: coverage (>=6.5.0) ; extra == "all"
-Requires-Dist: mypy (>=1.5.0) ; extra == "all"
-Requires-Dist: pytest (>=8.1.1,<9.0.0) ; extra == "all"
-Requires-Dist: ruff (>=0.3) ; extra == "all"
-Requires-Dist: typer (>=0.12.0) ; extra == "all"
+Requires-Dist: mypy (>=1.10.0,<2.0.0) ; extra == "all"
+Requires-Dist: pytest (>=8.2.0,<9.0.0) ; extra == "all"
+Requires-Dist: ruff (>=0.4.2,<0.5.0) ; extra == "all"
+Requires-Dist: strenum (>=0.4.15) ; python_version < "3.11"
+Requires-Dist: type-extensions (>=0.1.2) ; python_version < "3.11"
+Requires-Dist: typer (>=0.12.3,<0.13.0) ; extra == "all"
 Description-Content-Type: text/markdown
 
 <p align="center">
@@ -37,6 +40,12 @@ Description-Content-Type: text/markdown
 <a href="https://coveralls.io/github/waketzheng/fast-dev-cli?branch=main" target="_blank">
     <img src="https://coveralls.io/repos/github/waketzheng/fast-dev-cli/badge.svg?branch=main" alt="Coverage Status">
 </a>
+<a href="https://github.com/astral-sh/ruff" target="_blank">
+    <img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json" alt="Ruff">
+</a>
+<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>
 </p>
 
 ---

{fast_dev_cli-0.7.0 → fast_dev_cli-0.7.2}/README.md

@@ -17,6 +17,12 @@
 <a href="https://coveralls.io/github/waketzheng/fast-dev-cli?branch=main" target="_blank">
     <img src="https://coveralls.io/repos/github/waketzheng/fast-dev-cli/badge.svg?branch=main" alt="Coverage Status">
 </a>
+<a href="https://github.com/astral-sh/ruff" target="_blank">
+    <img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json" alt="Ruff">
+</a>
+<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>
 </p>
 
 ---

fast_dev_cli-0.7.2/fast_dev_cli/__init__.py

@@ -0,0 +1,31 @@
+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.7.0 → fast_dev_cli-0.7.2}/fast_dev_cli/cli.py

@@ -1,13 +1,25 @@
+from __future__ import annotations
+
 import importlib.metadata
 import os
 import re
 import subprocess
 import sys
-from enum import StrEnum
 from functools import cached_property
 from pathlib import Path
 from subprocess import CompletedProcess
-from typing import Self, Type
+from typing import TYPE_CHECKING, Optional, Type
+
+if sys.version_info >= (3, 11):
+    from enum import StrEnum
+    from typing import Self
+else:  # pragma: no cover
+    from strenum import StrEnum  # type:ignore[no-redef,assignment]
+    from typing_extensions import Self
+
+if TYPE_CHECKING:
+    from typer.models import OptionInfo
+
 
 __version__ = importlib.metadata.version(Path(__file__).parent.name)
 
@@ -113,11 +125,17 @@ def get_current_version(verbose=False) -> str:
     return capture_cmd_output(cmd)
 
 
+def _ensure_bool(value: bool | "OptionInfo") -> bool:
+    if not isinstance(value, bool):
+        value = getattr(value, "default", False)
+    return value
+
+
 def exit_if_run_failed(
     cmd: str, env=None, _exit=False, dry=False, **kw
 ) -> CompletedProcess:
     run_and_echo(cmd, dry=True)
-    if dry:
+    if _ensure_bool(dry):
         return CompletedProcess("", 0)
     if env is not None:
         env = {**os.environ, **env}
@@ -213,7 +231,7 @@ def bump_version(
     dry: bool = Option(False, "--dry", help="Only print, not really run shell command"),
 ) -> None:
     """Bump up version string in pyproject.toml"""
-    return BumpUp(commit, part.value, dry=dry).run()
+    return BumpUp(_ensure_bool(commit), part.value, dry=dry).run()
 
 
 def bump() -> None:
@@ -380,8 +398,9 @@ class UpgradeDependencies(Project, DryRun):
         main_title = "[tool.poetry.dependencies]"
         text = toml_text.split(main_title)[-1]
         dev_flag = "--group dev"
-        if (dev_title := cls.DevFlag.new.value) not in text:
-            dev_title = cls.DevFlag.old.value  # For poetry<=1.2
+        new_flag, old_flag = cls.DevFlag.new, cls.DevFlag.old
+        if (dev_title := getattr(new_flag, "value", new_flag)) not in text:
+            dev_title = getattr(old_flag, "value", old_flag)  # For poetry<=1.2
             dev_flag = "--dev"
         others: list[list[str]] = []
         try:
@@ -522,6 +541,8 @@ class LintCode(DryRun):
 def lint(files=None, dry=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).run()
 
 
@@ -538,7 +559,7 @@ def make_style(
     """Run: ruff check/format to reformat code and then mypy to check"""
     if isinstance(files, str):
         files = [files]
-    if check_only:
+    if _ensure_bool(check_only):
         check(files, dry=dry)
     else:
         lint(files, dry=dry)
@@ -593,15 +614,20 @@ def _should_run_test_script(path: Path) -> bool:
     return path.exists()
 
 
-@cli.command()
-def test(
+@cli.command(name="test")
+def coverage_test(
     dry: bool = Option(False, "--dry", help="Only print, not really run shell command"),
+    ignore_script: bool = Option(False, "--ignore-script", "-i"),
 ) -> None:
     """Run unittest by pytest and report coverage"""
+    return test(dry, ignore_script)
+
+
+def test(dry: bool, ignore_script=False) -> None:
     cwd = Path.cwd()
     root = Project.get_work_dir(cwd=cwd, allow_cwd=True)
     test_script = root / "scripts" / "test.sh"
-    if _should_run_test_script(test_script):
+    if not _ensure_bool(ignore_script) and _should_run_test_script(test_script):
         cmd = f"sh {test_script.relative_to(root)}"
         if cwd != root:
             cmd = f"cd {root} && " + cmd
@@ -622,5 +648,29 @@ def upload(
     exit_if_run_failed(cmd, dry=dry)
 
 
+def dev(
+    port: int | None | "OptionInfo", host: str | None | "OptionInfo", dry=False
+) -> None:
+    cmd = "fastapi dev"
+    if (port := getattr(port, "default", port)) and port != 8000:
+        cmd += f" --port={port}"
+    if (host := getattr(host, "default", host)) and host not in (
+        "localhost",
+        "127.0.0.1",
+    ):
+        cmd += f" --host={host}"
+    exit_if_run_failed(cmd, dry=dry)
+
+
+@cli.command(name="dev")
+def runserver(
+    port: Optional[int] = Option(None, "-p", "--port"),
+    host: Optional[str] = Option(None, "-h", "--host"),
+    dry: bool = Option(False, "--dry", help="Only print, not really run shell command"),
+) -> None:
+    """Check code style without reformat"""
+    dev(port, host, dry=dry)
+
+
 if __name__ == "__main__":
     cli()  # pragma: no cover

fast_dev_cli-0.7.2/pyproject.toml

@@ -0,0 +1,50 @@
+[tool.poetry]
+name = "fast-dev-cli"
+version = "0.7.2"
+description = ""
+authors = ["Waket Zheng <waketzheng@gmail.com>"]
+readme = "README.md"
+packages = [{include = "fast_dev_cli"}]
+
+[tool.poetry.dependencies]
+python = "^3.10"
+click = ">=7.1.1"  # Many package depends on click, so only limit min version
+strenum = {version = ">=0.4.15", python = "<3.11"}
+type-extensions = {version = ">=0.1.2", python = "<3.11"}
+coverage = {version = ">=6.5.0", optional = true}
+ruff = {version = "^0.4.2", optional = true}
+mypy = {version = "^1.10.0", optional = true}
+bumpversion = {version = "^0.6.0", optional = true}
+pytest = {version = "^8.2.0", optional = true}
+typer = {version = "^0.12.3", optional = true}
+
+[tool.poetry.extras]
+all = ["ruff", "typer", "mypy", "bumpversion", "pytest", "coverage"]
+
+[tool.poetry.group.dev.dependencies]
+coveralls = {version = ">=4.0.0", python = ">=3.10,<3.13"}
+coverage = ">=6.5.0"  # use >= to compare with coveralls
+typer = "^0.12.3"
+ruff = "^0.4.2"
+mypy = "^1.10.0"
+pytest = "^8.2.0"
+ipython = "^8.24.0"
+bumpversion = "^0.6.0"
+pytest-mock = "^3.14.0"
+type-extensions = "^0.1.2"
+strenum = "^0.4.15"
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.poetry.scripts]
+fast = "fast_dev_cli:cli.cli"
+
+[tool.mypy]
+pretty = true
+ignore_missing_imports = true
+check_untyped_defs = true
+
+[tool.ruff.lint.per-file-ignores]
+"test_*.py" = ["E501"]

fast_dev_cli-0.7.0/fast_dev_cli/__init__.py

@@ -1,2 +0,0 @@
-from .cli import *  # NOQA: F403
-from .cli import __version__  # NOQA: F401

fast_dev_cli-0.7.0/pyproject.toml

@@ -1,53 +0,0 @@
-[tool.poetry]
-name = "fast-dev-cli"
-version = "0.7.0"
-description = ""
-authors = ["Waket Zheng <waketzheng@gmail.com>"]
-readme = "README.md"
-packages = [{include = "fast_dev_cli"}]
-
-[tool.poetry.dependencies]
-python = "^3.11"
-click = ">=7.1.1"
-ruff = {version = ">=0.3", optional = true}
-mypy = {version = ">=1.5.0", optional = true}
-coverage = {version = ">=6.5.0", optional = true}
-bumpversion = {version = "^0.6.0", optional = true}
-pytest = {version = "^8.1.1", optional = true}
-typer = {version = ">=0.12.0", optional = true}
-
-[tool.poetry.extras]
-all = ["ruff", "typer", "mypy", "bumpversion", "pytest", "coverage"]
-
-[tool.poetry.group.dev.dependencies]
-ruff = ">=0.3"
-mypy = "*"
-pytest = "*"
-coverage = "*"
-bumpversion = "*"
-typer = {extras = ["all"], version = "*"}
-ipython = "^8.23.0"
-coveralls = "^3.3.1"
-pytest-mock = "^3.14.0"
-
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
-
-[tool.poetry.scripts]
-fast = "fast_dev_cli:cli"
-
-[tool.ruff]
-target-version = "py311"
-
-[tool.mypy]
-pretty = true
-ignore_missing_imports = true
-check_untyped_defs = true
-
-[[tool.mypy.overrides]]
-module = ["tests.*"]
-check_untyped_defs = false
-
-[tool.ruff.lint.per-file-ignores]
-"test_*.py" = ["E501"]