fast-dev-cli 0.18.6__tar.gz → 0.19.1__tar.gz

{fast_dev_cli-0.18.6 → fast_dev_cli-0.19.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.18.6
+Version: 0.19.1
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta
@@ -9,7 +9,6 @@ Classifier: Intended Audience :: Science/Research
 Classifier: Intended Audience :: System Administrators
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -21,7 +20,7 @@ Classifier: Topic :: Software Development
 Classifier: Typing :: Typed
 Classifier: License :: OSI Approved :: MIT License
 Project-URL: Homepage, https://github.com/waketzheng/fast-dev-cli
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Requires-Dist: typer-slim<1,>=0.12.3
 Requires-Dist: tomli<3,>=2.0.1; python_version < "3.11"
 Requires-Dist: emoji>=2.12.1

fast_dev_cli-0.19.1/fast_dev_cli/__init__.py

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

{fast_dev_cli-0.18.6 → fast_dev_cli-0.19.1}/fast_dev_cli/cli.py

@@ -57,7 +57,7 @@ if TYPE_CHECKING:
 cli = typer.Typer(no_args_is_help=True)
 DryOption = Option(False, "--dry", help="Only print, not really run shell command")
 TOML_FILE = "pyproject.toml"
-ToolName = Literal["poetry", "pdm", "uv"]
+ToolName = Literal["uv", "pdm", "poetry"]
 ToolOption = Option(
     "auto", "--tool", help="Explicit declare manage tool (default to auto detect)"
 )
@@ -658,28 +658,64 @@ class Project:
             text = cls.load_toml_text()
         except EnvError:
             return None
+        backend = ""
+        skip_uv = load_bool("FASTDEVCLI_SKIP_UV")
         with contextlib.suppress(KeyError, tomllib.TOMLDecodeError):
             doc = tomllib.loads(text)
             backend = doc["build-system"]["build-backend"]
-            if "poetry" in backend:
-                cls._tool = "poetry"
-                return cls._tool
+            if skip_uv:
+                for t in ("pdm", "poetry"):
+                    if t in backend:
+                        cls._tool = t
+                        return cls._tool
+        work_dir: Path | None = None
+        uv_lock_exists: bool | None = None
+        if skip_uv:
+            for name in ("pdm", "poetry"):
+                if f"[tool.{name}]" in text:
+                    cls._tool = cast(ToolName, name)
+                    return cls._tool
             work_dir = cls.get_work_dir(allow_cwd=True)
-            uv_lock_exists = Path(work_dir, "uv.lock").exists()
-            if "pdm" in backend:
+            for name in ("pdm", "poetry"):
+                if Path(work_dir, f"{name}.lock").exists():
+                    cls._tool = cast(ToolName, name)
+                    return cls._tool
+            if uv_lock_exists := Path(work_dir, "uv.lock").exists():
+                # Use pdm when uv is not available for uv managed project
                 cls._tool = "pdm"
-                if not Path(work_dir, "pdm.lock").exists() and (
-                    uv_lock_exists or "[tool.uv]" in text
-                ):
-                    cls._tool = "uv"
                 return cls._tool
-            elif uv_lock_exists:
-                cls._tool = "uv"
-                return cls._tool
-        for name in get_args(ToolName):
-            if f"[tool.{name}]" in text:
-                cls._tool = cast(ToolName, name)
+            return None
+        if work_dir is None:
+            work_dir = cls.get_work_dir(allow_cwd=True)
+        if uv_lock_exists is None:
+            uv_lock_exists = Path(work_dir, "uv.lock").exists()
+        if uv_lock_exists:
+            cls._tool = "uv"
+            return cls._tool
+        pdm_lock_exists = Path(work_dir, "pdm.lock").exists()
+        poetry_lock_exists = Path(work_dir, "poetry.lock").exists()
+        match pdm_lock_exists + poetry_lock_exists:
+            case 1:
+                cls._tool = "pdm" if pdm_lock_exists else "poetry"
                 return cls._tool
+            case _ as x:
+                if backend:
+                    for t in ("pdm", "poetry"):
+                        if t in backend:
+                            cls._tool = cast(ToolName, t)
+                            return cls._tool
+                for name in ("pdm", "poetry"):
+                    if f"[tool.{name}]" in text:
+                        cls._tool = cast(ToolName, name)
+                        return cls._tool
+                if x == 2:
+                    cls._tool = (
+                        "poetry" if load_bool("FASTDEVCLI_PREFER_POETRY") else "pdm"
+                    )
+                    return cls._tool
+        if "[tool.uv]" in text or load_bool("FASTDEVCLI_PREFER_uv"):
+            cls._tool = "uv"
+            return cls._tool
         # Poetry 2.0 default to not include the '[tool.poetry]' section
         if cls.is_poetry_v2(text):
             cls._tool = "poetry"
@@ -1282,7 +1318,7 @@ class Sync(DryRun):
                 ensure_pip = ""
                 if not UpgradeDependencies.should_with_dev():
                     export_cmd = export_cmd.replace(" --with=dev", "")
-                if extras and isinstance(extras, (str, list)):
+                if extras and isinstance(extras, str | list):
                     export_cmd += f" --{extras=}".replace("'", '"')
             elif check_call(prefix + "python -m pip --version"):
                 ensure_pip = ""

{fast_dev_cli-0.18.6 → fast_dev_cli-0.19.1}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
     { name = "Waket Zheng", email = "waketzheng@gmail.com>" },
 ]
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
@@ -20,7 +20,6 @@ classifiers = [
     "Intended Audience :: System Administrators",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -42,7 +41,7 @@ dependencies = [
     "bumpversion2 >=1.4.3",
     "pytest >=8.2.0",
 ]
-version = "0.18.6"
+version = "0.19.1"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"
@@ -164,7 +163,7 @@ omit = [
 
 [tool.mypy]
 pretty = true
-python_version = "3.9"
+python_version = "3.10"
 ignore_missing_imports = true
 check_untyped_defs = true
 warn_unused_ignores = true

{fast_dev_cli-0.18.6 → fast_dev_cli-0.19.1}/tests/conftest.py

@@ -1,4 +1,3 @@
-import sys
 from pathlib import Path
 
 import pytest
@@ -59,6 +58,5 @@ def tmp_work_dir(tmp_path):
 @pytest.fixture
 def tmp_poetry_project(tmp_work_dir: Path):
     Path(TOML_FILE).write_text(TOML_CONTENT)
-    if sys.version_info >= (3, 10):
-        run_and_echo("poetry config --local virtualenvs.in-project true")
+    run_and_echo("poetry config --local virtualenvs.in-project true")
     yield tmp_work_dir

{fast_dev_cli-0.18.6 → fast_dev_cli-0.19.1}/tests/test_deps.py

@@ -48,3 +48,31 @@ def test_fast_deps():
     assert out == "--> uv sync --active --all-extras --all-groups"
     out = capture_cmd_output("fast deps --uv --dry --no-active --no-inexact")
     assert out == "--> uv sync --all-extras --all-groups"
+
+
+def test_smart_fast_deps(tmp_work_dir, monkeypatch):
+    toml_file = tmp_work_dir.joinpath("pyproject.toml")
+    if toml_file.exists():
+        toml_file.unlink()
+    tmp_work_dir.joinpath("uv.lock").touch()
+    out = capture_cmd_output("fast deps --dry")
+    assert (
+        out
+        == "--> python -m ensurepip && python -m pip install --upgrade pip && python -m pip install -e . --group dev"
+    )
+    toml_file.touch()
+    out = capture_cmd_output("fast deps --dry")
+    assert out == "--> uv sync --inexact --active --all-extras --all-groups"
+    pdm_lock = tmp_work_dir.joinpath("pdm.lock")
+    pdm_lock.touch()
+    out = capture_cmd_output("fast deps --dry")
+    assert out == "--> uv sync --inexact --active --all-extras --all-groups"
+    toml_file.write_text("[tool.pdm]\ndistribution=false")
+    out = capture_cmd_output("fast deps --dry")
+    assert out == "--> uv sync --inexact --active --all-extras --all-groups"
+    monkeypatch.setenv("FASTDEVCLI_SKIP_UV", "1")
+    out = capture_cmd_output("fast deps --dry")
+    assert out == "--> pdm install --frozen -G :all"
+    pdm_lock.unlink()
+    out = capture_cmd_output("fast deps --dry")
+    assert out == "--> pdm install --frozen -G :all"

fast_dev_cli-0.18.6/fast_dev_cli/__init__.py

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