fast-dev-cli 0.19.2__tar.gz → 0.19.4__tar.gz

{fast_dev_cli-0.19.2 → fast_dev_cli-0.19.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.19.2
+Version: 0.19.4
 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.2 → fast_dev_cli-0.19.4}/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.4/fast_dev_cli/__init__.py

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

{fast_dev_cli-0.19.2 → fast_dev_cli-0.19.4}/fast_dev_cli/cli.py

@@ -139,14 +139,25 @@ class Shell:
     @property
     def command(self) -> list[str] | str:
         command: list[str] | str = self._cmd
-        if (
-            isinstance(command, str)
-            and "shell" not in self._kw
-            and not (set(self._cmd) & {"|", ">", "&"})
-        ):
-            command = shlex.split(command)
+        if isinstance(command, str):
+            cs = shlex.split(command)
+            if "shell" not in self._kw and not (set(self._cmd) & {"|", ">", "&"}):
+                command = self.extend_user(cs)
+            elif any(i.startswith("~") for i in cs):
+                command = re.sub(r" ~", " " + os.path.expanduser("~"), command)
+        else:
+            command = self.extend_user(command)
         return command
 
+    @staticmethod
+    def extend_user(cs: list[str]) -> list[str]:
+        if cs[0] == "echo":
+            return cs
+        for i, c in enumerate(cs):
+            if c.startswith("~"):
+                cs[i] = os.path.expanduser(c)
+        return cs
+
     def _run(self) -> subprocess.CompletedProcess[str]:
         return self.run_by_subprocess(self.command, **self._kw)
 
@@ -1047,6 +1058,8 @@ class LintCode(DryRun):
         dmypy: bool = False,
         tool: str = ToolOption.default,
         prefix: bool = False,
+        up: bool = False,
+        sim: bool = True,
     ) -> None:
         self.args = args
         self.check_only = check_only
@@ -1055,6 +1068,8 @@ class LintCode(DryRun):
         self._use_dmypy = dmypy
         self._tool = tool
         self._prefix = prefix
+        self._up = up
+        self._sim = sim
         super().__init__(_exit, dry)
 
     @staticmethod
@@ -1097,6 +1112,8 @@ 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,
     ) -> str:
         if paths != "." and all(i.endswith(".html") for i in paths.split()):
             return f"prettier -w {paths}"
@@ -1106,6 +1123,10 @@ 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]
@@ -1216,6 +1237,8 @@ class LintCode(DryRun):
             self._use_dmypy,
             tool=self._tool,
             with_prefix=self._prefix,
+            ruff_check_up=self._up,
+            ruff_check_sim=self._sim,
         )
 
 
@@ -1231,6 +1254,8 @@ def lint(
     dmypy: bool = False,
     tool: str = ToolOption.default,
     prefix: bool = False,
+    up: bool = False,
+    sim: bool = True,
 ) -> None:
     if files is None:
         files = parse_files(sys.argv[1:])
@@ -1244,6 +1269,8 @@ def lint(
         dmypy=dmypy,
         tool=tool,
         prefix=prefix,
+        up=up,
+        sim=sim,
     ).run()
 
 
@@ -1254,6 +1281,8 @@ def check(
     skip_mypy: bool = False,
     dmypy: bool = False,
     tool: str = ToolOption.default,
+    up: bool = False,
+    sim: bool = True,
 ) -> None:
     LintCode(
         files,
@@ -1264,6 +1293,8 @@ def check(
         skip_mypy=skip_mypy,
         dmypy=dmypy,
         tool=tool,
+        up=up,
+        sim=sim,
     ).run()
 
 
@@ -1283,6 +1314,8 @@ 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"),
 ) -> None:
     """Run: ruff check/format to reformat code and then mypy to check"""
     if getattr(files, "default", files) is None:
@@ -1294,11 +1327,13 @@ def make_style(
     bandit = _ensure_bool(bandit)
     prefix = _ensure_bool(prefix)
     tool = _ensure_str(tool)
+    up = _ensure_bool(up)
+    sim = _ensure_bool(sim)
     kwargs = {"dry": dry, "skip_mypy": skip, "dmypy": dmypy, "bandit": bandit}
     if _ensure_bool(check_only):
-        check(files, tool=tool, **kwargs)
+        check(files, tool=tool, up=up, sim=sim, **kwargs)
     else:
-        lint(files, prefix=prefix, tool=tool, **kwargs)
+        lint(files, prefix=prefix, tool=tool, up=up, sim=sim, **kwargs)
 
 
 @cli.command(name="check")
@@ -1306,9 +1341,14 @@ 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"),
 ) -> 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.2 → fast_dev_cli-0.19.4}/pyproject.toml

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

{fast_dev_cli-0.19.2 → fast_dev_cli-0.19.4}/tests/test_exec.py

@@ -1,3 +1,5 @@
+import os
+
 import pytest
 
 from fast_dev_cli.cli import Exit, capture_cmd_output, run_by_subprocess
@@ -15,6 +17,8 @@ def test_exec_dry():
     )
     assert "success" in out
     assert "failed" not in out
+    out = capture_cmd_output('fast exec "python ~/0.py" --dry')
+    assert "--> python ~/0.py" in out
 
 
 def test_exec():
@@ -29,6 +33,12 @@ def test_exec():
     )
     assert "failed" in out
     assert "success" not in out
+    out = capture_cmd_output('fast exec "ls -a ~/"')
+    assert "--> ls -a ~" in out
+    assert ".bashrc" in out
+    home = os.path.expanduser("~")
+    expected = capture_cmd_output(f"ls {home}")
+    assert not (set(expected.splitlines()) - set(out.splitlines()))
 
 
 def test_run_by_subprocess(capsys):

{fast_dev_cli-0.19.2 → fast_dev_cli-0.19.4}/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):

fast_dev_cli-0.19.2/fast_dev_cli/__init__.py

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