fast-dev-cli 0.9.3__tar.gz → 0.9.5__tar.gz

{fast_dev_cli-0.9.3 → fast_dev_cli-0.9.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.9.3
+Version: 0.9.5
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta
@@ -23,7 +23,7 @@ Requires-Python: <4,>=3.10
 Requires-Dist: typer<0.13,>=0.12.3
 Requires-Dist: tomli<3,>=2.0.1; python_version < "3.11"
 Requires-Dist: coverage<8,>=7.5.1
-Requires-Dist: ruff<0.6,>=0.4.4
+Requires-Dist: ruff<0.7,>=0.4.4
 Requires-Dist: mypy<2,>=1.10.0
 Requires-Dist: bumpversion2<2,>=1.4.0
 Requires-Dist: pytest<9,>=8.2.0

fast_dev_cli-0.9.5/fast_dev_cli/__init__.py

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

{fast_dev_cli-0.9.3 → fast_dev_cli-0.9.5}/fast_dev_cli/cli.py

@@ -35,10 +35,6 @@ else:  # pragma: no cover
         __str__ = str.__str__
 
 
-def parse_files(args: list[str] | tuple[str, ...]) -> list[str]:
-    return [i for i in args if not i.startswith("-")]
-
-
 TOML_FILE = "pyproject.toml"
 cli = typer.Typer()
 
@@ -176,12 +172,13 @@ class BumpUp(DryRun):
             pattern = re.compile(r"__version__\s*=\s*['\"]")
             ds = [cwd / i for i in packages] + [cwd / cwd.name.replace("-", "_"), cwd]
             for d in ds:
-                if (init_file := d / "__init__.py").exists():
-                    if pattern.search(init_file.read_text()):
-                        break
+                if (init_file := d / "__init__.py").exists() and pattern.search(
+                    init_file.read_text()
+                ):
+                    break
             else:
                 raise ParseError("Version file not found! Where are you now?")
-            return init_file.relative_to(cwd).as_posix()
+            return os.path.relpath(init_file, cwd)
 
         return TOML_FILE
 
@@ -203,11 +200,9 @@ class BumpUp(DryRun):
         if self.part:
             part = self.get_part(self.part)
         else:
-            tip = "Which one?"
-            if a := input(tip).strip():
+            part = "patch"
+            if a := input("Which one?").strip():
                 part = self.get_part(a)
-            else:
-                part = "patch"
         self.part = part
         parse = r'--parse "(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)"'
         cmd = f'bumpversion {parse} --current-version="{_version}" {part} {filename}'
@@ -369,6 +364,9 @@ class UpgradeDependencies(Project, DryRun):
         if v == "*":
             echo(f"Skip wildcard line: {line}")
             return True
+        elif v == "[":
+            echo(f"Skip complex dependence: {line}")
+            return True
         elif v.startswith(">") or v.startswith("<") or v[0].isdigit():
             echo(f"Ignore bigger/smaller/equal: {line}")
             return True
@@ -380,13 +378,18 @@ class UpgradeDependencies(Project, DryRun):
     ) -> tuple[list[str], dict[str, list[str]]]:
         args: list[str] = []  # ['typer[all]', 'fastapi']
         specials: dict[str, list[str]] = {}  # {'--platform linux': ['gunicorn']}
-        for line in package_lines:
-            if not (m := line.strip()) or m.startswith("#"):
+        for no, line in enumerate(package_lines, 1):
+            if (
+                not (m := line.strip())
+                or m.startswith("#")
+                or m == "]"
+                or (m.startswith("{") and m.strip(",").endswith("}"))
+            ):
                 continue
             try:
                 package, version_info = m.split("=", 1)
             except ValueError as e:
-                raise ParseError(f"{m = }") from e
+                raise ParseError(f"Failed to separate by '='@line {no}: {m}") from e
             if (package := package.strip()).lower() == "python":
                 continue
             if cls.no_need_upgrade(version_info := version_info.strip(' "'), line):
@@ -553,7 +556,7 @@ class LintCode(DryRun):
     @classmethod
     def to_cmd(cls: Type[Self], paths=".", check_only=False) -> str:
         cmd = ""
-        tools = ["ruff format", "ruff check --extend-select=I --fix", "mypy"]
+        tools = ["ruff format", "ruff check --extend-select=I,B,SIM --fix", "mypy"]
         if check_only:
             tools[0] += " --check"
         if check_only or load_bool("NO_FIX"):
@@ -571,8 +574,8 @@ class LintCode(DryRun):
                 should_run_by_tool = True
                 if check_call("python -c 'import fast_dev_cli'"):
                     command = 'python -m pip install -U "fast_dev_cli"'
-                    tip = "You may need to run following command to install lint tools"
-                    secho(f"{tip}:\n\n  {command}\n", fg="yellow")
+                    tip = "You may need to run following command to install lint tools:"
+                    secho(f"{tip}\n\n  {command}\n", fg="yellow")
         else:
             should_run_by_tool = True
         if should_run_by_tool:
@@ -585,6 +588,10 @@ class LintCode(DryRun):
         return self.to_cmd(paths, self.check_only)
 
 
+def parse_files(args: list[str] | tuple[str, ...]) -> list[str]:
+    return [i for i in args if not i.startswith("-")]
+
+
 def lint(files=None, dry=False) -> None:
     if files is None:
         files = parse_files(sys.argv[1:])
@@ -668,7 +675,7 @@ def test(dry: bool, ignore_script=False) -> None:
     root = Project.get_work_dir(cwd=cwd, allow_cwd=True)
     test_script = root / "scripts" / "test.sh"
     if not _ensure_bool(ignore_script) and _should_run_test_script(test_script):
-        cmd = f"sh {test_script.relative_to(root)}"
+        cmd = f"sh {os.path.relpath(test_script, root)}"
         if cwd != root:
             cmd = f"cd {root} && " + cmd
     else:
@@ -713,7 +720,7 @@ def dev(
             cmd += f" {file}"
         else:
             if port != 8000:
-                cmd += f" --{port=}"
+                cmd += f" --port={port}"
                 no_port_yet = False
     if no_port_yet and (port := getattr(port, "default", port)) and str(port) != "8000":
         cmd += f" --port={port}"

{fast_dev_cli-0.9.3 → fast_dev_cli-0.9.5}/pdm_build.py

@@ -1,5 +1,5 @@
 import os
-from typing import Any, Dict, List
+from typing import Any
 
 from pdm.backend.hooks import Context
 
@@ -9,30 +9,30 @@ BUILD_PACKAGE = os.getenv("BUILD_PACKAGE", "fast-dev-cli")
 def pdm_build_initialize(context: Context) -> None:
     metadata = context.config.metadata
     # Get custom config for the current package, from the env var
-    config: Dict[str, Any] = context.config.data["tool"]["waketzheng"][
+    config: dict[str, Any] = context.config.data["tool"]["waketzheng"][
         "_internal-slim-build"
     ]["packages"][BUILD_PACKAGE]
-    project_config: Dict[str, Any] = config["project"]
+    project_config: dict[str, Any] = config["project"]
     # Get main optional dependencies, extras
-    optional_dependencies: Dict[str, List[str]] = metadata.get(
+    optional_dependencies: dict[str, list[str]] = metadata.get(
         "optional-dependencies", {}
     )
     # Get custom optional dependencies name to always include in this (non-slim) package
-    include_optional_dependencies: List[str] = config.get(
+    include_optional_dependencies: list[str] = config.get(
         "include-optional-dependencies", []
     )
     # Override main [project] configs with custom configs for this package
     for key, value in project_config.items():
         metadata[key] = value
     # Get custom build config for the current package
-    build_config: Dict[str, Any] = (
+    build_config: dict[str, Any] = (
         config.get("tool", {}).get("pdm", {}).get("build", {})
     )
     # Override PDM build config with custom build config for this package
     for key, value in build_config.items():
         context.config.build_config[key] = value
     # Get main dependencies
-    dependencies: List[str] = metadata.get("dependencies", [])
+    dependencies: list[str] = metadata.get("dependencies", [])
     # Add optional dependencies to the default dependencies for this (non-slim) package
     for include_optional in include_optional_dependencies:
         optional_dependencies_group = optional_dependencies.get(include_optional, [])

{fast_dev_cli-0.9.3 → fast_dev_cli-0.9.5}/pyproject.toml

@@ -34,12 +34,12 @@ dependencies = [
     "typer>=0.12.3,<0.13",
     "tomli>=2.0.1,<3; python_version < '3.11'",
     "coverage >=7.5.1,<8",
-    "ruff >=0.4.4,<0.6",
+    "ruff >=0.4.4,<0.7",
     "mypy >=1.10.0,<2",
     "bumpversion2 >=1.4.0,<2",
     "pytest >=8.2.0,<9",
 ]
-version = "0.9.3"
+version = "0.9.5"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"

{fast_dev_cli-0.9.3 → fast_dev_cli-0.9.5}/scripts/format.sh

@@ -3,4 +3,4 @@ set -x
 
 [ -f ../pyproject.toml ] && cd ..
 
-pdm run fast lint
+SKIP_MYPY=1 pdm run fast lint

{fast_dev_cli-0.9.3 → fast_dev_cli-0.9.5}/tests/test_fast_test.py

@@ -41,7 +41,7 @@ def test_test_with_poetry_or_pdm_run(mocker: MockerFixture, capsys):
     if tool := Project.get_manage_tool():
         command = tool + " run " + command
     assert (
-        '--> {0} run -m pytest -s && {0} report --omit="tests/*" -m'.format(command)
+        f'--> {command} run -m pytest -s && {command} report --omit="tests/*" -m'
         in capsys.readouterr().out
     )
 
@@ -54,7 +54,7 @@ def test_test_not_in_venv(mocker: MockerFixture, capsys):
     if tool := Project.get_manage_tool():
         command = tool + " run " + command
     assert (
-        '--> {0} run -m pytest -s && {0} report --omit="tests/*" -m'.format(command)
+        f'--> {command} run -m pytest -s && {command} report --omit="tests/*" -m'
         in capsys.readouterr().out
     )
 

{fast_dev_cli-0.9.3 → fast_dev_cli-0.9.5}/tests/test_lint.py

@@ -41,8 +41,9 @@ def mock_ignore_missing_imports_0(monkeypatch):
 
 
 SEP = " && "
-LINT_CMD = "ruff format . && ruff check --extend-select=I --fix . && mypy ."
-CHECK_CMD = "ruff format --check . && ruff check --extend-select=I . && mypy ."
+_CMD = "ruff format{} . && ruff check --extend-select=I,B,SIM{} . && mypy ."
+LINT_CMD = _CMD.format("", " --fix")
+CHECK_CMD = _CMD.format(" --check", "")
 
 
 def test_check():

fast_dev_cli-0.9.5/tests/test_poetry_version_plugin.py

@@ -0,0 +1,62 @@
+from pathlib import Path
+
+import pytest
+
+from fast_dev_cli.cli import (
+    TOML_FILE,
+    BumpUp,
+    ParseError,
+    run_and_echo,
+)
+
+from .utils import chdir
+
+CONF = """
+
+[tool.poetry-version-plugin]
+source = "init"
+"""
+
+
+def test_version_plugin(tmp_path: Path) -> None:
+    package_path = tmp_path / "helloworld"
+    toml_file = package_path / TOML_FILE
+    init_file = package_path / package_path.name / "__init__.py"
+    a, b = 'version = "0.1.0"', 'version = "0"'
+    with chdir(tmp_path):
+        run_and_echo(f"poetry new {package_path.name}")
+    with chdir(package_path):
+        text = toml_file.read_text().replace(a, b)
+        toml_file.write_text(text + CONF)
+        init_file.write_text('__version__ = "0.0.1"\n')
+        assert (
+            BumpUp(part="patch", commit=False, dry=True).gen()
+            == 'bumpversion --parse "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)" --current-version="0.0.1" patch helloworld/__init__.py --allow-dirty'
+        )
+        run_and_echo("poetry run fast bump patch")
+        assert init_file.read_text() == '__version__ = "0.0.2"\n'
+        init_file.unlink()
+        with pytest.raises(ParseError, match=r"Version file not found!.*"):
+            BumpUp(part="patch", commit=False, dry=True).gen()
+
+
+def test_version_plugin_include_defined(tmp_path: Path) -> None:
+    package_path = tmp_path / "hello world"
+    toml_file = package_path / TOML_FILE
+    package_name = package_path.name.replace(" ", "_")
+    init_file = package_path / package_name / "__init__.py"
+    a, b = 'version = "0.1.0"', 'version = "0"'
+    b += '\npackages = [{include = "%s"}]' % package_name
+    with chdir(tmp_path):
+        run_and_echo(f"poetry new '{package_path.name}'")
+    with chdir(package_path):
+        text = toml_file.read_text().replace(a, b)
+        toml_file.write_text(text + CONF)
+        run_and_echo(f"mv '{package_path.name}' {package_name}")
+        init_file.write_text('__version__ = "0.0.1"\n')
+        assert (
+            BumpUp(part="patch", commit=False, dry=True).gen()
+            == f'bumpversion --parse "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)" --current-version="0.0.1" patch {package_name}/__init__.py --allow-dirty'
+        )
+        run_and_echo("poetry run fast bump patch")
+        assert init_file.read_text() == '__version__ = "0.0.2"\n'

{fast_dev_cli-0.9.3 → fast_dev_cli-0.9.5}/tests/test_runserver.py

@@ -4,49 +4,49 @@ from fast_dev_cli.cli import dev, run_and_echo, runserver
 def test_runserver(capsys):
     runserver(dry=True)
     out = capsys.readouterr().out.strip()
-    assert "fastapi dev" == out.replace("--> ", "")
+    assert out.replace("--> ", "") == "fastapi dev"
     runserver(port=8000, dry=True)
     out = capsys.readouterr().out.strip()
-    assert "fastapi dev" == out.replace("--> ", "")
+    assert out.replace("--> ", "") == "fastapi dev"
     runserver(port=9000, dry=True)
     out = capsys.readouterr().out.strip()
-    assert "fastapi dev --port=9000" == out.replace("--> ", "")
+    assert out.replace("--> ", "") == "fastapi dev --port=9000"
     runserver(host="0.0.0.0", dry=True)
     out = capsys.readouterr().out.strip()
-    assert "fastapi dev --host=0.0.0.0" == out.replace("--> ", "")
+    assert out.replace("--> ", "") == "fastapi dev --host=0.0.0.0"
     runserver(port=9000, host="0.0.0.0", dry=True)
     out = capsys.readouterr().out.strip()
-    assert "fastapi dev --port=9000 --host=0.0.0.0" == out.replace("--> ", "")
+    assert out.replace("--> ", "") == "fastapi dev --port=9000 --host=0.0.0.0"
 
 
 def test_dev(capsys):
     dev(None, None, dry=True)
     out = capsys.readouterr().out.strip()
-    assert "fastapi dev" == out.replace("--> ", "")
+    assert out.replace("--> ", "") == "fastapi dev"
     dev(port=8000, host="", dry=True)
     out = capsys.readouterr().out.strip()
-    assert "fastapi dev" == out.replace("--> ", "")
+    assert out.replace("--> ", "") == "fastapi dev"
     dev(port=9000, host=None, dry=True)
     out = capsys.readouterr().out.strip()
-    assert "fastapi dev --port=9000" == out.replace("--> ", "")
+    assert out.replace("--> ", "") == "fastapi dev --port=9000"
     dev(8000, host="0.0.0.0", dry=True)
     out = capsys.readouterr().out.strip()
-    assert "fastapi dev --host=0.0.0.0" == out.replace("--> ", "")
+    assert out.replace("--> ", "") == "fastapi dev --host=0.0.0.0"
     dev(port=9000, host="0.0.0.0", dry=True)
     out = capsys.readouterr().out.strip()
-    assert "fastapi dev --port=9000 --host=0.0.0.0" == out.replace("--> ", "")
+    assert out.replace("--> ", "") == "fastapi dev --port=9000 --host=0.0.0.0"
     dev(8001, host="0.0.0.0", dry=True)
     out = capsys.readouterr().out.strip()
-    assert "fastapi dev --port=8001 --host=0.0.0.0" == out.replace("--> ", "")
+    assert out.replace("--> ", "") == "fastapi dev --port=8001 --host=0.0.0.0"
     dev(None, file="8001", host="0.0.0.0", dry=True)
     out = capsys.readouterr().out.strip()
-    assert "fastapi dev --port=8001 --host=0.0.0.0" == out.replace("--> ", "")
+    assert out.replace("--> ", "") == "fastapi dev --port=8001 --host=0.0.0.0"
     dev(None, file="main.py", host="0.0.0.0", dry=True)
     out = capsys.readouterr().out.strip()
-    assert "fastapi dev main.py --host=0.0.0.0" == out.replace("--> ", "")
+    assert out.replace("--> ", "") == "fastapi dev main.py --host=0.0.0.0"
     dev(8001, file="main.py", host="0.0.0.0", dry=True)
     out = capsys.readouterr().out.strip()
-    assert "fastapi dev main.py --port=8001 --host=0.0.0.0" == out.replace("--> ", "")
+    assert out.replace("--> ", "") == "fastapi dev main.py --port=8001 --host=0.0.0.0"
 
 
 def test_fast_dev(tmp_path):

{fast_dev_cli-0.9.3 → fast_dev_cli-0.9.5}/tests/test_tag.py

@@ -16,9 +16,8 @@ def test_tag():
         GitTag(message="", dry=True).run()
     assert "git tag -a" in stream.getvalue()
 
-    with temp_file("foo.txt"):
-        with capture_stdout() as stream:
-            GitTag(message="", dry=True).run()
+    with temp_file("foo.txt"), capture_stdout() as stream:
+        GitTag(message="", dry=True).run()
 
     assert "git status" in stream.getvalue()
     assert "ERROR" in stream.getvalue()

{fast_dev_cli-0.9.3 → fast_dev_cli-0.9.5}/tests/test_upgrade.py

@@ -258,3 +258,23 @@ def test_get_dir(mocker, tmp_path):
         assert UpgradeDependencies.get_root_dir() == parent
         mocker.patch.object(UpgradeDependencies, "python_exec_dir", return_value=me)
         assert UpgradeDependencies.get_root_dir() == root
+
+
+def test_parse_complex_segment():
+    segment = """
+[tool.poetry.dependencies]
+torch = [
+    {version="*",platform="linux"},
+    {version="^1.2.0",platform=""},
+    {version=">=1.2.0",platform=""},
+]
+fastapi = "^0.112.2"
+
+[tool.isort]
+    """.strip()
+    assert UpgradeDependencies.get_args(segment) == (
+        ['"fastapi@latest"'],
+        [],
+        [],
+        "--dev",
+    )

{fast_dev_cli-0.9.3 → fast_dev_cli-0.9.5}/tests/test_upload.py

@@ -4,4 +4,4 @@ from fast_dev_cli.cli import upload
 def test_upload(capsys):
     upload(dry=True)
     out = capsys.readouterr().out.strip()
-    assert "poetry publish --build" == out.replace("--> ", "")
+    assert out.replace("--> ", "") == "poetry publish --build"

fast_dev_cli-0.9.3/fast_dev_cli/__init__.py

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