fast-dev-cli 0.10.1__tar.gz → 0.11.1__tar.gz

{fast_dev_cli-0.10.1 → fast_dev_cli-0.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.10.1
+Version: 0.11.1
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta
@@ -96,7 +96,10 @@ fast check
 ```
 - Bump up version in pyproject.toml
 ```bash
-fast bump
+fast bump patch  # 0.1.0 -> 0.1.1
+fast bump minor  # 0.1.0 -> 0.2.0
+fast bump major  # 0.1.0 -> 1.0.0
+fast bump <part> --commit # bump version and run `git commit`
 ```
 - Run unittest and report coverage
 ```bash
@@ -106,7 +109,7 @@ fast test
 ```bash
 fast sync
 ```
-- Upgrade main/dev dependencies to latest version
+- Upgrade main/dev dependencies to latest version (only for poetry project)
 ```bash
 fast upgrade
 ```
@@ -114,3 +117,8 @@ fast upgrade
 ```bash
 fast dev
 ```
+- Publish to pypi
+```bash
+fast upload
+```
+*Note: all command support the `--dry` option*

{fast_dev_cli-0.10.1 → fast_dev_cli-0.11.1}/README.md

@@ -61,7 +61,10 @@ fast check
 ```
 - Bump up version in pyproject.toml
 ```bash
-fast bump
+fast bump patch  # 0.1.0 -> 0.1.1
+fast bump minor  # 0.1.0 -> 0.2.0
+fast bump major  # 0.1.0 -> 1.0.0
+fast bump <part> --commit # bump version and run `git commit`
 ```
 - Run unittest and report coverage
 ```bash
@@ -71,7 +74,7 @@ fast test
 ```bash
 fast sync
 ```
-- Upgrade main/dev dependencies to latest version
+- Upgrade main/dev dependencies to latest version (only for poetry project)
 ```bash
 fast upgrade
 ```
@@ -79,3 +82,8 @@ fast upgrade
 ```bash
 fast dev
 ```
+- Publish to pypi
+```bash
+fast upload
+```
+*Note: all command support the `--dry` option*

fast_dev_cli-0.11.1/fast_dev_cli/__init__.py

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

{fast_dev_cli-0.10.1 → fast_dev_cli-0.11.1}/fast_dev_cli/cli.py

@@ -8,7 +8,7 @@ import subprocess  # nosec:B404
 import sys
 from functools import cached_property
 from pathlib import Path
-from typing import Literal, Optional, Type
+from typing import Literal, Optional, Type, TypeAlias, get_args
 
 import emoji
 import typer
@@ -37,8 +37,9 @@ else:  # pragma: no cover
         __str__ = str.__str__
 
 
-TOML_FILE = "pyproject.toml"
 cli = typer.Typer()
+TOML_FILE = "pyproject.toml"
+ToolName: TypeAlias = Literal["poetry", "pdm", "uv", ""]
 
 
 def load_bool(name: str, default=False) -> bool:
@@ -86,15 +87,56 @@ def capture_cmd_output(command: list[str] | str, **kw) -> str:
     return r.stdout.strip().decode()
 
 
+def _parse_version(line: str, pattern: re.Pattern) -> str:
+    return pattern.sub("", line).split("#")[0].strip(" '\"")
+
+
+def read_version_from_file(
+    package_name: str, work_dir=None, toml_text: str | None = None
+) -> str:
+    if toml_text is None:
+        toml_text = Project.load_toml_text()
+    pattern = re.compile(r"version\s*=")
+    invalid = ("0", "0.0.0")
+    for line in toml_text.splitlines():
+        if pattern.match(line):
+            version = _parse_version(line, pattern)
+            if version.startswith("{") or version in invalid:
+                break
+            return version
+    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!")
+        return "0.0.0"
+    pattern = re.compile(r"__version__\s*=")
+    for line in init_file.read_text().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_current_version(
-    verbose=False,
-    is_poetry: bool | None = None,
-    package_name=Path(__file__).parent.name,
+    verbose=False, is_poetry: bool | None = None, package_name: str | None = None
 ) -> str:
     if is_poetry is None:
         is_poetry = Project.manage_by_poetry()
     if not is_poetry:
-        return importlib_metadata.version(package_name)
+        work_dir = None
+        if package_name is None:
+            work_dir = Project.get_work_dir()
+            package_name = re.sub(r"[- ]", "_", work_dir.name)
+        try:
+            return importlib_metadata.version(package_name)
+        except importlib_metadata.PackageNotFoundError:
+            return read_version_from_file(package_name, work_dir)
+
     cmd = ["poetry", "version", "-s"]
     if verbose:
         echo(f"--> {' '.join(cmd)}")
@@ -182,14 +224,14 @@ class BumpUp(DryRun):
             version_value = context["tool"]["poetry"]["version"]
         except KeyError:
             return TOML_FILE
-        if version_value == "0":
+        if version_value in ("0", "0.0.0"):
             try:
                 package_item = context["tool"]["poetry"]["packages"]
             except KeyError:
                 packages = []
             else:
                 packages = [j for i in package_item if (j := i.get("include"))]
-            # In case of managed by `poetry-version-plugin`
+            # In case of managed by `poetry-plugin-version`
             cwd = Path.cwd()
             pattern = re.compile(r"__version__\s*=\s*['\"]")
             ds = [cwd / i for i in packages] + [cwd / cwd.name.replace("-", "_"), cwd]
@@ -321,16 +363,16 @@ class Project:
         return "[tool.poetry]" in cls.load_toml_text()
 
     @classmethod
-    def get_manage_tool(cls: Type[Self]) -> Literal["poetry", "pdm", ""]:
+    def get_manage_tool(cls: Type[Self]) -> ToolName:
         try:
             text = cls.load_toml_text()
         except EnvError:
             pass
         else:
-            if "[tool.poetry]" in text:
-                return "poetry"
-            elif "[tool.pdm]" in text:
-                return "pdm"
+            name: ToolName
+            for name in get_args(ToolName):
+                if f"[tool.{name}]" in text:
+                    return name
         return ""
 
     @staticmethod
@@ -573,11 +615,18 @@ def tag(
 
 class LintCode(DryRun):
     def __init__(
-        self: Self, args, check_only=False, _exit=False, dry=False, bandit=False
+        self: Self,
+        args,
+        check_only=False,
+        _exit=False,
+        dry=False,
+        bandit=False,
+        skip_mypy=False,
     ) -> None:
         self.args = args
         self.check_only = check_only
         self._bandit = bandit
+        self._skip_mypy = skip_mypy
         super().__init__(_exit, dry)
 
     @staticmethod
@@ -602,14 +651,16 @@ class LintCode(DryRun):
         return "."
 
     @classmethod
-    def to_cmd(cls: Type[Self], paths=".", check_only=False, bandit=False) -> str:
+    def to_cmd(
+        cls: Type[Self], paths=".", check_only=False, bandit=False, skip_mypy=False
+    ) -> str:
         cmd = ""
         tools = ["ruff format", "ruff check --extend-select=I,B,SIM --fix", "mypy"]
         if check_only:
             tools[0] += " --check"
         if check_only or load_bool("NO_FIX"):
             tools[1] = tools[1].replace(" --fix", "")
-        if load_bool("SKIP_MYPY"):
+        if skip_mypy or load_bool("SKIP_MYPY"):
             # Sometimes mypy is too slow
             tools = tools[:-1]
         elif load_bool("IGNORE_MISSING_IMPORTS"):
@@ -640,29 +691,32 @@ class LintCode(DryRun):
 
     def gen(self: Self) -> str:
         paths = " ".join(map(str, self.args)) if self.args else "."
-        return self.to_cmd(paths, self.check_only, self._bandit)
+        return self.to_cmd(paths, self.check_only, self._bandit, self._skip_mypy)
 
 
 def parse_files(args: list[str] | tuple[str, ...]) -> list[str]:
     return [i for i in args if not i.startswith("-")]
 
 
-def lint(files=None, dry=False) -> None:
+def lint(files=None, dry=False, skip_mypy=False) -> None:
     if files is None:
         files = parse_files(sys.argv[1:])
     if files and files[0] == "lint":
         files = files[1:]
-    LintCode(files, dry=dry).run()
+    LintCode(files, dry=dry, skip_mypy=skip_mypy).run()
 
 
-def check(files=None, dry=False, bandit=False) -> None:
-    LintCode(files, check_only=True, _exit=True, dry=dry, bandit=bandit).run()
+def check(files=None, dry=False, bandit=False, skip_mypy=False) -> None:
+    LintCode(
+        files, check_only=True, _exit=True, dry=dry, bandit=bandit, skip_mypy=skip_mypy
+    ).run()
 
 
 @cli.command(name="lint")
 def make_style(
     files: Annotated[Optional[list[Path]], typer.Argument()] = None,
     check_only: bool = Option(False, "--check-only", "-c"),
+    skip_mypy: bool = Option(False, "--skip-mypy"),
     dry: bool = Option(False, "--dry", help="Only print, not really run shell command"),
 ) -> None:
     """Run: ruff check/format to reformat code and then mypy to check"""
@@ -670,19 +724,21 @@ def make_style(
         files = [Path(".")]
     elif isinstance(files, str):
         files = [files]
+    skip = _ensure_bool(skip_mypy)
     if _ensure_bool(check_only):
-        check(files, dry=dry)
+        check(files, dry=dry, skip_mypy=skip)
     else:
-        lint(files, dry=dry)
+        lint(files, dry=dry, skip_mypy=skip)
 
 
 @cli.command(name="check")
 def only_check(
     bandit: bool = Option(False, "--bandit", help="Run `bandit -r <package_dir>`"),
+    skip_mypy: bool = Option(False, "--skip-mypy"),
     dry: bool = Option(False, "--dry", help="Only print, not really run shell command"),
 ) -> None:
     """Check code style without reformat"""
-    check(dry=dry, bandit=bandit)
+    check(dry=dry, bandit=bandit, skip_mypy=_ensure_bool(skip_mypy))
 
 
 class Sync(DryRun):
@@ -695,18 +751,30 @@ class Sync(DryRun):
     def gen(self) -> str:
         extras, save = self.extras, self._save
         should_remove = not Path.cwd().joinpath(self.filename).exists()
-        prefix = "" if is_venv() else "poetry run "
-        install_cmd = (
-            "poetry export --with=dev --without-hashes -o {0}"
-            " && {1}pip install -r {0}"
-        )
-        if not UpgradeDependencies.should_with_dev():
-            install_cmd = install_cmd.replace(" --with=dev", "")
-        if extras and isinstance(extras, str | list):
-            install_cmd = install_cmd.replace("export", f"export --{extras=}")
+        if not (tool := Project.get_manage_tool()):
+            if should_remove or not is_venv():
+                raise EnvError("There project is not managed by uv/pdm/poetry!")
+            return f"python -m pip install -r {self.filename}"
+        prefix = "" if is_venv() else f"{tool} run "
+        ensurepip = " {1}python -m ensurepip && {1}python -m pip install -U pip &&"
+        if tool == "uv":
+            export_cmd = "uv export --no-hashes --all-extras --frozen"
+            if check_call(prefix + "python -m pip --version"):
+                ensurepip = ""
+        elif tool in ("poetry", "pdm"):
+            export_cmd = f"{tool} export --without-hashes --with=dev"
+            if tool == "poetry":
+                ensurepip = ""
+                if not UpgradeDependencies.should_with_dev():
+                    export_cmd = export_cmd.replace(" --with=dev", "")
+                if extras and isinstance(extras, str | list):
+                    export_cmd += f" --{extras=}".replace("'", '"')
+            elif check_call(prefix + "python -m pip --version"):
+                ensurepip = ""
+        install_cmd = "{2} -o {0} &&%s {1}python -m pip install -r {0}" % ensurepip
         if should_remove and not save:
             install_cmd += " && rm -f {0}"
-        return install_cmd.format(self.filename, prefix)
+        return install_cmd.format(self.filename, prefix, export_cmd)
 
 
 @cli.command()
@@ -757,12 +825,26 @@ def coverage_test(
     return test(dry, ignore_script)
 
 
+class Publish:
+    class CommandEnum(StrEnum):
+        poetry = "poetry publish --build"
+        pdm = "pdm publish"
+        uv = "uv build && uv publish"
+        twine = "python -m build && twine upload"
+
+    @classmethod
+    def gen(cls) -> str:
+        if (tool := Project.get_manage_tool()) and tool in get_args(ToolName):
+            return cls.CommandEnum[tool]
+        return cls.CommandEnum.twine
+
+
 @cli.command()
 def upload(
     dry: bool = Option(False, "--dry", help="Only print, not really run shell command"),
 ) -> None:
     """Shortcut for package publish"""
-    cmd = "poetry publish --build"
+    cmd = Publish.gen()
     exit_if_run_failed(cmd, dry=dry)
 
 

{fast_dev_cli-0.10.1 → fast_dev_cli-0.11.1}/pyproject.toml

@@ -40,7 +40,7 @@ dependencies = [
     "bumpversion2 >=1.4.2,<2",
     "pytest >=8.2.0,<9",
 ]
-version = "0.10.1"
+version = "0.11.1"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"

{fast_dev_cli-0.10.1 → fast_dev_cli-0.11.1}/scripts/check.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding:utf-8 -*-
 import os
 import sys
 
@@ -16,4 +17,4 @@ cmd = "pdm run bandit -r {}".format(package_name)
 print("-->", cmd)
 if os.system(cmd) != 0:
     sys.exit(1)
-print("Done.")
+print("Done. ✨ 🍰 ✨")

{fast_dev_cli-0.10.1 → fast_dev_cli-0.11.1}/scripts/format.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding:utf-8 -*-
 import os
 import shlex
 import subprocess

{fast_dev_cli-0.10.1 → fast_dev_cli-0.11.1}/scripts/test.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding:utf-8 -*-
 import os
 import shlex
 import subprocess

{fast_dev_cli-0.10.1 → fast_dev_cli-0.11.1}/tests/test_lint.py

@@ -75,6 +75,7 @@ def test_check(mock_no_dmypy, monkeypatch, mocker):
 def test_check_bandit(tmp_path):
     package_path = tmp_path / "foo"
     with chdir(tmp_path):
+        assert LintCode.get_package_name() == "."
         run_and_echo(f"poetry new {package_path.name}")
     shutil.rmtree(package_path / package_path.name)
     with chdir(package_path):
@@ -82,6 +83,18 @@ def test_check_bandit(tmp_path):
     assert "bandit -r ." in command
 
 
+def test_check_skip_mypy(mock_skip_mypy_0, mocker, capsys):
+    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)
+    command = capture_cmd_output(cmd)
+    command2 = capture_cmd_output(cmd2)
+    expected = "--> " + SEP.join(
+        filter(lambda i: not i.startswith("mypy"), CHECK_CMD.split(SEP))
+    )
+    assert command == command2 == expected
+
+
 def test_fast_check():
     _fast_check()
 
@@ -128,7 +141,7 @@ def test_lint_with_prefix(mocker):
     assert "pdm run" in stream.getvalue()
 
 
-def test_make_style(mocker, mock_no_dmypy):
+def test_make_style(mock_skip_mypy_0, mocker, mock_no_dmypy):
     mocker.patch("fast_dev_cli.cli.is_venv", return_value=True)
     with capture_stdout() as stream:
         make_style(check_only=False, dry=True)
@@ -196,6 +209,23 @@ def test_skip_mypy(mock_skip_mypy, mocker):
     assert LintCode(".").gen() == SEP.join(i for i in cmds if not i.startswith("mypy"))
 
 
+def test_skip_mypy_option(mock_skip_mypy_0, mocker):
+    mocker.patch("fast_dev_cli.cli.is_venv", return_value=True)
+    cmds = LINT_CMD.split(SEP)
+    assert LintCode(".", skip_mypy=True).gen() == SEP.join(
+        i for i in cmds if not i.startswith("mypy")
+    )
+
+
+def test_skip_mypy_fast_lint(mock_skip_mypy_0, mocker, capsys):
+    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)
+    assert command.replace("--> ", "") == SEP.join(
+        i for i in cmds if not i.startswith("mypy")
+    )
+
+
 def test_skip_mypy_0(mock_skip_mypy_0, mocker, mock_no_dmypy):
     mocker.patch("fast_dev_cli.cli.is_venv", return_value=True)
     assert LintCode(".").gen() == LINT_CMD
@@ -238,3 +268,5 @@ def test_get_manage_tool(tmp_path):
         assert Project.get_manage_tool() == "poetry"
         Path(TOML_FILE).write_text("[tool.pdm]")
         assert Project.get_manage_tool() == "pdm"
+        Path(TOML_FILE).write_text("[tool.uv]")
+        assert Project.get_manage_tool() == "uv"

{fast_dev_cli-0.10.1 → fast_dev_cli-0.11.1}/tests/test_poetry_version_plugin.py

@@ -18,19 +18,24 @@ from .utils import chdir
 
 CONF = """
 
-[tool.poetry-version-plugin]
+[tool.poetry-plugin-version]
 source = "init"
 """
+CONF_2 = """
+
+[tool.poetry-dynamic-versioning]
+enable = true
+"""
 
 
 @contextmanager
 def _prepare_package(
-    package_path: Path, define_include=False
+    package_path: Path, define_include=False, mark="0"
 ) -> Generator[Path, None, None]:
     toml_file = package_path / TOML_FILE
     package_name = package_path.name.replace(" ", "_")
     init_file = package_path / package_name / "__init__.py"
-    a, b = 'version = "0.1.0"', 'version = "0"'
+    a, b = 'version = "0.1.0"', f'version = "{mark}"'
     if define_include:
         b += '\npackages = [{include = "%s"}]' % package_name
     with chdir(package_path.parent):
@@ -62,9 +67,28 @@ def test_version_plugin(tmp_path: Path) -> None:
             BumpUp(part="patch", commit=False, dry=True).gen()
 
 
+def test_version_plugin_2(tmp_path: Path) -> None:
+    with _prepare_package(tmp_path / "helloworld", mark="0.0.0") as init_file:
+        command = _build_bump_cmd(init_file)
+        assert BumpUp(part="patch", commit=False, dry=True).gen() == command
+        run_and_echo("poetry run fast bump patch")
+        assert init_file.read_text() == '__version__ = "0.0.2"\n'
+        init_file.unlink()
+        with pytest.raises(ParseError, match=r"Version file not found!.*"):
+            BumpUp(part="patch", commit=False, dry=True).gen()
+
+
 def test_version_plugin_include_defined(tmp_path: Path) -> None:
     with _prepare_package(tmp_path / "hello world", True) as init_file:
         command = _build_bump_cmd(init_file)
         assert BumpUp(part="patch", commit=False, dry=True).gen() == command
         run_and_echo("poetry run fast bump patch")
         assert init_file.read_text() == '__version__ = "0.0.2"\n'
+
+
+def test_version_plugin_include_defined_2(tmp_path: Path) -> None:
+    with _prepare_package(tmp_path / "hello world", True, mark="0.0.0") as init_file:
+        command = _build_bump_cmd(init_file)
+        assert BumpUp(part="patch", commit=False, dry=True).gen() == command
+        run_and_echo("poetry run fast bump patch")
+        assert init_file.read_text() == '__version__ = "0.0.2"\n'

fast_dev_cli-0.11.1/tests/test_sync.py

@@ -0,0 +1,214 @@
+from pathlib import Path
+
+import pytest
+
+from fast_dev_cli.cli import TOML_FILE, EnvError, Sync, run_and_echo, sync
+
+from .utils import chdir, temp_file
+
+TOML_TEXT = """
+[tool.poetry]
+name = "foo"
+version = "0.1.0"
+description = ""
+authors = []
+readme = ""
+
+[tool.poetry.dependencies]
+python = "^3.11"
+click = ">=7.1.1"
+anyio = {version = "^4.0", optional = true}
+
+[tool.poetry.extras]
+all = ["anyio"]
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+"""
+
+
+def test_sync_not_in_venv(mocker, capsys):
+    mocker.patch("fast_dev_cli.cli.is_venv", return_value=False)
+    test_dir = Path(__file__).parent
+    with temp_file(TOML_FILE, TOML_TEXT), chdir(test_dir):
+        cmd = Sync("req.txt", "all", save=False, dry=True).gen()
+    assert (
+        cmd
+        == 'poetry export --without-hashes --extras="all" -o req.txt && poetry run python -m pip install -r req.txt && rm -f req.txt'
+    )
+    sync(extras="all", save=False, dry=True)
+    assert "pip install -r" in capsys.readouterr().out
+    mocker.patch(
+        "fast_dev_cli.cli.UpgradeDependencies.should_with_dev", return_value=True
+    )
+    assert (
+        Sync("req.txt", "", True, dry=True).gen()
+        == "pdm export --without-hashes --with=dev -o req.txt && pdm run python -m pip install -r req.txt"
+    )
+
+
+def test_sync(mocker):
+    mocker.patch("fast_dev_cli.cli.is_venv", return_value=True)
+    test_dir = Path(__file__).parent
+    with temp_file(TOML_FILE, TOML_TEXT), chdir(test_dir):
+        cmd = Sync("req.txt", "all", save=False, dry=True).gen()
+    assert (
+        cmd
+        == 'poetry export --without-hashes --extras="all" -o req.txt && python -m pip install -r req.txt && rm -f req.txt'
+    )
+    mocker.patch(
+        "fast_dev_cli.cli.UpgradeDependencies.should_with_dev", return_value=True
+    )
+    assert (
+        Sync("req.txt", "", True, dry=True).gen()
+        == "pdm export --without-hashes --with=dev -o req.txt && python -m pip install -r req.txt"
+    )
+
+
+UV_TOML_EXAMPLE = """
+[project]
+name = "examples"
+version = "0.1.0"
+description = "Add your description here"
+readme = "README.md"
+requires-python = ">=3.10"
+dependencies = [
+    "asynctor>=0.6.6",
+]
+
+[tool.uv]
+index-url = "https://mirrors.cloud.tencent.com/pypi/simple/"
+"""
+UV_LOCK_EXAMPLE = """
+version = 1
+requires-python = ">=3.10"
+
+[[package]]
+name = "anyio"
+version = "4.6.2.post1"
+source = { registry = "https://mirrors.cloud.tencent.com/pypi/simple/" }
+dependencies = [
+    { name = "exceptiongroup", marker = "python_full_version < '3.11'" },
+    { name = "idna" },
+    { name = "sniffio" },
+    { name = "typing-extensions", marker = "python_full_version < '3.11'" },
+]
+sdist = { url = "https://mirrors.cloud.tencent.com/pypi/packages/9f/09/45b9b7a6d4e45c6bcb5bf61d19e3ab87df68e0601fa8c5293de3542546cc/anyio-4.6.2.post1.tar.gz", hash = "sha256:4c8bc31ccdb51c7f7bd251f51c609e038d63e34219b44aa86e47576389880b4c" }
+wheels = [
+    { url = "https://mirrors.cloud.tencent.com/pypi/packages/e4/f5/f2b75d2fc6f1a260f340f0e7c6a060f4dd2961cc16884ed851b0d18da06a/anyio-4.6.2.post1-py3-none-any.whl", hash = "sha256:6d170c36fba3bdd840c73d3868c1e777e33676a69c3a72cf0a0d5d6d8009b61d" },
+]
+
+[[package]]
+name = "async-timeout"
+version = "4.0.3"
+source = { registry = "https://mirrors.cloud.tencent.com/pypi/simple/" }
+sdist = { url = "https://mirrors.cloud.tencent.com/pypi/packages/87/d6/21b30a550dafea84b1b8eee21b5e23fa16d010ae006011221f33dcd8d7f8/async-timeout-4.0.3.tar.gz", hash = "sha256:4640d96be84d82d02ed59ea2b7105a0f7b33abe8703703cd0ab0bf87c427522f" }
+wheels = [
+    { url = "https://mirrors.cloud.tencent.com/pypi/packages/a7/fa/e01228c2938de91d47b307831c62ab9e4001e747789d0b05baf779a6488c/async_timeout-4.0.3-py3-none-any.whl", hash = "sha256:7405140ff1230c310e51dc27b3145b9092d659ce68ff733fb0cefe3ee42be028" },
+]
+
+[[package]]
+name = "asynctor"
+version = "0.6.6"
+source = { registry = "https://mirrors.cloud.tencent.com/pypi/simple/" }
+dependencies = [
+    { name = "anyio" },
+    { name = "redis" },
+]
+sdist = { url = "https://mirrors.cloud.tencent.com/pypi/packages/38/d0/452d78491eda3b70bd7b8d401093e5e77999f0232a836b4465e0395223c5/asynctor-0.6.6.tar.gz", hash = "sha256:594c60a38483e399d5a6be513256657989fa2bbf069572074c6b529fa72219ef" }
+wheels = [
+    { url = "https://mirrors.cloud.tencent.com/pypi/packages/77/01/31143ebf73a22b5e11a1c6dd3f3af53f1d045d9ab0f13a0159b32df71440/asynctor-0.6.6-py3-none-any.whl", hash = "sha256:54785f1cfd32bd9f9bcffe9445ffd02421aab9c3501c134dbd955901606cf1b4" },
+]
+
+[[package]]
+name = "examples"
+version = "0.1.0"
+source = { virtual = "." }
+dependencies = [
+    { name = "asynctor" },
+]
+
+[package.metadata]
+requires-dist = [{ name = "asynctor", specifier = ">=0.6.6" }]
+
+[[package]]
+name = "exceptiongroup"
+version = "1.2.2"
+source = { registry = "https://mirrors.cloud.tencent.com/pypi/simple/" }
+sdist = { url = "https://mirrors.cloud.tencent.com/pypi/packages/09/35/2495c4ac46b980e4ca1f6ad6db102322ef3ad2410b79fdde159a4b0f3b92/exceptiongroup-1.2.2.tar.gz", hash = "sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc" }
+wheels = [
+    { url = "https://mirrors.cloud.tencent.com/pypi/packages/02/cc/b7e31358aac6ed1ef2bb790a9746ac2c69bcb3c8588b41616914eb106eaf/exceptiongroup-1.2.2-py3-none-any.whl", hash = "sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b" },
+]
+
+[[package]]
+name = "idna"
+version = "3.10"
+source = { registry = "https://mirrors.cloud.tencent.com/pypi/simple/" }
+sdist = { url = "https://mirrors.cloud.tencent.com/pypi/packages/f1/70/7703c29685631f5a7590aa73f1f1d3fa9a380e654b86af429e0934a32f7d/idna-3.10.tar.gz", hash = "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9" }
+wheels = [
+    { url = "https://mirrors.cloud.tencent.com/pypi/packages/76/c6/c88e154df9c4e1a2a66ccf0005a88dfb2650c1dffb6f5ce603dfbd452ce3/idna-3.10-py3-none-any.whl", hash = "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3" },
+]
+
+[[package]]
+name = "redis"
+version = "5.1.1"
+source = { registry = "https://mirrors.cloud.tencent.com/pypi/simple/" }
+dependencies = [
+    { name = "async-timeout", marker = "python_full_version < '3.11.3'" },
+]
+sdist = { url = "https://mirrors.cloud.tencent.com/pypi/packages/e0/58/dcf97c3c09d429c3bb830d6075322256da3dba42df25359bd1c82b442d20/redis-5.1.1.tar.gz", hash = "sha256:f6c997521fedbae53387307c5d0bf784d9acc28d9f1d058abeac566ec4dbed72" }
+wheels = [
+    { url = "https://mirrors.cloud.tencent.com/pypi/packages/15/f1/feeeaaaac0f589bcbc12c02da357cf635ee383c9128b77230a1e99118885/redis-5.1.1-py3-none-any.whl", hash = "sha256:f8ea06b7482a668c6475ae202ed8d9bcaa409f6e87fb77ed1043d912afd62e24" },
+]
+
+[[package]]
+name = "sniffio"
+version = "1.3.1"
+source = { registry = "https://mirrors.cloud.tencent.com/pypi/simple/" }
+sdist = { url = "https://mirrors.cloud.tencent.com/pypi/packages/a2/87/a6771e1546d97e7e041b6ae58d80074f81b7d5121207425c964ddf5cfdbd/sniffio-1.3.1.tar.gz", hash = "sha256:f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc" }
+wheels = [
+    { url = "https://mirrors.cloud.tencent.com/pypi/packages/e9/44/75a9c9421471a6c4805dbf2356f7c181a29c1879239abab1ea2cc8f38b40/sniffio-1.3.1-py3-none-any.whl", hash = "sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2" },
+]
+
+[[package]]
+name = "typing-extensions"
+version = "4.12.2"
+source = { registry = "https://mirrors.cloud.tencent.com/pypi/simple/" }
+sdist = { url = "https://mirrors.cloud.tencent.com/pypi/packages/df/db/f35a00659bc03fec321ba8bce9420de607a1d37f8342eee1863174c69557/typing_extensions-4.12.2.tar.gz", hash = "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8" }
+wheels = [
+    { url = "https://mirrors.cloud.tencent.com/pypi/packages/26/9f/ad63fc0248c5379346306f8668cda6e2e2e9c95e01216d2b8ffd9ff037d0/typing_extensions-4.12.2-py3-none-any.whl", hash = "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d" },
+]
+"""
+
+
+def test_sync_uv(mocker, tmp_path):
+    mocker.patch("fast_dev_cli.cli.is_venv", return_value=False)
+    with chdir(tmp_path):
+        toml = tmp_path / TOML_FILE
+        toml.write_text(UV_TOML_EXAMPLE)
+        toml.with_name("uv.lock").write_text(UV_LOCK_EXAMPLE)
+        assert (
+            Sync("req.txt", "", True, dry=True).gen()
+            == "uv export --no-hashes --all-extras --frozen -o req.txt && uv run python -m ensurepip && uv run python -m pip install -U pip && uv run python -m pip install -r req.txt"
+        )
+        run_and_echo("uv run python -m ensurepip")
+        assert (
+            Sync("req.txt", "", True, dry=True).gen()
+            == "uv export --no-hashes --all-extras --frozen -o req.txt && uv run python -m pip install -r req.txt"
+        )
+
+
+def test_sync_no_tool(mocker, tmp_path):
+    mocker.patch("fast_dev_cli.cli.is_venv", return_value=False)
+    with chdir(tmp_path):
+        with pytest.raises(EnvError):
+            Sync("req.txt", "", True, dry=True).gen()
+        Path("req.txt").write_text("six")
+        with pytest.raises(EnvError):
+            Sync("req.txt", "", True, dry=True).gen()
+        mocker.patch("fast_dev_cli.cli.is_venv", return_value=True)
+        assert (
+            Sync("req.txt", "", True, dry=True).gen()
+            == "python -m pip install -r req.txt"
+        )

fast_dev_cli-0.11.1/tests/test_upload.py

@@ -0,0 +1,43 @@
+import os
+
+from fast_dev_cli.cli import TOML_FILE, run_and_echo, upload
+
+from .utils import chdir
+
+
+def test_upload(capsys):
+    upload(dry=True)
+    out = capsys.readouterr().out.strip()
+    assert out.replace("--> ", "") == "pdm publish"
+
+
+def test_upload_poetry(tmp_path, capsys):
+    with chdir(tmp_path):
+        run_and_echo("poetry new foo", verbose=False)
+    with chdir(tmp_path / "foo"):
+        upload(dry=True)
+    out = capsys.readouterr().out.strip()
+    assert out.replace("--> ", "") == "poetry publish --build"
+
+
+def test_upload_uv(tmp_path, capsys):
+    project_dir = tmp_path / "uv_proj"
+    project_dir.mkdir()
+    toml_file = project_dir / TOML_FILE
+    with chdir(project_dir):
+        run_and_echo("uv init", verbose=False)
+        if (s := "[tool.uv]") not in (text := toml_file.read_text()):
+            toml_file.write_text(text + os.linesep + s)
+        upload(dry=True)
+    out = capsys.readouterr().out.strip()
+    assert out.replace("--> ", "") == "uv build && uv publish"
+
+
+def test_upload_other(tmp_path, capsys):
+    project_dir = tmp_path / "proj"
+    project_dir.mkdir()
+    with chdir(project_dir):
+        run_and_echo("uv init", verbose=False)
+        upload(dry=True)
+    out = capsys.readouterr().out.strip()
+    assert out.replace("--> ", "") == "python -m build && twine upload"

fast_dev_cli-0.11.1/tests/test_version.py

@@ -0,0 +1,56 @@
+import re
+from pathlib import Path
+
+from fast_dev_cli import __version__
+from fast_dev_cli.cli import (
+    TOML_FILE,
+    _parse_version,
+    get_current_version,
+    read_version_from_file,
+    version,
+)
+
+from .utils import chdir
+
+
+def test_version(capsys):
+    version()
+    assert get_current_version(is_poetry=False) in capsys.readouterr().out
+    assert get_current_version(is_poetry=False) == __version__
+    assert get_current_version(is_poetry=True) == ""
+    assert get_current_version() == __version__
+
+
+def test_read_version(tmp_path: Path, capsys):
+    assert read_version_from_file("fast_dev_cli") == __version__
+    toml_text = 'version = "0.1.0"'
+    assert read_version_from_file("", toml_text=toml_text) == "0.1.0"
+    with chdir(tmp_path):
+        tmp_path.joinpath(TOML_FILE).write_text("")
+        assert read_version_from_file("") == "0.0.0"
+        assert "WARNING" in capsys.readouterr().out
+        init_file = tmp_path / "app" / "__init__.py"
+        init_file.parent.mkdir()
+        init_file.write_text("")
+        assert read_version_from_file("") == "0.0.0"
+        assert "WARNING" in capsys.readouterr().out
+        assert get_current_version() == "0.0.0"
+
+
+def test_parse_version():
+    pattern = re.compile(r"version\s*=")
+    line = 'version="0.0.1" # adsfasf version="0.0.2"'
+    assert _parse_version(line, pattern) == "0.0.1"
+    line = 'version = "0.0.1" # adsfasf version="0.0.2"'
+    assert _parse_version(line, pattern) == "0.0.1"
+    line = "version = '0.0.1' # adsfasf version=\"0.0.2\""
+    assert _parse_version(line, pattern) == "0.0.1"
+    line = "version='0.0.1' # adsfasf version=\"0.0.2\""
+    assert _parse_version(line, pattern) == "0.0.1"
+    line = 'version="0.0.1"'
+    assert _parse_version(line, pattern) == "0.0.1"
+    pattern = re.compile(r"__version__\s*=")
+    line = '__version__ = "0.0.1"'
+    assert _parse_version(line, pattern) == "0.0.1"
+    line = '__version__ = "0.0.1"  # 0.0.2'
+    assert _parse_version(line, pattern) == "0.0.1"

fast_dev_cli-0.10.1/fast_dev_cli/__init__.py

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

fast_dev_cli-0.10.1/tests/test_sync.py

@@ -1,64 +0,0 @@
-from pathlib import Path
-
-from fast_dev_cli.cli import TOML_FILE, Sync, sync
-
-from .utils import chdir, temp_file
-
-TOML_TEXT = """
-[tool.poetry]
-name = "foo"
-version = "0.1.0"
-description = ""
-authors = []
-readme = ""
-
-[tool.poetry.dependencies]
-python = "^3.11"
-click = ">=7.1.1"
-anyio = {version = "^4.0", optional = true}
-
-[tool.poetry.extras]
-all = ["anyio"]
-
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
-"""
-
-
-def test_sync_not_in_venv(mocker, capsys):
-    mocker.patch("fast_dev_cli.cli.is_venv", return_value=False)
-    test_dir = Path(__file__).parent
-    with temp_file(TOML_FILE, TOML_TEXT), chdir(test_dir):
-        cmd = Sync("req.txt", "all", save=False, dry=True).gen()
-    assert (
-        cmd
-        == "poetry export --extras='all' --without-hashes -o req.txt && poetry run pip install -r req.txt && rm -f req.txt"
-    )
-    sync(extras="all", save=False, dry=True)
-    assert "pip install -r" in capsys.readouterr().out
-    mocker.patch(
-        "fast_dev_cli.cli.UpgradeDependencies.should_with_dev", return_value=True
-    )
-    assert (
-        Sync("req.txt", "", True, dry=True).gen()
-        == "poetry export --with=dev --without-hashes -o req.txt && poetry run pip install -r req.txt"
-    )
-
-
-def test_sync(mocker):
-    mocker.patch("fast_dev_cli.cli.is_venv", return_value=True)
-    test_dir = Path(__file__).parent
-    with temp_file(TOML_FILE, TOML_TEXT), chdir(test_dir):
-        cmd = Sync("req.txt", "all", save=False, dry=True).gen()
-    assert (
-        cmd
-        == "poetry export --extras='all' --without-hashes -o req.txt && pip install -r req.txt && rm -f req.txt"
-    )
-    mocker.patch(
-        "fast_dev_cli.cli.UpgradeDependencies.should_with_dev", return_value=True
-    )
-    assert (
-        Sync("req.txt", "", True, dry=True).gen()
-        == "poetry export --with=dev --without-hashes -o req.txt && pip install -r req.txt"
-    )

fast_dev_cli-0.10.1/tests/test_upload.py

@@ -1,7 +0,0 @@
-from fast_dev_cli.cli import upload
-
-
-def test_upload(capsys):
-    upload(dry=True)
-    out = capsys.readouterr().out.strip()
-    assert out.replace("--> ", "") == "poetry publish --build"

fast_dev_cli-0.10.1/tests/test_version.py

@@ -1,10 +0,0 @@
-from fast_dev_cli import __version__
-from fast_dev_cli.cli import get_current_version, version
-
-
-def test_version(capsys):
-    version()
-    assert get_current_version(is_poetry=False) in capsys.readouterr().out
-    assert get_current_version(is_poetry=False) == __version__
-    assert get_current_version(is_poetry=True) == ""
-    assert get_current_version() == __version__