fast-dev-cli 0.15.0__tar.gz → 0.15.2__tar.gz

{fast_dev_cli-0.15.0 → fast_dev_cli-0.15.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.15.0
+Version: 0.15.2
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta
@@ -23,12 +23,12 @@ Project-URL: Homepage, https://github.com/waketzheng/fast-dev-cli
 Requires-Python: >=3.9
 Requires-Dist: typer<1,>=0.12.3
 Requires-Dist: emoji<3,>=2.12.1
+Requires-Dist: packaging>=20.5
 Requires-Dist: tomli<3,>=2.0.1; python_version < "3.11"
 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: packaging>=20.5
 Provides-Extra: include-optional-dependencies
 Requires-Dist: all; extra == "include-optional-dependencies"
 Description-Content-Type: text/markdown

fast_dev_cli-0.15.2/fast_dev_cli/__init__.py

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

{fast_dev_cli-0.15.0 → fast_dev_cli-0.15.2}/fast_dev_cli/cli.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import contextlib
 import importlib.metadata as importlib_metadata
 import os
 import re
@@ -11,7 +12,7 @@ from pathlib import Path
 from typing import (
     Any,
     Literal,
-    # Optional is required by typers
+    # Optional is required by Option generated by typer
     Optional,
     cast,
     get_args,
@@ -121,16 +122,27 @@ def _parse_version(line: str, pattern: re.Pattern[str]) -> str:
 def read_version_from_file(
     package_name: str, work_dir: Path | None = 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 not package_name and toml_text:
+        pattern = re.compile(r"version\s*=")
+        for line in toml_text.splitlines():
+            if pattern.match(line):
+                return _parse_version(line, pattern)
+    version_file = BumpUp.parse_filename(toml_text, work_dir, package_name)
+    if version_file == TOML_FILE:
+        if toml_text is None:
+            toml_text = Project.load_toml_text()
+        context = tomllib.loads(toml_text)
+        with contextlib.suppress(KeyError):
+            return context["project"]["version"]
+        with contextlib.suppress(KeyError):  # Poetry V1
+            return context["tool"]["poetry"]["version"]
+        secho(f"WARNING: can not find 'version' item in {version_file}!")
+        return "0.0.0"
+    pattern = re.compile(r"__version__\s*=")
+    for line in Path(version_file).read_text("utf-8").splitlines():
         if pattern.match(line):
-            version = _parse_version(line, pattern)
-            if version.startswith("{") or version in invalid:
-                break
-            return version
+            return _parse_version(line, pattern)
+    # TODO: remove or refactor the following lines.
     if work_dir is None:
         work_dir = Project.get_work_dir()
     package_dir = work_dir / package_name
@@ -141,6 +153,7 @@ def read_version_from_file(
     ):
         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("utf-8").splitlines():
         if pattern.match(line):
@@ -257,8 +270,13 @@ class BumpUp(DryRun):
             return emoji.is_emoji(first_char)
 
     @staticmethod
-    def parse_filename() -> str:
-        toml_text = Project.load_toml_text()
+    def parse_filename(
+        toml_text: str | None = None,
+        work_dir: Path | None = None,
+        package_name: str | None = None,
+    ) -> str:
+        if toml_text is None:
+            toml_text = Project.load_toml_text()
         context = tomllib.loads(toml_text)
         by_version_plugin = False
         try:
@@ -276,6 +294,16 @@ class BumpUp(DryRun):
                 version_value = context["tool"]["poetry"]["version"]
             except KeyError:
                 if not Project.manage_by_poetry():
+                    if work_dir is None:
+                        work_dir = Project.get_work_dir()
+                    for tool in ("pdm", "hatch"):
+                        with contextlib.suppress(KeyError):
+                            version_path = context["tool"][tool]["version"]["path"]
+                            if (
+                                Path(version_path).exists()
+                                or work_dir.joinpath(version_path).exists()
+                            ):
+                                return version_path
                     # version = { source = "file", path = "fast_dev_cli/__init__.py" }
                     v_key = "version = "
                     p_key = 'path = "'
@@ -284,7 +312,7 @@ class BumpUp(DryRun):
                             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():
+                            if work_dir.joinpath(filename).exists():
                                 return filename
             else:
                 by_version_plugin = version_value in ("0", "0.0.0", "init")
@@ -308,6 +336,8 @@ class BumpUp(DryRun):
             cwd = Path.cwd()
             pattern = re.compile(r"__version__\s*=\s*['\"]")
             ds: list[Path] = []
+            if package_name is not None:
+                packages.insert(0, (package_name, ""))
             for package_name, source_dir in packages:
                 ds.append(cwd / package_name)
                 ds.append(cwd / "src" / package_name)
@@ -317,7 +347,12 @@ class BumpUp(DryRun):
             ds.extend([cwd / module_name, cwd / "src" / module_name, cwd])
             for d in ds:
                 init_file = d / "__init__.py"
-                if init_file.exists() and pattern.search(init_file.read_text("utf8")):
+                if (
+                    init_file.exists() and pattern.search(init_file.read_text("utf8"))
+                ) or (
+                    (init_file := init_file.with_name("__version__.py")).exists()
+                    and pattern.search(init_file.read_text("utf8"))
+                ):
                     break
             else:
                 raise ParseError("Version file not found! Where are you now?")
@@ -923,23 +958,22 @@ class Sync(DryRun):
                 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"):
+        ensure_pip = " {1}python -m ensurepip && {1}python -m pip install -U pip &&"
+        export_cmd = "uv export --no-hashes --all-extras --frozen"
+        if tool in ("poetry", "pdm"):
             export_cmd = f"{tool} export --without-hashes --with=dev"
             if tool == "poetry":
-                ensurepip = ""
+                ensure_pip = ""
                 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 = ""
+                ensure_pip = ""
+        elif check_call(prefix + "python -m pip --version"):
+            ensure_pip = ""
         install_cmd = (
-            f"{{2}} -o {{0}} &&{ensurepip} {{1}}python -m pip install -r {{0}}"
+            f"{{2}} -o {{0}} &&{ensure_pip} {{1}}python -m pip install -r {{0}}"
         )
         if should_remove and not save:
             install_cmd += " && rm -f {0}"

{fast_dev_cli-0.15.0 → fast_dev_cli-0.15.2}/pyproject.toml

@@ -32,16 +32,16 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
 ]
 dependencies = [
-    "typer>=0.12.3,<1",
+    "typer >=0.12.3,<1",
     "emoji >=2.12.1,<3",
-    "tomli>=2.0.1,<3; python_version < '3.11'",
+    "packaging >=20.5",
+    "tomli >=2.0.1,<3; python_version < '3.11'",
     "coverage >=7.5.1,<8",
     "mypy >=1.15.0,<2",
     "bumpversion2 >=1.4.3,<2",
     "pytest >=8.2.0,<9",
-    "packaging>=20.5",
 ]
-version = "0.15.0"
+version = "0.15.2"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"

{fast_dev_cli-0.15.0 → fast_dev_cli-0.15.2}/tests/conftest.py

@@ -51,7 +51,12 @@ build-backend = "poetry.core.masonry.api"
 
 
 @pytest.fixture
-def tmp_poetry_project(tmp_path: Path):
+def tmp_work_dir(tmp_path):
     with chdir(tmp_path):
-        tmp_path.joinpath(TOML_FILE).write_text(TOML_CONTENT)
-        yield
+        yield tmp_path
+
+
+@pytest.fixture
+def tmp_poetry_project(tmp_work_dir: Path):
+    Path(TOML_FILE).write_text(TOML_CONTENT)
+    yield tmp_work_dir

{fast_dev_cli-0.15.0 → fast_dev_cli-0.15.2}/tests/test_bump.py

@@ -230,3 +230,138 @@ version = "0"
         from_dir.mkdir()
         shutil.move(another_dir, from_dir)
         assert BumpUp.parse_filename() == "py/hello/__init__.py"
+
+
+PDM_DYNAMIC_VERSION = """
+[tool.pdm.version]
+source = "file"
+path = "app/__init__.py"
+"""
+
+
+def test_pdm_project(tmp_work_dir):
+    capture_cmd_output("pdm new my-project --non-interactive")
+    with chdir("my-project"):
+        toml_file = Path("pyproject.toml")
+        content = toml_file.read_text().replace(
+            'version = "0.1.0"', 'dynamic = ["version"]'
+        )
+        toml_file.write_text(content)
+        with toml_file.open("a+") as f:
+            f.write(PDM_DYNAMIC_VERSION)
+        app = Path("app")
+        app.mkdir()
+        init_file = app.joinpath("__init__.py")
+        init_file.write_text('__version__ = "0.2.0"')
+        out = capture_cmd_output("fast bump patch")
+        assert str(init_file) in out
+        assert "0.2.1" in init_file.read_text()
+
+
+def test_hatch_project(tmp_work_dir):
+    project_name = "httpx"
+    Path(project_name).mkdir()
+    with chdir(project_name):
+        toml_file = Path("pyproject.toml")
+        toml_file.write_text("""
+[build-system]
+requires = ["hatchling", "hatch-fancy-pypi-readme"]
+build-backend = "hatchling.build"
+
+[project]
+name = "httpx"
+description = "The next generation HTTP client."
+license = "BSD-3-Clause"
+requires-python = ">=3.8"
+authors = [
+    { name = "Tom Christie", email = "tom@tomchristie.com" },
+]
+dependencies = [
+    "certifi",
+    "httpcore==1.*",
+    "anyio",
+    "idna",
+]
+dynamic = ["readme", "version"]
+
+[tool.hatch.version]
+path = "httpx/__version__.py"
+        """)
+        Path(project_name).mkdir()
+        version_file = Path("httpx/__version__.py")
+        version_file.write_text("""
+__title__ = "httpx"
+__description__ = "A next generation HTTP client, for Python 3."
+__version__ = "0.28.1"
+        """)
+        out = capture_cmd_output("fast bump patch")
+        assert str(version_file) in out
+        assert "0.28.2" in version_file.read_text()
+
+
+def test_package_project_diff(tmp_work_dir):
+    project_name = "tortoise-database-url"
+    package_name = "database_url"
+    Path(project_name).mkdir()
+    with chdir(project_name):
+        Path(package_name).mkdir()
+        version_file = Path(package_name, "__init__.py")
+        version_file.write_text('__version__ = "0.3.0"')
+        toml_file = Path("pyproject.toml")
+        toml_file.write_text("""
+[project]
+name = "tortoise-database-url"
+description = "Make it easy to generate database url."
+authors = [{name="Waket Zheng", email="waketzheng@gmail.com"}]
+readme = "README.md"
+dynamic = ["version"]
+keywords = ["database_url", "tortoise-orm"]
+requires-python = ">=3.9"
+dependencies = []
+
+[tool.pdm.version]
+source = "file"
+path = "database_url/__init__.py"
+
+[build-system]
+requires = ["pdm-backend"]
+build-backend = "pdm.backend"
+        """)
+        out = capture_cmd_output("fast bump patch")
+        assert str(version_file) in out
+        assert "0.3.1" in version_file.read_text()
+
+
+def test_version_file_in_work_dir(tmp_work_dir):
+    project_name = package_name = "bigmodels"
+    Path(project_name).mkdir()
+    with chdir(project_name):
+        Path(package_name).mkdir()
+        version_file = Path("__version__.py")
+        version_file.write_text('__version__ = "0.3.0"')
+        toml_file = Path("pyproject.toml")
+        toml_file.write_text("""
+[project]
+name = "bigmodels"
+description = ""
+authors = [{name="Waket Zheng", email="waketzheng@gmail.com"}]
+readme = "README.md"
+dynamic = ["version"]
+keywords = []
+requires-python = ">=3.9"
+dependencies = []
+
+[tool.pdm]
+distribution = false
+
+[tool.pdm.version]
+source = "file"
+path = "__version__.py"
+
+[build-system]
+requires = ["pdm-backend"]
+build-backend = "pdm.backend"
+        """)
+        out = capture_cmd_output("fast bump patch")
+        assert str(version_file) in out
+        assert "0.3.1" in version_file.read_text()

fast_dev_cli-0.15.0/fast_dev_cli/__init__.py

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