fast-dev-cli 0.23.1__tar.gz → 0.24.0__tar.gz

{fast_dev_cli-0.23.1 → fast_dev_cli-0.24.0}/PKG-INFO

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

fast_dev_cli-0.24.0/fast_dev_cli/__init__.py

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

{fast_dev_cli-0.23.1 → fast_dev_cli-0.24.0}/fast_dev_cli/cli.py

@@ -12,7 +12,7 @@ import subprocess  # nosec:B404
 import sys
 from functools import cached_property
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Literal, cast, get_args, overload
+from typing import TYPE_CHECKING, Annotated, Any, Literal, cast, get_args, overload
 
 import typer
 from typer import Exit, Option, echo, secho
@@ -148,15 +148,15 @@ class Shell:
         if isinstance(command, str):
             cs = shlex.split(command)
             if "shell" not in self._kw and not (set(self._cmd) & {"|", ">", "&"}):
-                command = self.extend_user(cs)
+                command = self.expand_user(cs)
             elif any(i.startswith("~") for i in cs):
                 command = re.sub(r" ~", " " + os.path.expanduser("~"), command)
         else:
-            command = self.extend_user(command)
+            command = self.expand_user(command)
         return command
 
     @staticmethod
-    def extend_user(cs: list[str]) -> list[str]:
+    def expand_user(cs: list[str]) -> list[str]:
         if cs[0] == "echo":
             return cs
         for i, c in enumerate(cs):
@@ -255,28 +255,18 @@ def read_version_from_file(
         secho(f"WARNING: can not find 'version' item in {version_file}!")
         return "0.0.0"
     pattern = re.compile(r"__version__\s*=")
-    for line in Path(version_file).read_text("utf-8").splitlines():
+    all_lines = Path(version_file).read_text("utf-8").strip().splitlines()
+    for line in all_lines:
         if pattern.match(line):
             return _parse_version(line, pattern)
-    # TODO: remove or refactor the following lines.
-    if work_dir is None:
-        work_dir = Project.get_work_dir()
-    package_dir = work_dir / package_name
-    if (
-        not (init_file := package_dir / "__init__.py").exists()
-        and not (init_file := work_dir / "src" / package_name / init_file.name).exists()
-        and not (init_file := work_dir / "app" / init_file.name).exists()
-    ):
-        secho("WARNING: __init__.py file does not exist!")
+    else:
+        pattern = re.compile(r"VERSION\s*=")
+        for line in all_lines:
+            if pattern.match(line):
+                return _parse_version(line, pattern)
+        secho(f"WARNING: can not find version pattern in {version_file}!")
         return "0.0.0"
 
-    pattern = re.compile(r"__version__\s*=")
-    for line in init_file.read_text("utf-8").splitlines():
-        if pattern.match(line):
-            return _parse_version(line, pattern)
-    secho(f"WARNING: can not find '__version__' var in {init_file}!")
-    return "0.0.0"
-
 
 def _get_frontend_version() -> tuple[Path, str] | None:
     try:
@@ -326,11 +316,7 @@ def get_current_version(
     check_version: bool = False,
 ) -> str | tuple[bool, str]:
     if is_poetry is True or Project.manage_by_poetry():
-        cmd = ["poetry", "version", "-s"]
-        if verbose:
-            echo(f"--> {' '.join(cmd)}")
-        if out := capture_cmd_output(cmd, raises=True):
-            out = out.splitlines()[-1].strip().split()[-1]
+        out = _get_poetry_project_version(verbose)
         if check_version:
             return True, out
         return out
@@ -364,6 +350,15 @@ def get_current_version(
     return current_version
 
 
+def _get_poetry_project_version(verbose: bool) -> str:
+    cmd = ["poetry", "version", "-s"]
+    if verbose:
+        echo(f"--> {' '.join(cmd)}")
+    if out := capture_cmd_output(cmd, raises=True):
+        out = out.splitlines()[-1].strip().split()[-1]
+    return out
+
+
 def _ensure_bool(value: bool | OptionInfo) -> bool:
     if isinstance(value, bool):
         return value
@@ -438,7 +433,7 @@ class BumpUp(DryRun):
 
     @staticmethod
     def parse_dynamic_version(
-        toml_text: str,
+        toml_text: str | None,
         context: dict[str, Any],
         work_dir: Path | None = None,
     ) -> str | None:
@@ -452,9 +447,11 @@ class BumpUp(DryRun):
                     or work_dir.joinpath(version_path).exists()
                 ):
                     return version_path
-        # version = { source = "file", path = "fast_dev_cli/__init__.py" }
+        # e.g.: version = { source = "file", path = "fast_dev_cli/__init__.py" }
         v_key = "version = "
         p_key = 'path = "'
+        if toml_text is None:
+            toml_text = Project.load_toml_text()
         for line in toml_text.splitlines():
             if not line.startswith(v_key):
                 continue
@@ -470,10 +467,20 @@ class BumpUp(DryRun):
         toml_text: str | None = None,
         work_dir: Path | None = None,
         package_name: str | None = None,
+        context: dict | None = None,
     ) -> str:
-        if toml_text is None:
-            toml_text = Project.load_toml_text()
-        context = tomllib.loads(toml_text)
+        if context is None:
+            if toml_text is None:
+                toml_text = Project.load_toml_text()
+            context = tomllib.loads(toml_text)
+        is_dynamic_version = False
+        with contextlib.suppress(KeyError):
+            if "version" in context["project"]["dynamic"]:
+                is_dynamic_version = True
+        if is_dynamic_version:
+            if filename := cls.parse_dynamic_version(toml_text, context, work_dir):
+                return filename
+            yellow_warn("Failed to find version file for this dynamic version project.")
         by_version_plugin = False
         try:
             ver = context["project"]["version"]
@@ -497,7 +504,6 @@ class BumpUp(DryRun):
                 by_version_plugin = version_value in ("0", "0.0.0", "init")
         if by_version_plugin:
             return cls.parse_plugin_version(context, package_name)
-
         return TOML_FILE
 
     @staticmethod
@@ -1704,13 +1710,21 @@ class MakeDeps(DryRun):
         tool: str,
         prod: bool = False,
         dry: bool = False,
-        active: bool = True,
-        inexact: bool = True,
+        active: bool = False,
+        inexact: bool = False,
+        no_dev: bool = False,
+        verbose: bool = False,
+        no_extra: list[str] | None = None,
+        no_group: list[str] | None = None,
     ) -> None:
         self._tool = tool
         self._prod = prod
-        self._active = active
-        self._inexact = inexact
+        self._active = active or load_bool("FASTDEVCLI_DEPS_ACTIVE")
+        self._inexact = inexact or load_bool("FASTDEVCLI_DEPS_INEXACT")
+        self._verbose = verbose
+        self._no_dev = no_dev
+        self._no_extra = no_extra
+        self._no_group = no_group
         super().__init__(dry=dry)
 
     def should_ensure_pip(self) -> bool:
@@ -1725,13 +1739,53 @@ class MakeDeps(DryRun):
         return ["dev"]
 
     def gen(self) -> str:
+        cmd = self._gen()
+        if self._verbose:
+            cmd += " --verbose"
+        if self._no_dev:
+            opt = " --no-dev"
+            if opt not in cmd:
+                cmd += opt
+        if self._no_extra:
+            cmd += " " + " ".join(f"--no-extra {i}" for i in self._no_extra)
+        if self._no_group:
+            cmd += " " + " ".join(f"--no-group {i}" for i in self._no_group)
+        if opts := os.getenv("FASTDEVCLI_DEPS_OPTS"):
+            cmd += " " + opts.strip()
+        return cmd
+
+    def get_package_name(self) -> str:
+        with contextlib.suppress(FileNotFoundError, KeyError):
+            try:
+                toml_text = Project.load_toml_text()
+            except EnvError:
+                return ""
+            doc = tomllib.loads(toml_text)
+            tool_section = doc["tool"]
+            uv_package = tool_section.get("uv", {}).get("package")
+            if uv_package is not None:
+                return doc["project"]["name"] if uv_package else ""
+            match doc["build-system"]["build-backend"]:
+                case "pdm.backend":
+                    if not tool_section.get("pdm", {}).get("distribution", True):
+                        return ""
+                case x if x.startswith("poetry"):
+                    if not tool_section.get("poetry", {}).get("package-mode", True):
+                        return ""
+            return doc["project"]["name"]
+        return ""
+
+    def _gen(self) -> str:
         if self._tool == "pdm":
             return "pdm install --frozen " + ("--prod" if self._prod else "-G :all")
         elif self._tool == "uv":
-            uv_sync = "uv sync" + " --inexact" * self._inexact
-            if self._active:
-                uv_sync += " --active"
-            return uv_sync + ("" if self._prod else " --all-extras --all-groups")
+            uv_sync = "uv sync"
+            if project := self.get_package_name():
+                uv_sync += f" --reinstall-package={project}"
+            uv_sync += " --inexact" * self._inexact + " --active" * self._active
+            return uv_sync + (
+                " --no-dev" if self._prod else " --all-extras --all-groups"
+            )
         elif self._tool == "poetry":
             return "poetry install " + (
                 "--only=main" if self._prod else "--all-extras --all-groups"
@@ -1761,11 +1815,15 @@ def make_deps(
     use_pip: bool = Option(False, "--pip", help="Use `pip` to install deps"),
     use_poetry: bool = Option(False, "--poetry", help="Use `poetry` to install deps"),
     active: bool = Option(
-        True, help="Add `--active` to uv sync command(Only work for uv project)"
+        False, help="Add `--active` to uv sync command(Only work for uv project)"
     ),
     inexact: bool = Option(
-        True, help="Add `--inexact` to uv sync command(Only work for uv project)"
+        False, help="Add `--inexact` to uv sync command(Only work for uv project)"
     ),
+    no_dev: bool = Option(False, "--no-dev"),
+    no_extra: Annotated[list[str] | None, Option()] = None,
+    no_group: Annotated[list[str] | None, Option()] = None,
+    verbose: bool = Option(False, "--verbose"),
     dry: bool = DryOption,
 ) -> None:
     """Run: ruff check/format to reformat code and then mypy to check"""
@@ -1784,7 +1842,14 @@ def make_deps(
         tool = "poetry"
     elif tool == ToolOption.default:
         tool = Project.get_manage_tool(cache=True) or "pip"
-    MakeDeps(tool, prod, active=active, inexact=inexact, dry=dry).run()
+    bool_opts = {
+        "active": active,
+        "inexact": inexact,
+        "no_dev": no_dev,
+        "verbose": verbose,
+        "dry": dry,
+    }
+    MakeDeps(tool, prod, no_extra=no_extra, no_group=no_group, **bool_opts).run()
 
 
 class UvPypi(DryRun):

{fast_dev_cli-0.23.1 → fast_dev_cli-0.24.0}/pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
     "typer>=0.24.0,<1",
     "tomli >=2.0.1,<3; python_version < '3.11'",
 ]
-version = "0.23.1"
+version = "0.24.0"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"
@@ -52,7 +52,9 @@ fast = "fast_dev_cli.cli:main"
 
 [dependency-groups]
 dev = [
-    "asynctor>=0.10.0",
+    "asynctor>=0.13.0",
+    "httpx2>=2.5.0",
+    "tomli-w>=1.2.0",
 ]
 
 [build-system]

fast_dev_cli-0.23.1/fast_dev_cli/__init__.py

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