fast-dev-cli 0.24.2__tar.gz → 0.25.0__tar.gz

{fast_dev_cli-0.24.2 → fast_dev_cli-0.25.0}/PKG-INFO

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

fast_dev_cli-0.25.0/fast_dev_cli/__init__.py

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

{fast_dev_cli-0.24.2 → fast_dev_cli-0.25.0}/fast_dev_cli/cli.py

@@ -1229,40 +1229,55 @@ class LintCode(DryRun):
         prefix = ""
         should_run_by_tool = with_prefix
         requires_mypy = any(tool.startswith("mypy") for tool in tools)
-        if requires_mypy and not should_run_by_tool:
-            if is_venv() and Path(sys.argv[0]).parent != Path.home().joinpath(
-                ".local/bin"
-            ):  # Virtual environment activated and fast-dev-cli is installed in it
-                if not ruff_exists:
-                    should_run_by_tool = True
-                    command = "pipx install ruff"
-                    if shutil.which("pipx") is None:
-                        ensure_pipx = "pip install --user pipx\n  pipx ensurepath\n  "
-                        command = ensure_pipx + command
-                    elif prefer_uv_tool():
-                        command = "uv tool install ruff"
-                    yellow_warn(
-                        "You may need to run the following command"
-                        f" to install ruff:\n\n  {command}\n"
-                    )
-                elif cls.missing_mypy_exec():
-                    should_run_by_tool = True
-                    if check_call('python -c "import fast_dev_cli"'):
-                        command = "python -m pip install -U mypy"
+        global_mypy = False
+        if requires_mypy:
+            # TODO: move this long logic to a single function
+            local_bin = Path.home().joinpath(".local/bin")
+            if local_bin.joinpath("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 not should_run_by_tool:
+                if is_venv() and Path(sys.argv[0]).parent != local_bin:
+                    # Virtual environment activated and fast-dev-cli is installed in it
+                    if not ruff_exists:
+                        should_run_by_tool = True
+                        command = "pipx install ruff"
+                        if shutil.which("pipx") is None:
+                            ensure_pipx = (
+                                "pip install --user pipx\n  pipx ensurepath\n  "
+                            )
+                            command = ensure_pipx + command
+                        elif prefer_uv_tool():
+                            command = "uv tool install ruff"
                         yellow_warn(
                             "You may need to run the following command"
-                            f" to install lint tools:\n\n  {command}\n"
+                            f" to install ruff:\n\n  {command}\n"
                         )
-            elif tool == ToolOption.default:
-                root = Project.get_work_dir(allow_cwd=True)
-                if py := shutil.which("python"):
-                    try:
-                        Path(py).relative_to(root)
-                    except ValueError:
-                        # Virtual environment not activated
+                    elif global_mypy:
                         should_run_by_tool = True
-            else:
-                should_run_by_tool = True
+                    elif cls.missing_mypy_exec():
+                        should_run_by_tool = True
+                        if check_call('python -c "import fast_dev_cli"'):
+                            command = "python -m pip install -U mypy"
+                            yellow_warn(
+                                "You may need to run the following command"
+                                f" to install lint tools:\n\n  {command}\n"
+                            )
+                elif tool == ToolOption.default:
+                    root = Project.get_work_dir(allow_cwd=True)
+                    if py := shutil.which("python"):
+                        try:
+                            Path(py).relative_to(root)
+                        except ValueError:
+                            # Virtual environment not activated
+                            should_run_by_tool = True
+                else:
+                    should_run_by_tool = True
         if should_run_by_tool and tool:
             if tool == ToolOption.default:
                 tool = Project.get_manage_tool() or ""
@@ -1280,7 +1295,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}"
@@ -1566,18 +1585,34 @@ class Publish:
         twine = "python -m build && twine upload"
 
     @classmethod
-    def gen(cls) -> str:
-        if tool := Project.get_manage_tool():
+    def gen(cls, tool: str, verbose: bool) -> str:
+        if tool == "auto":
+            tool = Project.get_manage_tool() or ""
+        if tool:
+            if tool == "uv":
+                envs = ["UV_PUBLISH_INDEX", "UV_PUBLISH_URL", "UV_PUBLISH_TOKEN"]
+                if not any(os.getenv(i) for i in envs):
+                    if verbose:
+                        yellow_warn(f"Skip uv publish as envs ({envs}) not set")
+                    return "uv build"
+            elif tool == "pdm":
+                env = "PDM_PUBLISH_REPO"
+                if not os.getenv(env):
+                    if verbose:
+                        yellow_warn(f"Skip pdm publish as env ({env}) not set")
+                    return "pdm build"
             return cls.CommandEnum[tool]
         return cls.CommandEnum.twine
 
 
 @cli.command()
 def upload(
+    verbose: bool = False,
+    tool: str = ToolOption,
     dry: bool = DryOption,
 ) -> None:
     """Shortcut for package publish"""
-    cmd = Publish.gen()
+    cmd = Publish.gen(tool, verbose)
     exit_if_run_failed(cmd, dry=dry)
 
 

{fast_dev_cli-0.24.2 → fast_dev_cli-0.25.0}/pyproject.toml

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

fast_dev_cli-0.24.2/fast_dev_cli/__init__.py

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