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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.13.0
+Version: 0.14.1
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta
@@ -25,7 +25,6 @@ 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.6.0
 Requires-Dist: mypy<2,>=1.15.0
 Requires-Dist: bumpversion2<2,>=1.4.3
 Requires-Dist: pytest<9,>=8.2.0

fast_dev_cli-0.14.1/fast_dev_cli/__init__.py

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

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

@@ -258,7 +258,12 @@ class BumpUp(DryRun):
             try:
                 package_item = context["tool"]["poetry"]["packages"]
             except KeyError:
-                packages = []
+                try:
+                    project_name = context["project"]["name"]
+                except KeyError:
+                    packages = []
+                else:
+                    packages = [(poetry_module_name(project_name), "")]
             else:
                 packages = [
                     (j, i.get("from", ""))
@@ -709,11 +714,11 @@ class LintCode(DryRun):
     @classmethod
     def to_cmd(
         cls: type[Self],
-        paths=".",
-        check_only=False,
-        bandit=False,
-        skip_mypy=False,
-        use_dmypy=False,
+        paths: str = ".",
+        check_only: bool = False,
+        bandit: bool = False,
+        skip_mypy: bool = False,
+        use_dmypy: bool = False,
     ) -> str:
         cmd = ""
         tools = ["ruff format", "ruff check --extend-select=I,B,SIM --fix", "mypy"]
@@ -721,7 +726,7 @@ class LintCode(DryRun):
             tools[0] += " --check"
         if check_only or load_bool("NO_FIX"):
             tools[1] = tools[1].replace(" --fix", "")
-        if skip_mypy or load_bool("SKIP_MYPY"):
+        if skip_mypy or load_bool("SKIP_MYPY") or load_bool("FASTDEVCLI_NO_MYPY"):
             # Sometimes mypy is too slow
             tools = tools[:-1]
         elif load_bool("IGNORE_MISSING_IMPORTS"):
@@ -731,11 +736,11 @@ class LintCode(DryRun):
         )
         prefix = ""
         should_run_by_tool = False
-        if is_venv():
+        if is_venv() and Path(sys.argv[0]).parent != Path.home().joinpath(".local/bin"):
             if not cls.check_lint_tool_installed():
                 should_run_by_tool = True
                 if check_call('python -c "import fast_dev_cli"'):
-                    command = 'python -m pip install -U "fast_dev_cli"'
+                    command = 'python -m pip install -U "fast-dev-cli"'
                     tip = "You may need to run following command to install lint tools:"
                     secho(f"{tip}\n\n  {command}\n", fg="yellow")
         else:
@@ -747,9 +752,14 @@ class LintCode(DryRun):
         cmd += lint_them.format(prefix, paths, *tools)
         if bandit or load_bool("FASTDEVCLI_BANDIT"):
             command = prefix + "bandit"
-            if paths == ".":  # fast check --bandit
-                command += " -r " + cls.get_package_name()
-                cmd += " && " + command
+            if Path("pyproject.toml").exists():
+                toml_text = Project.load_toml_text()
+                if "[tool.bandit" in toml_text:
+                    command += " -c pyproject.toml"
+            if paths == "." and " -c " not in command:
+                paths = cls.get_package_name()
+            command += f" -r {paths}"
+            cmd += " && " + command
         return cmd
 
     def gen(self: Self) -> str:
@@ -763,12 +773,12 @@ 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, dmypy=False) -> None:
+def lint(files=None, dry=False, bandit=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, dmypy=dmypy).run()
+    LintCode(files, dry=dry, skip_mypy=skip_mypy, bandit=bandit, dmypy=dmypy).run()
 
 
 def check(files=None, dry=False, bandit=False, skip_mypy=False, dmypy=False) -> None:
@@ -787,6 +797,7 @@ def check(files=None, dry=False, bandit=False, skip_mypy=False, dmypy=False) ->
 def make_style(
     files: Optional[list[Path]] = typer.Argument(default=None),  # noqa:B008
     check_only: bool = Option(False, "--check-only", "-c"),
+    bandit: bool = Option(False, "--bandit", help="Run `bandit -r <package_dir>`"),
     skip_mypy: bool = Option(False, "--skip-mypy"),
     use_dmypy: bool = Option(
         False, "--dmypy", help="Use `dmypy run` instead of `mypy`"
@@ -800,10 +811,11 @@ def make_style(
         files = [files]
     skip = _ensure_bool(skip_mypy)
     dmypy = _ensure_bool(use_dmypy)
+    bandit = _ensure_bool(bandit)
     if _ensure_bool(check_only):
-        check(files, dry=dry, skip_mypy=skip, dmypy=dmypy)
+        check(files, dry=dry, skip_mypy=skip, dmypy=dmypy, bandit=bandit)
     else:
-        lint(files, dry=dry, skip_mypy=skip, dmypy=dmypy)
+        lint(files, dry=dry, skip_mypy=skip, dmypy=dmypy, bandit=bandit)
 
 
 @cli.command(name="check")

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

@@ -36,13 +36,12 @@ dependencies = [
     "emoji >=2.12.1,<3",
     "tomli>=2.0.1,<3; python_version < '3.11'",
     "coverage >=7.5.1,<8",
-    "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.13.0"
+version = "0.14.1"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"
@@ -155,3 +154,11 @@ extend-select = [
 "fast_dev_cli/cli.py" = [
     "UP007",
 ]
+
+[tool.bandit]
+exclude_dirs = [
+    "tests",
+    "scripts",
+    "examples",
+    ".venv",
+]

{fast_dev_cli-0.13.0 → fast_dev_cli-0.14.1}/scripts/test.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding:utf-8 -*-
 import os
 import shlex

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

@@ -132,6 +132,14 @@ def test_lint_cmd(mock_no_dmypy):
     )
 
 
+def test_lint_by_global_fast():
+    run = "pdm run "
+    fast = Path.home() / ".local" / "bin" / "fast"
+    command = capture_cmd_output(f"{fast} lint --dry")
+    for cmd in command.split(SEP):
+        assert run in cmd
+
+
 def test_with_dmypy():
     command = capture_cmd_output("fast lint --dmypy --dry .")
     assert "dmypy run ." in command
@@ -200,7 +208,7 @@ def test_lint_without_ruff_installed(mocker, mock_no_dmypy):
     with capture_stdout() as stream:
         lint(".", dry=True)
     output = stream.getvalue()
-    cmd = 'python -m pip install -U "fast_dev_cli"'
+    cmd = 'python -m pip install -U "fast-dev-cli"'
     assert cmd in output
     tip = "You may need to run following command to install lint tools"
     assert tip in output

fast_dev_cli-0.13.0/fast_dev_cli/__init__.py

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