fast-dev-cli 0.24.1__tar.gz → 0.24.3__tar.gz

{fast_dev_cli-0.24.1 → fast_dev_cli-0.24.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.24.1
+Version: 0.24.3
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta

fast_dev_cli-0.24.3/fast_dev_cli/__init__.py

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

{fast_dev_cli-0.24.1 → fast_dev_cli-0.24.3}/fast_dev_cli/cli.py

@@ -111,14 +111,15 @@ def yellow_warn(msg: str) -> None:
     secho(msg, fg="yellow")
 
 
-def load_bool(name: str, default: bool = False) -> bool:
+def load_bool(name: str, default: bool = False, *, verbose: bool = True) -> bool:
     if not (v := os.getenv(name)):
         return default
     if (lower := v.lower()) in ("0", "false", "f", "off", "no", "n"):
         return False
     elif lower in ("1", "true", "t", "on", "yes", "y"):
         return True
-    secho(f"WARNING: can not convert value({v!r}) of {name} to bool!")
+    if verbose:
+        secho(f"WARNING: can not convert value({v!r}) of {name} to bool!")
     return default
 
 
@@ -1228,6 +1229,15 @@ class LintCode(DryRun):
         prefix = ""
         should_run_by_tool = with_prefix
         requires_mypy = any(tool.startswith("mypy") for tool in tools)
+        global_mypy = False
+        if requires_mypy and Path.home().joinpath(".local/bin/mypy").exists():
+            global_mypy = True
+            mypy_opt = "--python-executable=.venv/bin/python"
+            for i, t in enumerate(tools):
+                if t.startswith("mypy"):
+                    if mypy_opt not in t:
+                        tools[i] = t + " " + mypy_opt
+                    break
         if requires_mypy and not should_run_by_tool:
             if is_venv() and Path(sys.argv[0]).parent != Path.home().joinpath(
                 ".local/bin"
@@ -1244,6 +1254,8 @@ class LintCode(DryRun):
                         "You may need to run the following command"
                         f" to install ruff:\n\n  {command}\n"
                     )
+                elif global_mypy:
+                    should_run_by_tool = True
                 elif cls.missing_mypy_exec():
                     should_run_by_tool = True
                     if check_call('python -c "import fast_dev_cli"'):
@@ -1279,7 +1291,11 @@ class LintCode(DryRun):
                 tool
                 # `ruff <command>` get the same result with `pdm run ruff <command>`.
                 # Other tools should run inside the selected environment.
-                if ruff_exists and tool.startswith("ruff")
+                if (
+                    ruff_exists
+                    and tool.startswith("ruff")
+                    or (global_mypy and tool.startswith("mypy"))
+                )
                 else prefix + tool
             )
             + f" {paths}"
@@ -1581,19 +1597,39 @@ def upload(
 
 
 def should_use_just() -> bool:
-    if shutil.which("just") is None:
+    if shutil.which("just") is None or load_bool("FASTDEVCLI_IGNORE_JUST_DEV"):
         return False
     d = Path.cwd()
     for _ in range(5):
         f = d / "justfile"
         if f.exists():
-            text = f.read_text(encoding="utf-8")
-            return any(i.startswith("dev *args:") for i in text.splitlines())
+            return _prefer_just_dev(f)
         if d.joinpath("pyproject.toml").exists():
             break
     return False
 
 
+def _prefer_just_dev(f: Path) -> bool:
+    text = f.read_text(encoding="utf-8")
+    lines = text.splitlines()
+    dev_recipe = "dev *args:"
+    re_import = re.compile(r"import[?]? ")
+    has_import = False
+    for i, line in enumerate(lines):
+        if line.startswith(dev_recipe):
+            # Avoid cycle callback
+            return "fast dev" not in lines[i + 1]
+        elif not has_import and re_import.match(line):
+            has_import = True
+    if has_import:
+        recipes = capture_cmd_output("just --list").splitlines()
+        for recipe in recipes:
+            recipe = recipe.strip()
+            if recipe.startswith(dev_recipe):
+                return "fast dev" not in recipe
+    return False
+
+
 def _parse_serve_file(uvicorn, filename: str, cmd: str, args: list) -> str:
     if m := re.search(r"(.*):(\d+)$", filename):
         h, p = m.group(1), m.group(2)

{fast_dev_cli-0.24.1 → fast_dev_cli-0.24.3}/pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
     "typer>=0.24.0,<1",
     "tomli >=2.0.1,<3; python_version < '3.11'",
 ]
-version = "0.24.1"
+version = "0.24.3"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"

fast_dev_cli-0.24.1/fast_dev_cli/__init__.py

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