fast-dev-cli 0.19.3__tar.gz → 0.19.5__tar.gz

{fast_dev_cli-0.19.3 → fast_dev_cli-0.19.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.19.3
+Version: 0.19.5
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta
@@ -74,7 +74,7 @@ Description-Content-Type: text/markdown
 
 ## Requirements
 
-Python 3.9+
+Python 3.10+
 
 ## Features
 
@@ -88,7 +88,7 @@ Python 3.9+
 ```bash
 pip install fast-dev-cli
 ```
-*Will install: fast-dev-cli emoji typer ruff mypy bumpversion2 pytest coverage*
+*Will install: fast-dev-cli emoji typer-slim mypy bumpversion2 pytest coverage*
 
 </div>
 
@@ -113,21 +113,17 @@ fast bump <part> --commit # bump version and run `git commit`
 ```bash
 fast test
 ```
-- Export requirement file and install `pip install -r `
+- Install dependencies, support pip/pdm/uv/poetry
 ```bash
-fast sync
-```
-- Upgrade main/dev dependencies to latest version (only for poetry project)
-```bash
-fast upgrade
+fast deps
 ```
 - Start a fastapi server in development mode
 ```bash
 fast dev
 ```
-- Publish to pypi
+- Change register of uv.lock to be pypi.org
 ```bash
-fast upload
+fast pypi
 ```
 *Note: all command support the `--dry` option*
 

{fast_dev_cli-0.19.3 → fast_dev_cli-0.19.5}/README.md

@@ -39,7 +39,7 @@
 
 ## Requirements
 
-Python 3.9+
+Python 3.10+
 
 ## Features
 
@@ -53,7 +53,7 @@ Python 3.9+
 ```bash
 pip install fast-dev-cli
 ```
-*Will install: fast-dev-cli emoji typer ruff mypy bumpversion2 pytest coverage*
+*Will install: fast-dev-cli emoji typer-slim mypy bumpversion2 pytest coverage*
 
 </div>
 
@@ -78,21 +78,17 @@ fast bump <part> --commit # bump version and run `git commit`
 ```bash
 fast test
 ```
-- Export requirement file and install `pip install -r `
+- Install dependencies, support pip/pdm/uv/poetry
 ```bash
-fast sync
-```
-- Upgrade main/dev dependencies to latest version (only for poetry project)
-```bash
-fast upgrade
+fast deps
 ```
 - Start a fastapi server in development mode
 ```bash
 fast dev
 ```
-- Publish to pypi
+- Change register of uv.lock to be pypi.org
 ```bash
-fast upload
+fast pypi
 ```
 *Note: all command support the `--dry` option*
 

fast_dev_cli-0.19.5/fast_dev_cli/__init__.py

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

{fast_dev_cli-0.19.3 → fast_dev_cli-0.19.5}/fast_dev_cli/cli.py

@@ -180,7 +180,7 @@ class Shell:
         return (r.stdout or r.stderr or "").strip()
 
     def finish(
-        self, env: dict[str, str] | None = None, _exit: bool = False, dry=False
+        self, env: dict[str, str] | None = None, _exit: bool = False, dry: bool = False
     ) -> subprocess.CompletedProcess[str]:
         self.run(verbose=True, dry=True)
         if _ensure_bool(dry):
@@ -395,7 +395,7 @@ class BumpUp(DryRun):
     @staticmethod
     def parse_dynamic_version(
         toml_text: str,
-        context: dict,
+        context: dict[str, Any],
         work_dir: Path | None = None,
     ) -> str | None:
         if work_dir is None:
@@ -457,7 +457,7 @@ class BumpUp(DryRun):
         return TOML_FILE
 
     @staticmethod
-    def parse_plugin_version(context: dict, package_name: str | None) -> str:
+    def parse_plugin_version(context: dict[str, Any], package_name: str | None) -> str:
         try:
             package_item = context["tool"]["poetry"]["packages"]
         except KeyError:
@@ -761,7 +761,7 @@ class Project:
 
     @classmethod
     def get_sync_command(
-        cls, prod: bool = True, doc: dict | None = None, only_me: bool = False
+        cls, prod: bool = True, doc: dict[str, Any] | None = None, only_me: bool = False
     ) -> str:
         pdm_i = "pdm install --frozen" + " --prod" * prod
         if cls.is_pdm_project():
@@ -1058,6 +1058,9 @@ class LintCode(DryRun):
         dmypy: bool = False,
         tool: str = ToolOption.default,
         prefix: bool = False,
+        up: bool = False,
+        sim: bool = True,
+        strict: bool = False,
     ) -> None:
         self.args = args
         self.check_only = check_only
@@ -1066,6 +1069,9 @@ class LintCode(DryRun):
         self._use_dmypy = dmypy
         self._tool = tool
         self._prefix = prefix
+        self._up = up
+        self._sim = sim
+        self._strict = strict
         super().__init__(_exit, dry)
 
     @staticmethod
@@ -1108,6 +1114,9 @@ class LintCode(DryRun):
         use_dmypy: bool = False,
         tool: str = ToolOption.default,
         with_prefix: bool = False,
+        ruff_check_up: bool = False,
+        ruff_check_sim: bool = True,
+        mypy_strict: bool = False,
     ) -> str:
         if paths != "." and all(i.endswith(".html") for i in paths.split()):
             return f"prettier -w {paths}"
@@ -1117,11 +1126,18 @@ class LintCode(DryRun):
             tools[0] += " --check"
         if check_only or load_bool("NO_FIX"):
             tools[1] = tools[1].replace(" --fix", "")
+        if ruff_check_up or load_bool("FASTDEVCLI_UP"):
+            tools[1] = tools[1].replace(",SIM", ",SIM,UP")
+        if not ruff_check_sim or load_bool("FASTDEVCLI_NO_SIM"):
+            tools[1] = tools[1].replace(",SIM", "")
         if skip_mypy or load_bool("SKIP_MYPY") or load_bool("FASTDEVCLI_NO_MYPY"):
             # Sometimes mypy is too slow
             tools = tools[:-1]
-        elif load_bool("IGNORE_MISSING_IMPORTS"):
-            tools[-1] += " --ignore-missing-imports"
+        else:
+            if load_bool("IGNORE_MISSING_IMPORTS"):
+                tools[-1] += " --ignore-missing-imports"
+            if mypy_strict or load_bool("FASTDEVCLI_STRICT"):
+                tools[-1] += " --strict"
         lint_them = " && ".join(
             "{0}{" + str(i) + "} {1}" for i in range(2, len(tools) + 2)
         )
@@ -1227,6 +1243,9 @@ class LintCode(DryRun):
             self._use_dmypy,
             tool=self._tool,
             with_prefix=self._prefix,
+            ruff_check_up=self._up,
+            ruff_check_sim=self._sim,
+            mypy_strict=self._strict,
         )
 
 
@@ -1242,6 +1261,9 @@ def lint(
     dmypy: bool = False,
     tool: str = ToolOption.default,
     prefix: bool = False,
+    up: bool = False,
+    sim: bool = True,
+    strict: bool = False,
 ) -> None:
     if files is None:
         files = parse_files(sys.argv[1:])
@@ -1255,6 +1277,9 @@ def lint(
         dmypy=dmypy,
         tool=tool,
         prefix=prefix,
+        up=up,
+        sim=sim,
+        strict=strict,
     ).run()
 
 
@@ -1265,6 +1290,9 @@ def check(
     skip_mypy: bool = False,
     dmypy: bool = False,
     tool: str = ToolOption.default,
+    up: bool = False,
+    sim: bool = True,
+    strict: bool = False,
 ) -> None:
     LintCode(
         files,
@@ -1275,6 +1303,9 @@ def check(
         skip_mypy=skip_mypy,
         dmypy=dmypy,
         tool=tool,
+        up=up,
+        sim=sim,
+        strict=strict,
     ).run()
 
 
@@ -1294,6 +1325,9 @@ def make_style(
     ),
     tool: str = ToolOption,
     dry: bool = DryOption,
+    up: bool = Option(False, help="Whether ruff check with --extend-select=UP"),
+    sim: bool = Option(True, help="Whether ruff check with --extend-select=SIM"),
+    strict: bool = Option(False, help="Whether run mypy with --strict"),
 ) -> None:
     """Run: ruff check/format to reformat code and then mypy to check"""
     if getattr(files, "default", files) is None:
@@ -1305,11 +1339,12 @@ def make_style(
     bandit = _ensure_bool(bandit)
     prefix = _ensure_bool(prefix)
     tool = _ensure_str(tool)
+    up = _ensure_bool(up)
+    sim = _ensure_bool(sim)
+    strict = _ensure_bool(strict)
     kwargs = {"dry": dry, "skip_mypy": skip, "dmypy": dmypy, "bandit": bandit}
-    if _ensure_bool(check_only):
-        check(files, tool=tool, **kwargs)
-    else:
-        lint(files, prefix=prefix, tool=tool, **kwargs)
+    run = check if _ensure_bool(check_only) else functools.partial(lint, prefix=prefix)
+    run(files, tool=tool, up=up, sim=sim, strict=strict, **kwargs)
 
 
 @cli.command(name="check")
@@ -1317,9 +1352,15 @@ def only_check(
     bandit: bool = Option(False, "--bandit", help="Run `bandit -r <package_dir>`"),
     skip_mypy: bool = Option(False, "--skip-mypy"),
     dry: bool = DryOption,
+    up: bool = Option(False, help="Whether ruff check with --extend-select=UP"),
+    sim: bool = Option(True, help="Whether ruff check with --extend-select=SIM"),
+    strict: bool = Option(False, help="Whether run mypy with --strict"),
 ) -> None:
     """Check code style without reformat"""
-    check(dry=dry, bandit=bandit, skip_mypy=_ensure_bool(skip_mypy))
+    bandit = _ensure_bool(bandit)
+    up = _ensure_bool(up)
+    sim = _ensure_bool(sim)
+    check(dry=dry, bandit=bandit, skip_mypy=_ensure_bool(skip_mypy), up=up, sim=sim)
 
 
 class Sync(DryRun):

{fast_dev_cli-0.19.3 → fast_dev_cli-0.19.5}/pyproject.toml

@@ -41,7 +41,7 @@ dependencies = [
     "bumpversion2 >=1.4.3",
     "pytest >=8.2.0",
 ]
-version = "0.19.3"
+version = "0.19.5"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"

{fast_dev_cli-0.19.3 → fast_dev_cli-0.19.5}/tests/conftest.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 
 import pytest
-from asynctor.compat import chdir
+from asynctor.testing import chdir_tmp_fixture
 
 from fast_dev_cli.cli import TOML_FILE, run_and_echo
 
@@ -49,10 +49,7 @@ build-backend = "poetry.core.masonry.api"
 """
 
 
-@pytest.fixture
-def tmp_work_dir(tmp_path):
-    with chdir(tmp_path):
-        yield tmp_path
+tmp_work_dir = chdir_tmp_fixture()
 
 
 @pytest.fixture

{fast_dev_cli-0.19.3 → fast_dev_cli-0.19.5}/tests/test_lint.py

@@ -74,6 +74,43 @@ def test_check(mock_no_dmypy, monkeypatch, mocker):
     assert command4 == command
 
 
+def test_check_up_sim(monkeypatch):
+    _test_up_sim(monkeypatch)
+
+
+def test_lint_up_sim(monkeypatch):
+    _test_up_sim(monkeypatch, "lint")
+
+
+def _test_up_sim(monkeypatch, command="check"):
+    out = capture_cmd_output(f"fast {command} --up --dry")
+    assert "--extend-select=I,B,SIM,UP " in out
+    out = capture_cmd_output(f"fast {command} --no-sim --up --dry")
+    assert "--extend-select=I,B,UP " in out
+    out = capture_cmd_output(f"fast {command} --no-sim --dry")
+    assert "--extend-select=I,B " in out
+    out = capture_cmd_output(f"fast {command} --dry")
+    assert "--extend-select=I,B,SIM " in out
+    monkeypatch.setenv("FASTDEVCLI_NO_SIM", "1")
+    out = capture_cmd_output(f"fast {command} --dry")
+    assert "--extend-select=I,B " in out
+    monkeypatch.setenv("FASTDEVCLI_NO_SIM", "0")
+    out = capture_cmd_output(f"fast {command} --dry")
+    assert "--extend-select=I,B,SIM " in out
+    monkeypatch.setenv("FASTDEVCLI_UP", "1")
+    out = capture_cmd_output(f"fast {command} --dry")
+    assert "--extend-select=I,B,SIM,UP " in out
+    monkeypatch.setenv("FASTDEVCLI_NO_SIM", "1")
+    out = capture_cmd_output(f"fast {command} --dry")
+    assert "--extend-select=I,B,UP " in out
+    monkeypatch.setenv("FASTDEVCLI_UP", "0")
+    out = capture_cmd_output(f"fast {command} --dry")
+    assert "--extend-select=I,B " in out
+    monkeypatch.setenv("FASTDEVCLI_NO_SIM", "0")
+    out = capture_cmd_output(f"fast {command} --dry")
+    assert "--extend-select=I,B,SIM " in out
+
+
 def test_check_bandit(tmp_path):
     package_path = tmp_path / "foo"
     with chdir(tmp_path):
@@ -125,7 +162,7 @@ def _fast_check():
         assert cmd in command
 
 
-def test_lint_cmd(mock_no_dmypy):
+def test_lint_cmd(mock_no_dmypy, monkeypatch):
     run = "pdm run "
     lint_cmd = f"{run}python fast_dev_cli/cli.py lint"
     command = capture_cmd_output(f"{lint_cmd} . --dry")
@@ -141,6 +178,9 @@ def test_lint_cmd(mock_no_dmypy):
         == capture_cmd_output(f"{lint_cmd}")
         == capture_cmd_output(f"{run}fast lint")
     )
+    assert "mypy --strict" in capture_cmd_output("fast lint --strict --dry")
+    monkeypatch.setenv("FASTDEVCLI_STRICT", "1")
+    assert "mypy --strict" in capture_cmd_output("fast lint --dry")
 
 
 def test_lint_html():

{fast_dev_cli-0.19.3 → fast_dev_cli-0.19.5}/tests/test_upgrade.py

@@ -85,24 +85,28 @@ uvicorn = {version = "^0.23.2", platform = "linux", optional = true}
 def test_dev_flag(tmp_path: Path):
     assert UpgradeDependencies.should_with_dev() is False
     with prepare_poetry_project(tmp_path) as poetry:
-        is_newer_poetry = Project.get_poetry_version(poetry) >= "2.2.0"
-        assert not UpgradeDependencies.should_with_dev()
-        run_and_echo(f"{poetry} add pytest")
+        _test_dev_flag(poetry)
+
+
+def _test_dev_flag(poetry):
+    is_newer_poetry = Project.get_poetry_version(poetry) >= "2.2.0"
+    assert not UpgradeDependencies.should_with_dev()
+    run_and_echo(f"{poetry} add pytest")
+    assert not UpgradeDependencies.should_with_dev()
+    run_and_echo(f"{poetry} add --group=dev typer")
+    if is_newer_poetry:
         assert not UpgradeDependencies.should_with_dev()
-        run_and_echo(f"{poetry} add --group=dev typer")
-        if is_newer_poetry:
-            assert not UpgradeDependencies.should_with_dev()
+    else:
+        toml_file = Path(TOML_FILE)
+        assert UpgradeDependencies.should_with_dev()
+        text = toml_file.read_text()
+        DevFlag = UpgradeDependencies.DevFlag
+        if DevFlag.new in text:
+            new_text = text.replace(DevFlag.new, DevFlag.old)
         else:
-            toml_file = Path(TOML_FILE)
-            assert UpgradeDependencies.should_with_dev()
-            text = toml_file.read_text()
-            DevFlag = UpgradeDependencies.DevFlag
-            if DevFlag.new in text:
-                new_text = text.replace(DevFlag.new, DevFlag.old)
-            else:
-                new_text = text.replace(DevFlag.old, DevFlag.new)
-            toml_file.write_text(new_text)
-            assert UpgradeDependencies.should_with_dev()
+            new_text = text.replace(DevFlag.old, DevFlag.new)
+        toml_file.write_text(new_text)
+        assert UpgradeDependencies.should_with_dev()
 
 
 def test_parse_item():

{fast_dev_cli-0.19.3 → fast_dev_cli-0.19.5}/tests/utils.py

@@ -47,23 +47,28 @@ def temp_file(name: str, text=""):
         path.write_text(text)
     else:
         path.touch()
-    yield
-    if path.exists():
-        path.unlink()
+    try:
+        yield
+    finally:
+        if path.exists():
+            path.unlink()
 
 
 @contextmanager
-def prepare_poetry_project(tmp_path: Path) -> Generator[str]:
+def prepare_poetry_project(work_dir: Path) -> Generator[str]:
     py = "{}.{}".format(*sys.version_info)
     poetry = "poetry"
     if shutil.which(poetry) is None:
         poetry = "uvx " + poetry
-    with chdir(tmp_path):
-        project = "foo"
-        Shell.run_by_subprocess(f"{poetry} new {project} --python=^{py}")
-        with chdir(tmp_path / project):
-            Shell.run_by_subprocess(
-                f"{poetry} config --local virtualenvs.in-project true"
-            )
-            Shell.run_by_subprocess(f"{poetry} env use {py}")
-            yield poetry
+    project = "foo"
+    with chdir(work_dir), _new_poetry_project(py, poetry, project):
+        yield poetry
+
+
+@contextmanager
+def _new_poetry_project(py: str, poetry: str, project: str) -> Generator[None]:
+    Shell.run_by_subprocess(f"{poetry} new {project} --python=^{py}")
+    with chdir(project):
+        Shell.run_by_subprocess(f"{poetry} config --local virtualenvs.in-project true")
+        Shell.run_by_subprocess(f"{poetry} env use {py}")
+        yield

fast_dev_cli-0.19.3/fast_dev_cli/__init__.py

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