fast-dev-cli 0.9.2__tar.gz → 0.9.4__tar.gz

{fast_dev_cli-0.9.2 → fast_dev_cli-0.9.4}/PKG-INFO

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

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

{fast_dev_cli-0.9.2 → fast_dev_cli-0.9.4}/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()
 
@@ -160,9 +156,13 @@ class BumpUp(DryRun):
                     continue
                 return line.split('path = "', 1)[-1].split('"')[0]
         context = tomllib.loads(toml_text)
-        if (poetry_item := context["tool"]["poetry"])["version"] == "0":
+        try:
+            version_value = context["tool"]["poetry"]["version"]
+        except KeyError:
+            return TOML_FILE
+        if version_value == "0":
             try:
-                package_item = poetry_item["packages"]
+                package_item = context["tool"]["poetry"]["packages"]
             except KeyError:
                 packages = []
             else:
@@ -177,7 +177,7 @@ class BumpUp(DryRun):
                         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
 
@@ -557,6 +557,8 @@ class LintCode(DryRun):
         if load_bool("SKIP_MYPY"):
             # Sometimes mypy is too slow
             tools = tools[:-1]
+        elif load_bool("IGNORE_MISSING_IMPORTS"):
+            tools[-1] += " --ignore-missing-imports"
         lint_them = " && ".join("{0}{%d} {1}" % i for i in range(2, len(tools) + 2))
         prefix = ""
         should_run_by_tool = False
@@ -579,6 +581,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:])
@@ -662,7 +668,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:

{fast_dev_cli-0.9.2 → fast_dev_cli-0.9.4}/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.2"
+version = "0.9.4"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"

{fast_dev_cli-0.9.2 → fast_dev_cli-0.9.4}/tests/test_lint.py

@@ -25,6 +25,21 @@ def mock_skip_mypy(monkeypatch):
     monkeypatch.setenv("SKIP_MYPY", "1")
 
 
+@pytest.fixture
+def mock_skip_mypy_0(monkeypatch):
+    monkeypatch.setenv("SKIP_MYPY", "0")
+
+
+@pytest.fixture
+def mock_ignore_missing_imports(monkeypatch):
+    monkeypatch.setenv("IGNORE_MISSING_IMPORTS", "1")
+
+
+@pytest.fixture
+def mock_ignore_missing_imports_0(monkeypatch):
+    monkeypatch.setenv("IGNORE_MISSING_IMPORTS", "0")
+
+
 SEP = " && "
 LINT_CMD = "ruff format . && ruff check --extend-select=I --fix . && mypy ."
 CHECK_CMD = "ruff format --check . && ruff check --extend-select=I . && mypy ."
@@ -112,6 +127,23 @@ def test_skip_mypy(mock_skip_mypy, mocker):
     assert LintCode(".").gen() == SEP.join(i for i in cmds if not i.startswith("mypy"))
 
 
+def test_skip_mypy_0(mock_skip_mypy_0, mocker):
+    mocker.patch("fast_dev_cli.cli.is_venv", return_value=True)
+    assert LintCode(".").gen() == LINT_CMD
+
+
+def test_ignore_missing_imports(mock_ignore_missing_imports, mocker):
+    mocker.patch("fast_dev_cli.cli.is_venv", return_value=True)
+    assert LintCode(".").gen() == LINT_CMD.replace(
+        "mypy ", "mypy --ignore-missing-imports "
+    )
+
+
+def test_ignore_missing_imports_0(mock_ignore_missing_imports_0, mocker):
+    mocker.patch("fast_dev_cli.cli.is_venv", return_value=True)
+    assert LintCode(".").gen() == LINT_CMD
+
+
 def test_not_in_root(mocker):
     mocker.patch("fast_dev_cli.cli.is_venv", return_value=True)
     root = Path(__file__).parent.parent

fast_dev_cli-0.9.4/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.2/fast_dev_cli/__init__.py

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