fast-dev-cli 0.16.0__tar.gz → 0.16.2__tar.gz

{fast_dev_cli-0.16.0 → fast_dev_cli-0.16.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.16.0
+Version: 0.16.2
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta

fast_dev_cli-0.16.2/fast_dev_cli/__init__.py

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

{fast_dev_cli-0.16.0 → fast_dev_cli-0.16.2}/fast_dev_cli/cli.py

@@ -190,9 +190,13 @@ def get_current_version(
             work_dir = Project.get_work_dir()
             package_name = re.sub(r"[- ]", "_", work_dir.name)
         try:
-            return importlib_metadata.version(package_name)
+            installed_version = importlib_metadata.version(package_name)
         except importlib_metadata.PackageNotFoundError:
-            return read_version_from_file(package_name, work_dir)
+            ...
+        else:
+            if installed_version != "0.0.0":
+                return installed_version
+        return read_version_from_file(package_name, work_dir)
 
     cmd = ["poetry", "version", "-s"]
     if verbose:
@@ -409,6 +413,8 @@ class BumpUp(DryRun):
                 cmd += " && git push && git push --tags && git log -1"
         else:
             cmd += " --allow-dirty"
+        if Project.is_pdm_project():
+            cmd = "pdm sync --prod && " + cmd
         return cmd
 
     def run(self: Self) -> None:
@@ -524,6 +530,15 @@ class Project:
             root = venv_parent
         return root
 
+    @classmethod
+    def is_pdm_project(cls, strict: bool = True) -> bool:
+        if cls.get_manage_tool() != "pdm":
+            return False
+        if strict:
+            lock_file = cls.get_work_dir() / "pdm.lock"
+            return lock_file.exists()
+        return True
+
 
 class ParseError(Exception):
     """Raise this if parse dependence line error"""
@@ -700,9 +715,9 @@ class UpgradeDependencies(Project, DryRun):
 
     def gen(self: Self) -> str:
         if self._tool == "uv":
-            return "uv lock --upgrade --verbose && uv sync --frozen"
+            return "uv lock --upgrade --verbose && uv sync --frozen --all-groups"
         elif self._tool == "pdm":
-            return "pdm update --verbose && pdm install"
+            return "pdm update --verbose && pdm sync -G :all"
         return self.gen_cmd() + " && poetry lock && poetry update"
 
 
@@ -741,6 +756,8 @@ class GitTag(DryRun):
         cmd = f"git tag -a {_version} -m {self.message!r} && git push --tags"
         if self.should_push():
             cmd += " && git push"
+        if Project.is_pdm_project():
+            cmd = "pdm sync --prod && " + cmd
         return cmd
 
     @cached_property

{fast_dev_cli-0.16.0 → fast_dev_cli-0.16.2}/pyproject.toml

@@ -42,7 +42,7 @@ dependencies = [
     "bumpversion2 >=1.4.3,<2",
     "pytest >=8.2.0,<9",
 ]
-version = "0.16.0"
+version = "0.16.2"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"
@@ -55,6 +55,11 @@ include-optional-dependencies = [
 [project.scripts]
 fast = "fast_dev_cli:cli.main"
 
+[dependency-groups]
+dev = [
+    "twine>=6.1.0",
+]
+
 [tool.pdm]
 distribution = true
 
@@ -72,6 +77,46 @@ dev = [
     "-e file:///${PROJECT_ROOT}/#egg=fast-dev-cli[all]",
 ]
 
+[tool.pdm.scripts]
+test = "pdm run fast test"
+check = "pdm run fast check {args}"
+lint = "pdm run fast lint {args}"
+deps = "pdm sync -G :all {args}"
+prod = "pdm install --prod --frozen"
+tree = "pdm list --tree"
+update_self_version = "pdm sync"
+
+[tool.pdm.scripts.style]
+composite = [
+    "ruff format",
+    "ruff check --fix {args}",
+]
+
+[tool.pdm.scripts.bump]
+composite = [
+    "update_self_version",
+    "pdm run fast bump patch --commit {args}",
+]
+
+[tool.pdm.scripts.tag]
+composite = [
+    "update_self_version",
+    "pdm run fast tag {args}",
+]
+
+[tool.pdm.scripts.start]
+composite = [
+    "pre-commit install",
+    "deps",
+]
+
+[tool.pdm.scripts.ci]
+composite = [
+    "deps",
+    "check",
+    "test",
+]
+
 [tool.waketzheng._internal-slim-build.packages.fastdevcli-slim.project]
 name = "fastdevcli-slim"
 
@@ -155,6 +200,7 @@ extend-select = [
 ]
 "fast_dev_cli/cli.py" = [
     "UP007",
+    "UP045",
 ]
 
 [tool.bandit]
@@ -164,11 +210,3 @@ exclude_dirs = [
     "examples",
     ".venv",
 ]
-
-[dependency-groups]
-ci = [
-    "coveralls @ git+https://github.com/waketzheng/coveralls-python@4.1.1",
-]
-dev = [
-    "twine>=6.1.0",
-]

{fast_dev_cli-0.16.0 → fast_dev_cli-0.16.2}/tests/test_bump.py

@@ -39,12 +39,14 @@ def test_enum():
 
 
 def _bump_commands(
-    version: str, filename=TOML_FILE, emoji=False
+    version: str, filename=TOML_FILE, emoji=False, add_sync=True
 ) -> tuple[str, str, str]:
     cmd = rf'bumpversion --parse "(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)" --current-version="{version}"'
     suffix = " --commit && git push && git push --tags && git log -1"
     if emoji:
         suffix = suffix.replace("--commit", "--commit --message-emoji=1")
+    if add_sync:
+        cmd = "pdm sync --prod && " + cmd
     patch_without_commit = cmd + f" patch {filename} --allow-dirty"
     patch_with_commit = cmd + f" patch {filename}" + suffix
     minor_with_commit = cmd + f" minor {filename} --tag" + suffix
@@ -99,7 +101,9 @@ def test_bump(
 def test_bump_with_poetry(mocker, tmp_poetry_project, tmp_path):
     mocker.patch("builtins.input", return_value=" ")
     version = get_current_version()
-    patch_without_commit, patch_with_commit, minor_with_commit = _bump_commands(version)
+    patch_without_commit, patch_with_commit, minor_with_commit = _bump_commands(
+        version, add_sync=False
+    )
     stream = StringIO()
     with redirect_stdout(stream):
         BumpUp(part="patch", commit=False).run()
@@ -167,7 +171,7 @@ def test_bump_with_emoji(mocker, tmp_path, monkeypatch):
 def test_bump_with_emoji_in_poetry_project(mocker, tmp_path, monkeypatch):
     # real bump
     last_commit = "📝 Update release notes"
-    _, patch_with_commit, __ = _bump_commands("0.1.0", emoji=True)
+    _, patch_with_commit, __ = _bump_commands("0.1.0", emoji=True, add_sync=False)
     with prepare_poetry_project(tmp_path):
         subprocess.run(["git", "init"])
         subprocess.run(["git", "add", "."])
@@ -365,3 +369,39 @@ 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_installed_version_is_0_0_0(tmp_work_dir):
+    project_name = "my-project"
+    package_name = "app"
+    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 = "my-project"
+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 = "app/__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()

{fast_dev_cli-0.16.0 → fast_dev_cli-0.16.2}/tests/test_tag.py

@@ -52,12 +52,14 @@ def test_with_push(mocker):
     mocker.patch.object(git_tag, "git_status", return_value="git push")
     version = get_current_version()
     prefix = "v" if "v" in capture_cmd_output(["git", "tag"]) else ""
-    assert git_tag.gen() == f"git tag -a {prefix}{version} -m '' && git push --tags"
+    sync = "pdm sync --prod"
+    push = "git push --tags"
+    assert git_tag.gen() == f"{sync} && git tag -a {prefix}{version} -m '' && {push}"
     with _clear_tags():
         git_tag_cmd = git_tag.gen()
-    assert git_tag_cmd == f"git tag -a {version} -m '' && git push --tags"
+    assert git_tag_cmd == f"{sync} && git tag -a {version} -m '' && {push}"
     mocker.patch.object(git_tag, "has_v_prefix", return_value=True)
-    tag_cmd = f"git tag -a v{version} -m '' && git push --tags"
+    tag_cmd = f"{sync} && git tag -a v{version} -m '' && {push}"
     assert git_tag.gen() == tag_cmd
     mocker.patch.object(git_tag, "should_push", return_value=True)
     assert git_tag.gen() == tag_cmd + " && git push"

{fast_dev_cli-0.16.0 → fast_dev_cli-0.16.2}/tests/test_upgrade.py

@@ -292,7 +292,7 @@ fastapi = "^0.112.2"
 
 def test_upgrade_uv_project():
     cmd = "fast upgrade --tool=uv --dry"
-    expected = "uv lock --upgrade --verbose && uv sync --frozen"
+    expected = "uv lock --upgrade --verbose && uv sync --frozen --all-groups"
     assert expected in capture_cmd_output(cmd)
     assert expected in capture_cmd_output("pdm run " + cmd)
     assert UpgradeDependencies(tool="uv").gen() == expected
@@ -300,7 +300,7 @@ def test_upgrade_uv_project():
 
 def test_upgrade_pdm_project():
     cmd = "fast upgrade --tool=pdm --dry"
-    expected = "pdm update --verbose && pdm install"
+    expected = "pdm update --verbose && pdm sync -G :all"
     assert expected in capture_cmd_output(cmd)
     assert expected in capture_cmd_output("pdm run " + cmd)
     assert UpgradeDependencies(tool="pdm").gen() == expected

fast_dev_cli-0.16.0/fast_dev_cli/__init__.py

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