flet-cli 0.84.0.dev0__py3-none-any.whl → 0.85.0.dev0__py3-none-any.whl

flet_cli/utils/project_dependencies.py

@@ -2,8 +2,86 @@
 
 # Based on: https://pypi.org/project/toml-to-requirements/
 
+import re
 from typing import Any, Optional
 
+from packaging.requirements import Requirement
+
+
+def _windows_safe(req_str: str) -> str:
+    """Insert a space before bare `<` or `>` so Windows cmd.exe does not
+    interpret them as shell redirection when the string is passed via `-r`
+    to a `.BAT` subprocess."""
+    return re.sub(r"(?<=[^ ])([<>])", r" \1", req_str)
+
+
+def _poetry_version_to_pep440(version: str) -> str:
+    """Convert a Poetry version constraint to PEP 440 syntax.
+
+    - `^1.2.3` → `>=1.2.3`
+    - `~1.2.3` → `~=1.2.3`  (`~=` passes through unchanged)
+    - `*`      → `""` (no constraint)
+    - `1.2.3` (bare version) → `==1.2.3`
+    - Anything else is returned as-is (already PEP 440).
+    """
+    version = version.replace(" ", "")
+    if not version or version == "*":
+        return ""
+    if version.startswith("^"):
+        return f">={version[1:]}"
+    if version.startswith("~") and not version.startswith("~="):
+        return f"~={version[1:]}"
+    # Bare version number → pin with ==
+    if version[0].isdigit():
+        return f"=={version}"
+    return version
+
+
+def _poetry_dep_to_pep508(name: str, value: Any) -> str:
+    """Convert a single Poetry dependency entry to a PEP 508 requirement string."""
+    suffix = ""
+
+    if isinstance(value, dict):
+        version = value.get("version")
+        if version:
+            specifier = _poetry_version_to_pep440(version)
+            markers = value.get("markers")
+            if markers is not None:
+                suffix = f"; {markers}"
+            if specifier:
+                return f"{name}{specifier}{suffix}"
+            return f"{name}{suffix}"
+
+        git_url = value.get("git")
+        if git_url:
+            url = f"git+{git_url}" if not git_url.startswith("git@") else git_url
+            rev = value.get("branch") or value.get("rev") or value.get("tag")
+            if rev:
+                url = f"{url}@{rev}"
+            subdirectory = value.get("subdirectory")
+            if subdirectory:
+                url = f"{url}#subdirectory={subdirectory}"
+            markers = value.get("markers")
+            if markers is not None:
+                suffix = f"; {markers}"
+            return f"{name} @ {url}{suffix}"
+
+        path = value.get("path")
+        if path:
+            return path
+
+        url = value.get("url")
+        if url:
+            return url
+
+        raise ValueError(f"Unsupported dependency specification: {name} = {value}")
+
+    # String value
+    specifier = _poetry_version_to_pep440(value)
+    if specifier:
+        return f"{name}{specifier}"
+    return name
+
 
 def get_poetry_dependencies(
     poetry_dependencies: Optional[dict[str, Any]] = None,
@@ -17,103 +95,20 @@ def get_poetry_dependencies(
     Returns:
         Sorted requirement strings or `None` when `poetry_dependencies` is `None`.
     """
-
     if poetry_dependencies is None:
         return None
 
-    def format_dependency_version(dependency_name: str, dependency_value: Any):
-        """
-        Format a single Poetry dependency entry as a requirement specifier.
-
-        Supports version constraints, git dependencies (including branch/rev/tag
-        and subdirectory), path/url dependencies, and optional environment markers.
-
-        Args:
-            dependency_name: Dependency key in Poetry configuration.
-            dependency_value: String or mapping that describes the dependency.
-
-        Returns:
-            A requirement string consumable by pip-style tooling.
-
-        Raises:
-            ValueError: If the dependency mapping uses an unsupported shape.
-        """
-
-        sep = "@"
-        value = ""
-        suffix = ""
-
-        if isinstance(dependency_value, dict):
-            version = dependency_value.get("version")
-            if version:
-                sep = "=="
-                value = version
-            else:
-                git_url = dependency_value.get("git")
-                if git_url:
-                    value = (
-                        f"git+{git_url}" if not git_url.startswith("git@") else git_url
-                    )
-                    rev = (
-                        dependency_value.get("branch")
-                        or dependency_value.get("rev")
-                        or dependency_value.get("tag")
-                    )
-                    if rev:
-                        value = f"{value}@{rev}"
-                    subdirectory = dependency_value.get("subdirectory")
-                    if subdirectory:
-                        value = f"{value}#subdirectory={subdirectory}"
-                else:
-                    path = dependency_value.get("path")
-                    if path:
-                        value = path
-                        dependency_name = ""
-                        sep = ""
-                    else:
-                        url = dependency_value.get("url")
-                        if url:
-                            value = url
-                            dependency_name = ""
-                            sep = ""
-                        else:
-                            raise ValueError(
-                                "Unsupported dependency specification: "
-                                f"{dependency_name} = {dependency_value}"
-                            )
-
-            # markers - common for all
-            markers = dependency_value.get("markers")
-            if markers is not None:
-                suffix = f";{markers}"
-        else:
-            value = dependency_value
-            sep = "=="
-
-        if value.startswith("^"):
-            sep = ">="
-            value = value[1:]
-        elif value.startswith("~"):
-            sep = "~="
-            value = value[1:]
-            return f"{dependency_name}~={value[1:]}"
-        elif "<" in value or ">" in value:
-            sep = ""
-            value = value.replace(" ", "")
-
-        return f"{dependency_name}{sep}{value}{suffix}"
-
     dependencies: set[str] = {
-        format_dependency_version(dependency, version)
-        for dependency, version in poetry_dependencies.items()
-        if dependency != "python"
+        _windows_safe(_poetry_dep_to_pep508(dep, ver))
+        for dep, ver in poetry_dependencies.items()
+        if dep != "python"
     }
 
     return sorted(dependencies)
 
 
 def get_project_dependencies(
-    project_dependencies: Optional[dict[str, Any]] = None,
+    project_dependencies: Optional[list[str]] = None,
 ) -> Optional[list[str]]:
     """
     Normalize PEP 621 `project.dependencies` into a sorted unique list.
@@ -124,10 +119,15 @@ def get_project_dependencies(
     Returns:
         Sorted dependency strings, or `None` when input is `None`.
     """
-
     if project_dependencies is None:
         return None
 
-    dependencies = set(project_dependencies)
+    dependencies: set[str] = set()
+    for dep in project_dependencies:
+        try:
+            req = Requirement(dep)
+            dependencies.add(_windows_safe(str(req)))
+        except Exception:
+            dependencies.add(_windows_safe(dep))
 
     return sorted(dependencies)

flet_cli/version.py

@@ -1 +1 @@
-version = "0.84.0.dev0"
+version = "0.85.0.dev0"

{flet_cli-0.84.0.dev0.dist-info → flet_cli-0.85.0.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-cli
-Version: 0.84.0.dev0
+Version: 0.85.0.dev0
 Summary: Flet CLI
 Author-email: "Appveyor Systems Inc." <hello@flet.dev>
 License-Expression: Apache-2.0
@@ -9,7 +9,7 @@ Project-URL: Repository, https://github.com/flet-dev/flet
 Project-URL: Documentation, https://flet.dev/docs
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: flet==0.84.0.dev0
+Requires-Dist: flet==0.85.0.dev0
 Requires-Dist: watchdog>=4.0.0
 Requires-Dist: packaging>=25.0
 Requires-Dist: qrcode>=7.4.2

{flet_cli-0.84.0.dev0.dist-info → flet_cli-0.85.0.dev0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 flet_cli/cli.py,sha256=iDtpgVnrdrHapnE42bkTe7Sf_bNK724bqXISozNWTRQ,3586
-flet_cli/version.py,sha256=ExdO2qcq00sSsu6VsdowwUDFlrFM3fUIlO-2rsoFXlY,24
+flet_cli/version.py,sha256=yv8v_VNdN9AgK1BkEv8lS5QA_dmD7JF9wGR9GE6kNQg,24
 flet_cli/__pyinstaller/__init__.py,sha256=KJsKpQ6uSVslADmFaOKaxCu-GOZZtcVKnti-ripD-ug,164
 flet_cli/__pyinstaller/config.py,sha256=MN2IPu53K1RDyh_KE4wIcQH8El_n4Z3fD6NO2iq8y74,20
 flet_cli/__pyinstaller/hook-flet.py,sha256=RbiFE8-7VBsY4Dwt7a9-9gW0gUFQGjOLY1-OBsZm_mI,506
@@ -30,10 +30,10 @@ flet_cli/utils/jdk.py,sha256=8hxuptENZa8zCgumaRmx0F8ApX_ldXVQYPlx4_xiYDs,5280
 flet_cli/utils/merge.py,sha256=cZcUL1z2iaGjjFifL1KCrEj2ywLR9x6eNtOj1F2Dr6U,780
 flet_cli/utils/plist.py,sha256=oqBCkeUjUqPIf5y7XaE2seSx64FEs7yc2cukvbjFoSU,1135
 flet_cli/utils/processes.py,sha256=S0ErmI5x9S6RNMe89cf5M4ROIofMtjNZRQ29foUllJ4,2885
-flet_cli/utils/project_dependencies.py,sha256=_IhAevoZeICBxFWn3FJrlDCtI4zu-piGRI22fclDaGE,4320
+flet_cli/utils/project_dependencies.py,sha256=kC8gZZyaGk-coNXrh6cyPM6i9RhUaXcBIvZmQ50PufY,4064
 flet_cli/utils/pyproject_toml.py,sha256=o4fAWKXMyK8vdnAO41BLI7Lt3ohMlVdlwrpaifq30Cs,1408
-flet_cli-0.84.0.dev0.dist-info/METADATA,sha256=cVgzGxPQ2hIqoM3E4kVV0ZfmVHxoRAU0OBepsD1x5M0,1214
-flet_cli-0.84.0.dev0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-flet_cli-0.84.0.dev0.dist-info/entry_points.txt,sha256=UZFR426y3mfr0wgikEFPbZ6wtGwfgykif9Obw6R7Wnc,65
-flet_cli-0.84.0.dev0.dist-info/top_level.txt,sha256=4_BPVAJpcNofDe3XMxajlZLBNWzWqKhRynNSBCYTKVQ,9
-flet_cli-0.84.0.dev0.dist-info/RECORD,,
+flet_cli-0.85.0.dev0.dist-info/METADATA,sha256=8OSOoViAKIw7staMSX3jcpIn6yEyR9eBXL33lQFvLeY,1214
+flet_cli-0.85.0.dev0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+flet_cli-0.85.0.dev0.dist-info/entry_points.txt,sha256=UZFR426y3mfr0wgikEFPbZ6wtGwfgykif9Obw6R7Wnc,65
+flet_cli-0.85.0.dev0.dist-info/top_level.txt,sha256=4_BPVAJpcNofDe3XMxajlZLBNWzWqKhRynNSBCYTKVQ,9
+flet_cli-0.85.0.dev0.dist-info/RECORD,,