fast-dev-cli 0.19.6__tar.gz → 0.19.8__tar.gz

{fast_dev_cli-0.19.6 → fast_dev_cli-0.19.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.19.6
+Version: 0.19.8
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta

fast_dev_cli-0.19.8/fast_dev_cli/__init__.py

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

{fast_dev_cli-0.19.6 → fast_dev_cli-0.19.8}/fast_dev_cli/cli.py

@@ -564,7 +564,7 @@ def version() -> None:
                 echo(f"Got Version from {TOML_FILE}: " + styled)
             return
         version_file = doc["tool"]["pdm"]["version"]["path"]
-        text = Project.get_work_dir().joinpath(version_file).read_text()
+        text = Project.get_work_dir().joinpath(version_file).read_text(encoding="utf-8")
         varname = "__version__"
         for line in text.splitlines():
             if line.strip().startswith(varname):
@@ -1064,6 +1064,7 @@ class LintCode(DryRun):
         up: bool = False,
         sim: bool = True,
         strict: bool = False,
+        ty: bool = False,
     ) -> None:
         self.args = args
         self.check_only = check_only
@@ -1075,6 +1076,7 @@ class LintCode(DryRun):
         self._up = up
         self._sim = sim
         self._strict = strict
+        self._ty = _ensure_bool(ty)
         super().__init__(_exit, dry)
 
     @staticmethod
@@ -1120,6 +1122,7 @@ class LintCode(DryRun):
         ruff_check_up: bool = False,
         ruff_check_sim: bool = True,
         mypy_strict: bool = False,
+        prefer_ty: bool = False,
     ) -> str:
         if paths != "." and all(i.endswith(".html") for i in paths.split()):
             return f"prettier -w {paths}"
@@ -1137,10 +1140,13 @@ class LintCode(DryRun):
             # Sometimes mypy is too slow
             tools = tools[:-1]
         else:
-            if load_bool("IGNORE_MISSING_IMPORTS"):
-                tools[-1] += " --ignore-missing-imports"
-            if mypy_strict or load_bool("FASTDEVCLI_STRICT"):
-                tools[-1] += " --strict"
+            if prefer_ty or load_bool("FASTDEVCLI_TY"):
+                tools[-1] = "ty check"
+            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)
         )
@@ -1249,6 +1255,7 @@ class LintCode(DryRun):
             ruff_check_up=self._up,
             ruff_check_sim=self._sim,
             mypy_strict=self._strict,
+            prefer_ty=self._ty,
         )
 
 
@@ -1267,6 +1274,7 @@ def lint(
     up: bool = False,
     sim: bool = True,
     strict: bool = False,
+    ty: bool = False,
 ) -> None:
     if files is None:
         files = parse_files(sys.argv[1:])
@@ -1283,6 +1291,7 @@ def lint(
         up=up,
         sim=sim,
         strict=strict,
+        ty=ty,
     ).run()
 
 
@@ -1296,6 +1305,7 @@ def check(
     up: bool = False,
     sim: bool = True,
     strict: bool = False,
+    ty: bool = False,
 ) -> None:
     LintCode(
         files,
@@ -1309,6 +1319,7 @@ def check(
         up=up,
         sim=sim,
         strict=strict,
+        ty=ty,
     ).run()
 
 
@@ -1331,6 +1342,7 @@ def make_style(
     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"),
+    ty: bool = Option(False, help="Whether use ty instead of mypy"),
 ) -> None:
     """Run: ruff check/format to reformat code and then mypy to check"""
     if getattr(files, "default", files) is None:
@@ -1347,7 +1359,7 @@ def make_style(
     strict = _ensure_bool(strict)
     kwargs = {"dry": dry, "skip_mypy": skip, "dmypy": dmypy, "bandit": bandit}
     run = check if _ensure_bool(check_only) else functools.partial(lint, prefix=prefix)
-    run(files, tool=tool, up=up, sim=sim, strict=strict, **kwargs)
+    run(files, tool=tool, up=up, sim=sim, strict=strict, ty=ty, **kwargs)
 
 
 @cli.command(name="check")
@@ -1358,12 +1370,14 @@ def only_check(
     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"),
+    ty: bool = Option(False, help="Whether use ty instead of mypy"),
 ) -> None:
     """Check code style without reformat"""
     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)
+    skip_mypy = _ensure_bool(skip_mypy)
+    check(dry=dry, bandit=bandit, skip_mypy=skip_mypy, up=up, sim=sim, ty=ty)
 
 
 class Sync(DryRun):
@@ -1648,52 +1662,70 @@ class UvPypi(DryRun):
             if rc != 0:
                 raise Exit(rc)
 
-    @classmethod
-    def update_lock(
-        cls, p: Path, verbose: bool, quiet: bool, slim: bool = False
-    ) -> int:
-        text = p.read_text("utf-8")
+    @staticmethod
+    def get_target_content(
+        text: str, verbose: bool, target_registry, target_host: str
+    ) -> str | None:
         registry_pattern = r'(registry = ")(.*?)"'
-        replace_registry = functools.partial(
-            re.sub, registry_pattern, rf'\1{cls.PYPI}"'
-        )
         registry_urls = {i[1] for i in re.findall(registry_pattern, text)}
-        download_pattern = r'(url = ")(https?://.*?)(/packages/.*?\.)(gz|whl)"'
-        replace_host = functools.partial(
-            re.sub, download_pattern, rf'\1{cls.HOST}\3\4"'
-        )
+        download_pattern = r'(url = ")(https?://.*?)(/packages/.*?\.)(gz|whl|zip)"'
         download_hosts = {i[1] for i in re.findall(download_pattern, text)}
         if not registry_urls:
-            raise ValueError(f"Failed to find pattern {registry_pattern!r} in {p}")
+            raise ValueError(
+                f"Failed to find pattern {registry_pattern!r} in uv lock file"
+            )
+
+        def replace_registry(s: str) -> str:
+            return re.sub(registry_pattern, rf'\1{target_registry}"', s)
+
+        def replace_host(s: str) -> str:
+            return re.sub(download_pattern, rf'\1{target_host}\3\4"', s)
+
         if len(registry_urls) == 1:
             current_registry = registry_urls.pop()
-            if current_registry == cls.PYPI:
-                if download_hosts == {cls.HOST}:
-                    if verbose:
-                        echo(f"Registry of {p} is {cls.PYPI}, no need to change.")
-                    return 0
+            if current_registry == target_registry:
+                if download_hosts == {target_host}:
+                    return None
             else:
                 text = replace_registry(text)
                 if verbose:
-                    echo(f"{current_registry} --> {cls.PYPI}")
+                    echo(f"{current_registry} --> {target_registry}")
         else:
             # TODO: ask each one to confirm replace
             text = replace_registry(text)
             if verbose:
                 for current_registry in sorted(registry_urls):
-                    echo(f"{current_registry} --> {cls.PYPI}")
+                    echo(f"{current_registry} --> {target_registry}")
         if len(download_hosts) == 1:
             current_host = download_hosts.pop()
-            if current_host != cls.HOST:
+            if current_host != target_host:
                 text = replace_host(text)
                 if verbose:
-                    print(current_host, "-->", cls.HOST)
+                    echo(f"{current_host} --> {target_host}")
         elif download_hosts:
             # TODO: ask each one to confirm replace
             text = replace_host(text)
             if verbose:
                 for current_host in sorted(download_hosts):
-                    echo(f"{current_host} --> {cls.HOST}")
+                    echo(f"{current_host} --> {target_host}")
+        return text
+
+    @classmethod
+    def update_lock(
+        cls, p: Path, verbose: bool, quiet: bool, slim: bool = False
+    ) -> int:
+        text = p.read_text("utf-8")
+        new_text = cls.get_target_content(text, verbose, cls.PYPI, cls.HOST)
+        if new_text is None:
+            if verbose:
+                echo(f"Registry of {p} is {cls.PYPI}, no need to change.")
+            return 0
+        return cls.slim_and_write(new_text, slim, p, verbose, quiet)
+
+    @staticmethod
+    def slim_and_write(
+        text: str, slim: bool, p: Path, verbose: bool, quiet: bool
+    ) -> int:
         if slim:
             pattern = r', size = \d+, upload-time = ".*?"'
             text = re.sub(pattern, "", text)

{fast_dev_cli-0.19.6 → fast_dev_cli-0.19.8}/pyproject.toml

@@ -41,7 +41,7 @@ dependencies = [
     "bumpversion2 >=1.4.3",
     "pytest >=8.2.0",
 ]
-version = "0.19.6"
+version = "0.19.8"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"
@@ -161,6 +161,17 @@ omit = [
     "fast_dev_cli/__main__.py",
 ]
 
+[tool.ty.src]
+exclude = [
+    "*.bak",
+]
+
+[tool.ty.rules]
+unresolved-import = "ignore"
+
+[tool.ty.environment]
+python-version = "3.10"
+
 [tool.mypy]
 pretty = true
 python_version = "3.10"

{fast_dev_cli-0.19.6 → fast_dev_cli-0.19.8}/tests/test_lint.py

@@ -72,6 +72,16 @@ def test_check(mock_no_dmypy, monkeypatch, mocker):
     monkeypatch.setenv("FASTDEVCLI_BANDIT", "0")
     command4 = capture_cmd_output("fast check --dry")
     assert command4 == command
+    command5 = capture_cmd_output("fast check --dry --ty")
+    assert "ty check" in command5
+    command6 = capture_cmd_output("fast check --dry --ty --skip-mypy")
+    assert "ty check" not in command6
+
+
+def test_check_ty(monkeypatch, mocker):
+    monkeypatch.setenv("FASTDEVCLI_TY", "1")
+    command = capture_cmd_output("fast check --dry")
+    assert "ty check" in command
 
 
 def test_check_up_sim(monkeypatch):
@@ -181,6 +191,13 @@ def test_lint_cmd(mock_no_dmypy, monkeypatch):
     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")
+    output = capture_cmd_output("fast lint --dry --ty")
+    assert "--strict" not in output
+    assert "ty check" in output
+    monkeypatch.setenv("FASTDEVCLI_TY", "1")
+    output = capture_cmd_output("fast lint --dry")
+    assert "--strict" not in output
+    assert "ty check" in output
 
 
 def test_lint_html():

{fast_dev_cli-0.19.6 → fast_dev_cli-0.19.8}/tests/test_upgrade.py

@@ -58,7 +58,8 @@ anyio = {version = ">=3.7.1", optional = true}
 typer = {extras = ["all"], version = "^0.9.0", optional = true}
 uvicorn = {version = "^0.23.2", platform = "linux", optional = true}
     """
-    assert UpgradeDependencies.build_args(segment.splitlines()) == (
+    lines = [str(i) for i in segment.splitlines()]
+    assert UpgradeDependencies.build_args(lines) == (
         [
             '"ipython@latest"',
             '"coveralls@latest"',

fast_dev_cli-0.19.6/fast_dev_cli/__init__.py

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