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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.15.0
+Version: 0.15.1
 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.1/fast_dev_cli/__init__.py

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

{fast_dev_cli-0.15.0 → fast_dev_cli-0.15.1}/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,
@@ -127,10 +128,10 @@ def read_version_from_file(
     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:
+            lib_version = _parse_version(line, pattern)
+            if lib_version.startswith("{") or lib_version in invalid:
                 break
-            return version
+            return lib_version
     if work_dir is None:
         work_dir = Project.get_work_dir()
     package_dir = work_dir / package_name
@@ -276,6 +277,16 @@ class BumpUp(DryRun):
                 version_value = context["tool"]["poetry"]["version"]
             except KeyError:
                 if not Project.manage_by_poetry():
+                    for tool in ("pdm", "hatch"):
+                        with contextlib.suppress(KeyError):
+                            version_path = context["tool"][tool]["version"]["path"]
+                            if (
+                                Path(version_path).exists()
+                                or Project.get_work_dir()
+                                .joinpath(version_path)
+                                .exists()
+                            ):
+                                return version_path
                     # version = { source = "file", path = "fast_dev_cli/__init__.py" }
                     v_key = "version = "
                     p_key = 'path = "'
@@ -923,23 +934,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.1}/pyproject.toml

@@ -34,14 +34,14 @@ classifiers = [
 dependencies = [
     "typer>=0.12.3,<1",
     "emoji >=2.12.1,<3",
+    "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.1"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"

{fast_dev_cli-0.15.0 → fast_dev_cli-0.15.1}/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.1}/tests/test_bump.py

@@ -230,3 +230,66 @@ 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()
+        Path("httpx/__version__.py").write_text("""
+__title__ = "httpx"
+__description__ = "A next generation HTTP client, for Python 3."
+__version__ = "0.28.1"
+        """)

fast_dev_cli-0.15.0/fast_dev_cli/__init__.py

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