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

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

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

fast_dev_cli-0.23.2/fast_dev_cli/__init__.py

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

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

@@ -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:
@@ -438,7 +428,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:
@@ -455,6 +445,8 @@ class BumpUp(DryRun):
         # 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 +462,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"]

{fast_dev_cli-0.23.1 → fast_dev_cli-0.23.2}/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.23.2"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"
@@ -52,7 +52,8 @@ fast = "fast_dev_cli.cli:main"
 
 [dependency-groups]
 dev = [
-    "asynctor>=0.10.0",
+    "asynctor>=0.13.0",
+    "httpx2>=2.5.0",
 ]
 
 [build-system]

fast_dev_cli-0.23.1/fast_dev_cli/__init__.py

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