fast-dev-cli 0.6.6__tar.gz → 0.7.1__tar.gz

{fast_dev_cli-0.6.6 → fast_dev_cli-0.7.1}/PKG-INFO

@@ -1,23 +1,24 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.6.6
+Version: 0.7.1
 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: black (>=23.9.1) ; 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: isort (>=5.12.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">
@@ -39,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.6.6 → fast_dev_cli-0.7.1}/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.1/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.6.6 → fast_dev_cli-0.7.1}/fast_dev_cli/cli.py

@@ -3,11 +3,18 @@ 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
+
+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
+
 
 __version__ = importlib.metadata.version(Path(__file__).parent.name)
 
@@ -246,7 +253,8 @@ class Project:
     def get_work_dir(
         cls: Type[Self], name=TOML_FILE, cwd: Path | None = None, allow_cwd=False
     ) -> Path:
-        if d := cls.work_dir(name, cwd or Path.cwd(), cls.path_depth):
+        cwd = cwd or Path.cwd()
+        if d := cls.work_dir(name, cwd, cls.path_depth):
             return d
         if allow_cwd:
             return cls.get_root_dir(cwd)
@@ -379,8 +387,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:
@@ -422,7 +431,7 @@ class UpgradeDependencies(Project, DryRun):
         return _upgrade
 
     def gen(self: Self) -> str:
-        return self.gen_cmd() + " && poetry update"
+        return self.gen_cmd() + " && poetry lock && poetry update"
 
 
 @cli.command()
@@ -487,36 +496,20 @@ class LintCode(DryRun):
 
     @staticmethod
     def check_lint_tool_installed() -> bool:
-        return check_call("black --version")
+        return check_call("ruff --version")
 
     @classmethod
     def to_cmd(cls: Type[Self], paths=".", check_only=False) -> str:
         cmd = ""
-        tools = ["isort --profile=black", "black", "ruff check --fix", "mypy"]
+        tools = ["ruff check --extend-select=I --fix", "ruff format", "mypy"]
         if check_only:
-            tools[0] += " --check-only"
-            tools[1] += " --check --fast"
+            tools[1] += " --check"
         if check_only or load_bool("NO_FIX"):
-            tools[2] = tools[2].replace(" --fix", "")
+            tools[0] = tools[0].replace(" --fix", "")
         if load_bool("SKIP_MYPY"):
             # Sometimes mypy is too slow
             tools = tools[:-1]
         lint_them = " && ".join("{0}{%d} {1}" % i for i in range(2, len(tools) + 2))
-        current_path = Path.cwd()
-        root = Project.get_work_dir(cwd=current_path, allow_cwd=True)
-        app_name = root.name.replace("-", "_")
-        if (app_dir := root / app_name).exists() or (app_dir := root / "app").exists():
-            if current_path == app_dir:
-                tools[0] += " --src=."
-            elif current_path == root:
-                tools[0] += f" --src={app_dir.name}"
-            else:
-                parents = "../"
-                for i, p in enumerate(current_path.parents):
-                    if p == root:
-                        parents *= i + 1
-                        break
-                tools[0] += f" --src={parents}{app_dir.name}"
         prefix = "poetry run "
         if is_venv():
             if cls.check_lint_tool_installed():
@@ -550,7 +543,7 @@ def make_style(
     check_only: bool = Option(False, "--check-only", "-c"),
     dry: bool = Option(False, "--dry", help="Only print, not really run shell command"),
 ) -> None:
-    """Run: isort+black+ruff to reformat code and then mypy to check"""
+    """Run: ruff check/format to reformat code and then mypy to check"""
     if isinstance(files, str):
         files = [files]
     if check_only:
@@ -611,12 +604,15 @@ def _should_run_test_script(path: Path) -> bool:
 @cli.command()
 def 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"""
     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 isinstance(ignore_script, bool):
+        ignore_script = getattr(ignore_script, "default", False)
+    if not 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

fast_dev_cli-0.7.1/pyproject.toml

@@ -0,0 +1,50 @@
+[tool.poetry]
+name = "fast-dev-cli"
+version = "0.7.1"
+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.6.6/fast_dev_cli/__init__.py

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

fast_dev_cli-0.6.6/pyproject.toml

@@ -1,57 +0,0 @@
-[tool.poetry]
-name = "fast-dev-cli"
-version = "0.6.6"
-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"
-isort = {version = ">=5.12.0", optional = true}
-black = {version = ">=23.9.1", optional = true}
-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 = ["isort", "black", "ruff", "typer", "mypy", "bumpversion", "pytest", "coverage"]
-
-[tool.poetry.group.dev.dependencies]
-isort = "*"
-black = "*"
-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.isort]
-profile = "black"
-
-[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"]