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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.11.1
+Version: 0.11.3
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta
@@ -26,7 +26,7 @@ Requires-Dist: tomli<3,>=2.0.1; python_version < "3.11"
 Requires-Dist: coverage<8,>=7.5.1
 Requires-Dist: ruff<0.8,>=0.4.4
 Requires-Dist: mypy<2,>=1.10.0
-Requires-Dist: bumpversion2<2,>=1.4.2
+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"
@@ -41,10 +41,10 @@ Description-Content-Type: text/markdown
 </p>
 <p align="center">
 <a href="https://pypi.org/project/fast-dev-cli" target="_blank">
-    <img src="https://img.shields.io/pypi/v/fast-dev-cli?color=%2334D058&label=pypi%20package" alt="Package version">
+    <img src="https://img.shields.io/pypi/pyversions/fast-dev-cli.svg" alt="Supported Python versions">
 </a>
 <a href="https://pypi.org/project/fast-dev-cli" target="_blank">
-    <img src="https://img.shields.io/pypi/pyversions/fast-dev-cli.svg" alt="Supported Python versions">
+    <img src="https://img.shields.io/pypi/v/fast-dev-cli?color=%2334D058&label=pypi%20package" alt="Package version">
 </a>
 <a href="https://github.com/waketzheng/fast-dev-cli/actions?query=workflow:ci" target="_blank">
     <img src="https://github.com/waketzheng/fast-dev-cli/workflows/ci/badge.svg" alt="GithubActionResult">
@@ -52,14 +52,14 @@ Description-Content-Type: text/markdown
 <a href="https://coveralls.io/github/waketzheng/fast-dev-cli?branch=main" target="_blank">
     <img src="https://coveralls.io/repos/github/waketzheng/fast-dev-cli/badge.svg?branch=main" alt="Coverage Status">
 </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://github.com/python/mypy" target="_blank">
-    <img src="https://img.shields.io/badge/mypy-100%25-green.svg" alt="Mypy Coverage">
+    <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-yellow.svg" alt="security: bandit">
+    <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>
 </p>
 
@@ -88,7 +88,7 @@ pip install fast-dev-cli
 
 - Lint py code:
 ```bash
-fast lint /path/to/file-or-directory
+fast lint [/path/to/file-or-directory]
 ```
 - Check only
 ```bash

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

@@ -6,10 +6,10 @@
 </p>
 <p align="center">
 <a href="https://pypi.org/project/fast-dev-cli" target="_blank">
-    <img src="https://img.shields.io/pypi/v/fast-dev-cli?color=%2334D058&label=pypi%20package" alt="Package version">
+    <img src="https://img.shields.io/pypi/pyversions/fast-dev-cli.svg" alt="Supported Python versions">
 </a>
 <a href="https://pypi.org/project/fast-dev-cli" target="_blank">
-    <img src="https://img.shields.io/pypi/pyversions/fast-dev-cli.svg" alt="Supported Python versions">
+    <img src="https://img.shields.io/pypi/v/fast-dev-cli?color=%2334D058&label=pypi%20package" alt="Package version">
 </a>
 <a href="https://github.com/waketzheng/fast-dev-cli/actions?query=workflow:ci" target="_blank">
     <img src="https://github.com/waketzheng/fast-dev-cli/workflows/ci/badge.svg" alt="GithubActionResult">
@@ -17,14 +17,14 @@
 <a href="https://coveralls.io/github/waketzheng/fast-dev-cli?branch=main" target="_blank">
     <img src="https://coveralls.io/repos/github/waketzheng/fast-dev-cli/badge.svg?branch=main" alt="Coverage Status">
 </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://github.com/python/mypy" target="_blank">
-    <img src="https://img.shields.io/badge/mypy-100%25-green.svg" alt="Mypy Coverage">
+    <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-yellow.svg" alt="security: bandit">
+    <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>
 </p>
 
@@ -53,7 +53,7 @@ pip install fast-dev-cli
 
 - Lint py code:
 ```bash
-fast lint /path/to/file-or-directory
+fast lint [/path/to/file-or-directory]
 ```
 - Check only
 ```bash

fast_dev_cli-0.11.3/fast_dev_cli/__init__.py

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

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

@@ -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:

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

@@ -37,10 +37,10 @@ dependencies = [
     "coverage >=7.5.1,<8",
     "ruff >=0.4.4,<0.8",
     "mypy >=1.10.0,<2",
-    "bumpversion2 >=1.4.2,<2",
+    "bumpversion2 >=1.4.3,<2",
     "pytest >=8.2.0,<9",
 ]
-version = "0.11.1"
+version = "0.11.3"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"

fast_dev_cli-0.11.3/scripts/check.py

@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+# -*- coding:utf-8 -*-
+import os
+import sys
+
+TOOL = ("pdm", "poetry", "uv")[0]
+parent = os.path.abspath(os.path.dirname(__file__))
+work_dir = os.path.dirname(parent)
+if os.getcwd() != work_dir:
+    os.chdir(work_dir)
+
+
+def run_and_echo(cmd, tool=TOOL, verbose=True):
+    # type: (str, str, bool) -> int
+    if tool:
+        cmd = tool + " run " + cmd
+    if verbose:
+        print("--> " + cmd)
+    return os.system(cmd)
+
+
+if run_and_echo("fast check", verbose=False) != 0:
+    print("\033[1m Please run './scripts/format.py' to auto-fix style issues \033[0m")
+    sys.exit(1)
+
+package_name = os.path.basename(work_dir).replace("-", "_").replace(" ", "_")
+if run_and_echo("bandit -r {}".format(package_name)) != 0:
+    sys.exit(1)
+print("Done. ✨ 🍰 ✨")

fast_dev_cli-0.11.3/scripts/format.py

@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+# -*- coding:utf-8 -*-
+import os
+import sys
+
+parent = os.path.abspath(os.path.dirname(__file__))
+work_dir = os.path.dirname(parent)
+if os.getcwd() != work_dir:
+    os.chdir(work_dir)
+
+cmd = "pdm run fast lint --skip-mypy"
+if os.system(cmd) != 0:
+    sys.exit(1)

{fast_dev_cli-0.11.1 → fast_dev_cli-0.11.3}/tests/test_bump.py

@@ -1,3 +1,4 @@
+import os
 import subprocess
 from contextlib import redirect_stdout
 from io import StringIO
@@ -166,5 +167,17 @@ def test_bump_with_emoji(mocker, tmp_path, monkeypatch):
             subprocess.run(["poetry", "run", "pip", "install", "bumpversion2"])
             subprocess.run(["fast", "bump", "patch", "--commit"])
             out = capture_cmd_output(["git", "log"])
-    new_commit = "⬆️ Bump version: 0.1.0 → 0.1.1"
+    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.1/fast_dev_cli/__init__.py

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

fast_dev_cli-0.11.1/scripts/check.py

@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-# -*- coding:utf-8 -*-
-import os
-import sys
-
-parent = os.path.abspath(os.path.dirname(__file__))
-work_dir = os.path.dirname(parent)
-if os.getcwd() != work_dir:
-    os.chdir(work_dir)
-
-if os.system("pdm run fast check") != 0:
-    print("\033[1m Please run './scripts/format.py' to auto-fix style issues \033[0m")
-    sys.exit(1)
-
-package_name = os.path.basename(work_dir).replace("-", "_")
-cmd = "pdm run bandit -r {}".format(package_name)
-print("-->", cmd)
-if os.system(cmd) != 0:
-    sys.exit(1)
-print("Done. ✨ 🍰 ✨")

fast_dev_cli-0.11.1/scripts/format.py

@@ -1,15 +0,0 @@
-#!/usr/bin/env python
-# -*- coding:utf-8 -*-
-import os
-import shlex
-import subprocess
-import sys
-from pathlib import Path
-
-work_dir = Path(__file__).parent.resolve().parent
-if Path.cwd() != work_dir:
-    os.chdir(str(work_dir))
-
-cmd = "pdm run fast lint"
-r = subprocess.run(shlex.split(cmd), env=dict(os.environ, SKIP_MYPY="1"))
-sys.exit(None if r.returncode == 0 else 1)