fast-dev-cli 0.11.2__tar.gz → 0.11.4__tar.gz

{fast_dev_cli-0.11.2 → fast_dev_cli-0.11.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.11.2
+Version: 0.11.4
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta
@@ -9,6 +9,7 @@ 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
@@ -19,8 +20,8 @@ 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: <4,>=3.10
-Requires-Dist: typer<0.13,>=0.12.3
+Requires-Python: <4,>=3.9
+Requires-Dist: typer<0.14,>=0.12.3
 Requires-Dist: emoji<3,>=2.12.1
 Requires-Dist: tomli<3,>=2.0.1; python_version < "3.11"
 Requires-Dist: coverage<8,>=7.5.1
@@ -28,9 +29,8 @@ Requires-Dist: ruff<0.8,>=0.4.4
 Requires-Dist: mypy<2,>=1.10.0
 Requires-Dist: bumpversion2<2,>=1.4.3
 Requires-Dist: pytest<9,>=8.2.0
-Provides-Extra: all
-Requires-Dist: ipython<9,>=8.24.0; extra == "all"
-Requires-Dist: pytest-mock<4,>=3.14.0; extra == "all"
+Provides-Extra: include-optional-dependencies
+Requires-Dist: all; extra == "include-optional-dependencies"
 Description-Content-Type: text/markdown
 
 <p align="center">
@@ -55,12 +55,15 @@ Description-Content-Type: text/markdown
 <a href="https://github.com/python/mypy" target="_blank">
     <img src="https://img.shields.io/badge/mypy-100%25-brightgreen.svg" alt="Mypy Coverage">
 </a>
-<a href="https://github.com/PyCQA/bandit" target="_blank">
-    <img src="https://img.shields.io/badge/security-bandit-orange.svg" alt="security: bandit">
-</a>
 <a href="https://github.com/astral-sh/ruff" target="_blank">
     <img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json" alt="Ruff">
 </a>
+<a href="https://pdm-project.org/en/latest/" target="_blank">
+    <img src="https://img.shields.io/badge/pdm-managed-blueviolet" alt="pdm-managed">
+</a>
+<a href="https://github.com/PyCQA/bandit" target="_blank">
+    <img src="https://img.shields.io/badge/security-bandit-orange.svg" alt="security: bandit">
+</a>
 </p>
 
 ---
@@ -71,7 +74,7 @@ Description-Content-Type: text/markdown
 
 ## Requirements
 
-Python 3.10+
+Python 3.9+
 
 ## Installation
 

{fast_dev_cli-0.11.2 → fast_dev_cli-0.11.4}/README.md

@@ -20,12 +20,15 @@
 <a href="https://github.com/python/mypy" target="_blank">
     <img src="https://img.shields.io/badge/mypy-100%25-brightgreen.svg" alt="Mypy Coverage">
 </a>
-<a href="https://github.com/PyCQA/bandit" target="_blank">
-    <img src="https://img.shields.io/badge/security-bandit-orange.svg" alt="security: bandit">
-</a>
 <a href="https://github.com/astral-sh/ruff" target="_blank">
     <img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json" alt="Ruff">
 </a>
+<a href="https://pdm-project.org/en/latest/" target="_blank">
+    <img src="https://img.shields.io/badge/pdm-managed-blueviolet" alt="pdm-managed">
+</a>
+<a href="https://github.com/PyCQA/bandit" target="_blank">
+    <img src="https://img.shields.io/badge/security-bandit-orange.svg" alt="security: bandit">
+</a>
 </p>
 
 ---
@@ -36,7 +39,7 @@
 
 ## Requirements
 
-Python 3.10+
+Python 3.9+
 
 ## Installation
 

fast_dev_cli-0.11.4/fast_dev_cli/__init__.py

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

{fast_dev_cli-0.11.2 → fast_dev_cli-0.11.4}/fast_dev_cli/cli.py

@@ -8,12 +8,12 @@ import subprocess  # nosec:B404
 import sys
 from functools import cached_property
 from pathlib import Path
-from typing import Literal, Optional, Type, TypeAlias, get_args
+from typing import Literal, Optional, Type, get_args
 
 import emoji
 import typer
 from typer import Exit, Option, echo, secho
-from typer.models import OptionInfo
+from typer.models import ArgumentInfo, OptionInfo
 
 try:
     from . import __version__
@@ -22,16 +22,16 @@ except ImportError:  # pragma: no cover
 
     __version__ = _import(Path(__file__).parent.name).__version__
 
-if sys.version_info >= (3, 11):
+if sys.version_info >= (3, 11):  # pragma: no cover
     from enum import StrEnum
-    from typing import Annotated, Self
+    from typing import Self
 
     import tomllib
 else:  # pragma: no cover
     from enum import Enum
 
     import tomli as tomllib
-    from typing_extensions import Annotated, Self
+    from typing_extensions import Self
 
     class StrEnum(str, Enum):
         __str__ = str.__str__
@@ -39,7 +39,7 @@ else:  # pragma: no cover
 
 cli = typer.Typer()
 TOML_FILE = "pyproject.toml"
-ToolName: TypeAlias = Literal["poetry", "pdm", "uv", ""]
+ToolName = Literal["poetry", "pdm", "uv", ""]
 
 
 def load_bool(name: str, default=False) -> bool:
@@ -213,16 +213,28 @@ class BumpUp(DryRun):
     @staticmethod
     def parse_filename() -> str:
         toml_text = Project.load_toml_text()
-        if not Project.manage_by_poetry():
-            # version = { source = "file", path = "fast_dev_cli/cli.py" }
-            for line in toml_text.splitlines():
-                if not line.startswith("version = "):
-                    continue
-                return line.split('path = "', 1)[-1].split('"')[0]
         context = tomllib.loads(toml_text)
+        try:
+            ver = context["project"]["version"]
+        except KeyError:
+            pass
+        else:
+            if isinstance(ver, str) and re.match(r"\d+\.\d+\.\d+", ver):
+                return TOML_FILE
         try:
             version_value = context["tool"]["poetry"]["version"]
         except KeyError:
+            if not Project.manage_by_poetry():
+                # version = { source = "file", path = "fast_dev_cli/__init__.py" }
+                v_key = "version = "
+                p_key = 'path = "'
+                for line in toml_text.splitlines():
+                    if not line.startswith(v_key):
+                        continue
+                    if p_key in (value := line.split(v_key, 1)[-1].split("#")[0]):
+                        filename = value.split(p_key, 1)[-1].split('"')[0]
+                        if Project.get_work_dir().joinpath(filename).exists():
+                            return filename
             return TOML_FILE
         if version_value in ("0", "0.0.0"):
             try:
@@ -714,13 +726,13 @@ def check(files=None, dry=False, bandit=False, skip_mypy=False) -> None:
 
 @cli.command(name="lint")
 def make_style(
-    files: Annotated[Optional[list[Path]], typer.Argument()] = None,
+    files: Optional[list[Path]] = typer.Argument(default=None),  # noqa:B008
     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"""
-    if files is None:
+    if getattr(files, "default", files) is None:
         files = [Path(".")]
     elif isinstance(files, str):
         files = [files]
@@ -767,7 +779,7 @@ class Sync(DryRun):
                 ensurepip = ""
                 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"):
                 ensurepip = ""
@@ -851,14 +863,14 @@ def upload(
 def dev(
     port: int | None | OptionInfo,
     host: str | None | OptionInfo,
-    file: Optional[str] = None,
+    file: str | None | ArgumentInfo = None,
     dry=False,
 ) -> None:
     cmd = "fastapi dev"
     no_port_yet = True
     if file is not None:
         try:
-            port = int(file)  # type:ignore[arg-type]
+            port = int(str(file))  # type:ignore[arg-type]
         except ValueError:
             cmd += f" {file}"
         else:
@@ -877,13 +889,13 @@ def dev(
 
 @cli.command(name="dev")
 def runserver(
-    file_or_port: Annotated[Optional[str], typer.Argument()] = None,
+    file_or_port: Optional[str] = typer.Argument(default=None),
     port: Optional[int] = Option(None, "-p", "--port"),
     host: Optional[str] = Option(None, "-h", "--host"),
     dry: bool = Option(False, "--dry", help="Only print, not really run shell command"),
 ) -> None:
     """Start a fastapi server(only for fastapi>=0.111.0)"""
-    if file_or_port:
+    if getattr(file_or_port, "default", file_or_port):
         dev(port, host, file=file_or_port, dry=dry)
     else:
         dev(port, host, dry=dry)

{fast_dev_cli-0.11.2 → fast_dev_cli-0.11.4}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
     { name = "Waket Zheng", email = "waketzheng@gmail.com>" },
 ]
 readme = "README.md"
-requires-python = ">=3.10,<4"
+requires-python = ">=3.9,<4"
 classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
@@ -20,6 +20,7 @@ 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",
@@ -31,7 +32,7 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
 ]
 dependencies = [
-    "typer>=0.12.3,<0.13",
+    "typer>=0.12.3,<0.14",
     "emoji >=2.12.1,<3",
     "tomli>=2.0.1,<3; python_version < '3.11'",
     "coverage >=7.5.1,<8",
@@ -40,15 +41,14 @@ dependencies = [
     "bumpversion2 >=1.4.3,<2",
     "pytest >=8.2.0,<9",
 ]
-version = "0.11.2"
+version = "0.11.4"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"
 
 [project.optional-dependencies]
-all = [
-    "ipython >=8.24.0,<9",
-    "pytest-mock >=3.14.0,<4",
+include-optional-dependencies = [
+    "all",
 ]
 
 [project.scripts]
@@ -83,9 +83,8 @@ include-optional-dependencies = [
 ]
 
 [tool.waketzheng._internal-slim-build.packages.fast-dev-cli.project.optional-dependencies]
-all = [
-    "ipython >=8.24.0,<9",
-    "pytest-mock >=3.14.0,<4",
+include-optional-dependencies = [
+    "all",
 ]
 
 [tool.waketzheng._internal-slim-build.packages.fast-dev-cli.project.scripts]
@@ -122,6 +121,7 @@ omit = [
 
 [tool.mypy]
 pretty = true
+python_version = "3.9"
 ignore_missing_imports = true
 check_untyped_defs = true
 exclude = [

{fast_dev_cli-0.11.2 → fast_dev_cli-0.11.4}/tests/test_bump.py

@@ -1,3 +1,4 @@
+import os
 import subprocess
 from contextlib import redirect_stdout
 from io import StringIO
@@ -168,3 +169,15 @@ def test_bump_with_emoji(mocker, tmp_path, monkeypatch):
             out = capture_cmd_output(["git", "log"])
     new_commit = "⬆️  Bump version: 0.1.0 → 0.1.1"
     assert new_commit in out
+
+
+def test_bump_with_uv(tmp_path):
+    project_dir = tmp_path / "helloworld"
+    project_dir.mkdir()
+    with chdir(project_dir):
+        subprocess.run(["uv", "init"])
+        command = BumpUp(part="patch", commit=False).gen()
+        assert "pyproject.toml" in command
+        Path(TOML_FILE).write_text("[project]" + os.linesep + 'version = "0.1.0"')
+        command = BumpUp(part="patch", commit=True).gen()
+        assert TOML_FILE in command

{fast_dev_cli-0.11.2 → fast_dev_cli-0.11.4}/tests/test_lint.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import shutil
 from pathlib import Path
 

{fast_dev_cli-0.11.2 → fast_dev_cli-0.11.4}/tests/test_runserver.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import fast_dev_cli
 from fast_dev_cli.cli import dev, main, run_and_echo, runserver
 

{fast_dev_cli-0.11.2 → fast_dev_cli-0.11.4}/tests/test_sync.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from pathlib import Path
 
 import pytest

{fast_dev_cli-0.11.2 → fast_dev_cli-0.11.4}/tests/test_upgrade.py

@@ -1,3 +1,7 @@
+from __future__ import annotations
+
+import re
+import sys
 from contextlib import redirect_stdout
 from io import StringIO
 from pathlib import Path
@@ -9,7 +13,7 @@ from fast_dev_cli.cli import (
     upgrade,
 )
 
-from .utils import chdir, is_newer_version_python
+from .utils import chdir
 
 
 def test_parse_value():
@@ -80,12 +84,12 @@ def test_dev_flag(tmp_path: Path):
         project = tmp_path / "project"
         run_and_echo(f"poetry new {project.name}")
         with chdir(project):
-            if not is_newer_version_python:
+            if sys.version_info < (3, 13):
                 p = Path("pyproject.toml")
                 content = p.read_text()
-                s = 'python = "^3.11"'
-                ss = s.replace("3.11", "3.10")
-                p.write_text(content.replace(s, ss))
+                pattern = r'(python = "\^3)\.\d+"'
+                new_content = re.sub(pattern, r'\1.9"', content)
+                p.write_text(new_content)
             assert not UpgradeDependencies.should_with_dev()
             run_and_echo("poetry add pytest")
             assert not UpgradeDependencies.should_with_dev()

{fast_dev_cli-0.11.2 → fast_dev_cli-0.11.4}/tests/utils.py

@@ -4,7 +4,7 @@ from contextlib import contextmanager, redirect_stdout
 from io import StringIO
 from pathlib import Path
 
-if is_newer_version_python := sys.version_info >= (3, 11):
+if sys.version_info >= (3, 11):
     from contextlib import chdir  # type:ignore[attr-defined]
 else:
     from contextlib import AbstractContextManager
@@ -29,7 +29,6 @@ __all__ = (
     "mock_sys_argv",
     "capture_stdout",
     "temp_file",
-    "is_newer_version_python",
 )
 
 

fast_dev_cli-0.11.2/fast_dev_cli/__init__.py

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