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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.9.1
+Version: 0.9.3
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta
@@ -21,6 +21,7 @@ Classifier: License :: OSI Approved :: MIT License
 Project-URL: Homepage, https://github.com/waketzheng/fast-dev-cli
 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: mypy<2,>=1.10.0

fast_dev_cli-0.9.3/fast_dev_cli/__init__.py

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

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

@@ -23,9 +23,12 @@ except ImportError:  # pragma: no cover
 if sys.version_info >= (3, 11):
     from enum import StrEnum
     from typing import Annotated, Self
+
+    import tomllib
 else:  # pragma: no cover
     from enum import Enum
 
+    import tomli as tomllib
     from typing_extensions import Annotated, Self
 
     class StrEnum(str, Enum):
@@ -92,7 +95,9 @@ def get_current_version(
     cmd = ["poetry", "version", "-s"]
     if verbose:
         echo(f"--> {' '.join(cmd)}")
-    return capture_cmd_output(cmd).strip().splitlines()[-1]
+    if out := capture_cmd_output(cmd).strip():
+        out = out.splitlines()[-1].strip().split()[-1]
+    return out
 
 
 def _ensure_bool(value: bool | OptionInfo) -> bool:
@@ -147,12 +152,37 @@ 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 Project.load_toml_text().splitlines():
+            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:
+            version_value = context["tool"]["poetry"]["version"]
+        except KeyError:
+            return TOML_FILE
+        if version_value == "0":
+            try:
+                package_item = context["tool"]["poetry"]["packages"]
+            except KeyError:
+                packages = []
+            else:
+                packages = [j for i in package_item if (j := i.get("include"))]
+            # In case of managed by `poetry-version-plugin`
+            cwd = Path.cwd()
+            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
+            else:
+                raise ParseError("Version file not found! Where are you now?")
+            return init_file.relative_to(cwd).as_posix()
+
         return TOML_FILE
 
     def get_part(self, s: str) -> str:
@@ -531,6 +561,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

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

@@ -32,13 +32,14 @@ classifiers = [
 ]
 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",
     "mypy >=1.10.0,<2",
     "bumpversion2 >=1.4.0,<2",
     "pytest >=8.2.0,<9",
 ]
-version = "0.9.1"
+version = "0.9.3"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"

{fast_dev_cli-0.9.1 → fast_dev_cli-0.9.3}/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.1/fast_dev_cli/__init__.py

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