fast-dev-cli 0.17.2__tar.gz → 0.17.3__tar.gz

{fast_dev_cli-0.17.2 → fast_dev_cli-0.17.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.17.2
+Version: 0.17.3
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta
@@ -24,12 +24,12 @@ Project-URL: Homepage, https://github.com/waketzheng/fast-dev-cli
 Requires-Python: >=3.9
 Requires-Dist: typer<1,>=0.12.3
 Requires-Dist: tomli<3,>=2.0.1; python_version < "3.11"
-Requires-Dist: emoji<3,>=2.12.1
+Requires-Dist: emoji>=2.12.1
 Requires-Dist: packaging>=20.5
-Requires-Dist: coverage<8,>=7.5.1
-Requires-Dist: mypy<2,>=1.15.0
-Requires-Dist: bumpversion2<2,>=1.4.3
-Requires-Dist: pytest<9,>=8.2.0
+Requires-Dist: coverage>=7.5.1
+Requires-Dist: mypy>=1.15.0
+Requires-Dist: bumpversion2>=1.4.3
+Requires-Dist: pytest>=8.2.0
 Provides-Extra: include-optional-dependencies
 Requires-Dist: all; extra == "include-optional-dependencies"
 Description-Content-Type: text/markdown

fast_dev_cli-0.17.3/fast_dev_cli/__init__.py

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

{fast_dev_cli-0.17.2 → fast_dev_cli-0.17.3}/fast_dev_cli/cli.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import contextlib
+import functools
 import importlib.metadata as importlib_metadata
 import os
 import re
@@ -21,6 +22,7 @@ from typing import (
 )
 
 import typer
+from click import UsageError
 from typer import Exit, Option, echo, secho
 from typer.models import ArgumentInfo, OptionInfo
 
@@ -285,7 +287,7 @@ def exit_if_run_failed(
 
 class DryRun:
     def __init__(self, _exit: bool = False, dry: bool = False) -> None:
-        self.dry = dry
+        self.dry = _ensure_bool(dry)
         self._exit = _exit
 
     def gen(self) -> str:
@@ -1317,6 +1319,163 @@ def run_by_subprocess(cmd: str, dry: bool = DryOption) -> None:
             raise Exit(rc)
 
 
+class MakeDeps(DryRun):
+    def __init__(self, tool: str, prod: bool = False, dry: bool = False) -> None:
+        self._tool = tool
+        self._prod = prod
+        super().__init__(dry=dry)
+
+    def should_ensure_pip(self) -> bool:
+        return True
+
+    def should_upgrade_pip(self) -> bool:
+        return True
+
+    def get_groups(self) -> list[str]:
+        if self._prod:
+            return []
+        return ["dev"]
+
+    def gen(self) -> str:
+        if self._tool == "pdm":
+            return "pdm sync " + ("--prod" if self._prod else "-G :all")
+        elif self._tool == "uv":
+            return "uv sync --inexact --active" + (
+                "" 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"
+            )
+        else:
+            cmd = "python -m pip install -e ."
+            if gs := self.get_groups():
+                cmd += " " + " ".join(f"--group {g}" for g in gs)
+            upgrade = "python -m pip install --upgrade pip"
+            if self.should_ensure_pip():
+                cmd = f"python -m ensurepip && {upgrade} && {cmd}"
+            elif self.should_upgrade_pip():
+                cmd = "{upgrade} && {cmd}"
+            return cmd
+
+
+@cli.command(name="deps")
+def make_deps(
+    prod: bool = Option(
+        False,
+        "--prod",
+        help="Only instead production dependencies.",
+    ),
+    tool: str = ToolOption,
+    use_uv: bool = Option(False, "--uv", help="Use `uv` to install deps"),
+    use_pdm: bool = Option(False, "--pdm", help="Use `pdm` to install 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"),
+    dry: bool = DryOption,
+) -> None:
+    """Run: ruff check/format to reformat code and then mypy to check"""
+    if use_uv + use_pdm + use_pip + use_poetry > 1:
+        raise UsageError("`--uv/--pdm/--pip/--poetry` can only choose one!")
+    if use_uv:
+        tool = "uv"
+    elif use_pdm:
+        tool = "pdm"
+    elif use_pip:
+        tool = "pip"
+    elif use_poetry:
+        tool = "poetry"
+    elif tool == ToolOption.default:
+        tool = Project.get_manage_tool(cache=True) or "pip"
+    MakeDeps(tool, prod, dry=dry).run()
+
+
+class UvPypi(DryRun):
+    PYPI = "https://pypi.org/simple"
+    HOST = "https://files.pythonhosted.org"
+
+    def __init__(self, lock_file: Path, dry: bool, verbose: bool, quiet: bool) -> None:
+        super().__init__(dry=dry)
+        self.lock_file = lock_file
+        self._verbose = _ensure_bool(verbose)
+        self._quiet = _ensure_bool(quiet)
+
+    def run(self) -> None:
+        try:
+            rc = self.update_lock(self.lock_file, self._verbose, self._quiet)
+        except ValueError as e:
+            secho(str(e), fg=typer.colors.RED)
+            raise Exit(1) from e
+        else:
+            if rc != 0:
+                raise Exit(rc)
+
+    @classmethod
+    def update_lock(cls, p: Path, verbose: bool, quiet: bool) -> int:
+        text = p.read_text("utf-8")
+        registry_pattern = r'(registry = ")(.*?)"'
+        replace_registry = functools.partial(
+            re.sub, registry_pattern, rf'\1{cls.PYPI}"'
+        )
+        registry_urls = {i[1] for i in re.findall(registry_pattern, text)}
+        download_pattern = r'(url = ")(https?://.*?)(/packages/.*?\.)(gz|whl)"'
+        replace_host = functools.partial(
+            re.sub, download_pattern, rf'\1{cls.HOST}\3\4"'
+        )
+        download_hosts = {i[1] for i in re.findall(download_pattern, text)}
+        if not registry_urls:
+            raise ValueError(f"Failed to find pattern {registry_pattern!r} in {p}")
+        if len(registry_urls) == 1:
+            current_registry = registry_urls.pop()
+            if current_registry == cls.PYPI:
+                if download_hosts == {cls.HOST}:
+                    if verbose:
+                        echo(f"Registry of {p} is {cls.PYPI}, no need to change.")
+                    return 0
+            else:
+                text = replace_registry(text)
+                if verbose:
+                    echo(f"{current_registry} --> {cls.PYPI}")
+        else:
+            # TODO: ask each one to confirm replace
+            text = replace_registry(text)
+            if verbose:
+                for current_registry in sorted(registry_urls):
+                    echo(f"{current_registry} --> {cls.PYPI}")
+        if len(download_hosts) == 1:
+            current_host = download_hosts.pop()
+            if current_host != cls.HOST:
+                text = replace_host(text)
+                if verbose:
+                    print(current_host, "-->", cls.HOST)
+        elif download_hosts:
+            # TODO: ask each one to confirm replace
+            text = replace_host(text)
+            if verbose:
+                for current_host in sorted(download_hosts):
+                    echo(f"{current_host} --> {cls.HOST}")
+        size = p.write_text(text, encoding="utf-8")
+        if verbose:
+            echo(f"Updated {p} with {size} bytes.")
+        if quiet:
+            return 0
+        return 1
+
+
+@cli.command()
+def pypi(
+    dry: bool = DryOption,
+    verbose: bool = False,
+    quiet: bool = False,
+) -> None:
+    """Change registry of uv.lock to be pypi.org"""
+    if not (p := Path("uv.lock")).exists() and not (
+        (p := Project.get_work_dir() / p.name).exists()
+    ):
+        yellow_warn(f"{p.name!r} not found!")
+        return
+    UvPypi(p, dry, verbose, quiet).run()
+
+
 def version_callback(value: bool) -> None:
     if value:
         echo("Fast Dev Cli Version: " + typer.style(__version__, bold=True))

{fast_dev_cli-0.17.2 → fast_dev_cli-0.17.3}/pyproject.toml

@@ -35,14 +35,14 @@ classifiers = [
 dependencies = [
     "typer >=0.12.3,<1",
     "tomli >=2.0.1,<3; python_version < '3.11'",
-    "emoji >=2.12.1,<3",
+    "emoji >=2.12.1",
     "packaging >=20.5",
-    "coverage >=7.5.1,<8",
-    "mypy >=1.15.0,<2",
-    "bumpversion2 >=1.4.3,<2",
-    "pytest >=8.2.0,<9",
+    "coverage >=7.5.1",
+    "mypy >=1.15.0",
+    "bumpversion2 >=1.4.3",
+    "pytest >=8.2.0",
 ]
-version = "0.17.2"
+version = "0.17.3"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"
@@ -58,8 +58,6 @@ fast = "fast_dev_cli:cli.main"
 [dependency-groups]
 dev = [
     "twine>=6.1.0",
-]
-test = [
     "asynctor>=0.8.6",
 ]
 

fast_dev_cli-0.17.3/tests/test_deps.py

@@ -0,0 +1,33 @@
+from fast_dev_cli.cli import MakeDeps, capture_cmd_output
+
+
+def test_make_deps_class():
+    assert (
+        MakeDeps("uv", prod=False).gen()
+        == "uv sync --inexact --active --all-extras --all-groups"
+    )
+    assert MakeDeps("uv", prod=True).gen() == "uv sync --inexact --active"
+    assert MakeDeps("pdm", prod=False).gen() == "pdm sync -G :all"
+    assert MakeDeps("pdm", prod=True).gen() == "pdm sync --prod"
+    assert (
+        MakeDeps("poetry", prod=False).gen()
+        == "poetry install --all-extras --all-groups"
+    )
+    assert MakeDeps("poetry", prod=True).gen() == "poetry install --only=main"
+    assert (
+        MakeDeps("pip", prod=False).gen()
+        == "python -m ensurepip && python -m pip install --upgrade pip && python -m pip install -e . --group dev"
+    )
+    assert (
+        MakeDeps("pip", prod=True).gen()
+        == "python -m ensurepip && python -m pip install --upgrade pip && python -m pip install -e ."
+    )
+
+
+def test_fast_deps():
+    out = capture_cmd_output("fast deps --dry")
+    assert out == "--> pdm sync -G :all"
+    out = capture_cmd_output("fast deps --uv --prod --dry")
+    assert out == "--> uv sync --inexact --active"
+    out = capture_cmd_output("fast deps --uv --dry")
+    assert out == "--> uv sync --inexact --active --all-extras --all-groups"

{fast_dev_cli-0.17.2 → fast_dev_cli-0.17.3}/tests/test_lint.py

@@ -99,7 +99,7 @@ def test_check_bandit(tmp_path):
         assert "bandit -r ." in command
 
 
-def test_check_skip_mypy(mock_skip_mypy_0, mocker, capsys):
+def test_check_skip_mypy(mock_skip_mypy_0, mocker):
     cmd = "fast check --skip-mypy --dry"
     cmd2 = "fast lint --check-only --skip-mypy --dry"
     mocker.patch("fast_dev_cli.cli.is_venv", return_value=True)
@@ -271,7 +271,7 @@ def test_skip_mypy_option(mock_skip_mypy_0, mocker):
     )
 
 
-def test_skip_mypy_fast_lint(mock_skip_mypy_0, mocker, capsys):
+def test_skip_mypy_fast_lint(mock_skip_mypy_0, mocker):
     mocker.patch("fast_dev_cli.cli.is_venv", return_value=True)
     command = capture_cmd_output("fast lint --skip-mypy --dry")
     cmds = LINT_CMD.split(SEP)

{fast_dev_cli-0.17.2 → fast_dev_cli-0.17.3}/tests/test_version.py

@@ -72,7 +72,7 @@ def test_display_self_version(capsys):
     assert out_v == out
 
 
-def test_fast_version(capsys):
+def test_fast_version():
     out = Shell("fast version").capture_output().strip()
     assert f"Fast Dev Cli Version: {__version__}" in out
     assert f"fast_dev_cli/__init__.py: {__version__}" in out

fast_dev_cli-0.17.2/fast_dev_cli/__init__.py

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