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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.19.8
+Version: 0.20.0
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta
@@ -26,8 +26,6 @@ Requires-Dist: tomli<3,>=2.0.1; python_version < "3.11"
 Requires-Dist: emoji>=2.12.1
 Requires-Dist: packaging>=20.5
 Requires-Dist: coverage>=7.5.1
-Requires-Dist: mypy>=1.15.0
-Requires-Dist: bumpversion2>=1.4.3
 Requires-Dist: pytest>=8.2.0
 Provides-Extra: include-optional-dependencies
 Requires-Dist: all; extra == "include-optional-dependencies"
@@ -78,11 +76,25 @@ Python 3.10+
 
 ## Features
 
-- Support poetry/pdm/uv
-- Support Windows/MacOS/Linux
+- Support uv/pd/mpoetry
+- Support MacOS/Linux/Windows
 
 ## Installation
 
+- Global install
+
+<div class="termy">
+
+```bash
+uv tool install --python 3.14 fastdevcli-slim
+# Or: pipx install fastdevcli-slim
+```
+*Will create a `fast` command in ~/.local/bin
+
+- Install in project
+
+</div>
+
 <div class="termy">
 
 ```bash
@@ -133,11 +145,8 @@ fast pypi
 uvx --from fastdevcli-slim fast
 ```
 
-## Install global
-```bash
-pipx install fastdevcli-slim
-```
-Or:
+## Lint/Check by ty instead of mypy
 ```bash
-uv tool install fastdevcli-slim
+fast lint --ty
+fast check --ty
 ```

{fast_dev_cli-0.19.8 → fast_dev_cli-0.20.0}/README.md

@@ -43,11 +43,25 @@ Python 3.10+
 
 ## Features
 
-- Support poetry/pdm/uv
-- Support Windows/MacOS/Linux
+- Support uv/pd/mpoetry
+- Support MacOS/Linux/Windows
 
 ## Installation
 
+- Global install
+
+<div class="termy">
+
+```bash
+uv tool install --python 3.14 fastdevcli-slim
+# Or: pipx install fastdevcli-slim
+```
+*Will create a `fast` command in ~/.local/bin
+
+- Install in project
+
+</div>
+
 <div class="termy">
 
 ```bash
@@ -98,11 +112,8 @@ fast pypi
 uvx --from fastdevcli-slim fast
 ```
 
-## Install global
-```bash
-pipx install fastdevcli-slim
-```
-Or:
+## Lint/Check by ty instead of mypy
 ```bash
-uv tool install fastdevcli-slim
+fast lint --ty
+fast check --ty
 ```

fast_dev_cli-0.20.0/fast_dev_cli/__init__.py

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

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

@@ -1163,7 +1163,7 @@ class LintCode(DryRun):
             )
         prefix = ""
         should_run_by_tool = with_prefix
-        if not should_run_by_tool:
+        if not should_run_by_tool and "mypy" in str(tools):
             if is_venv() and Path(sys.argv[0]).parent != Path.home().joinpath(
                 ".local/bin"
             ):  # Virtual environment activated and fast-dev-cli is installed in it
@@ -1177,7 +1177,7 @@ class LintCode(DryRun):
                         "You may need to run the following command"
                         f" to install ruff:\n\n  {command}\n"
                     )
-                elif "mypy" in str(tools) and cls.missing_mypy_exec():
+                elif cls.missing_mypy_exec():
                     should_run_by_tool = True
                     if check_call('python -c "import fast_dev_cli"'):
                         command = 'python -m pip install -U "fast-dev-cli"'
@@ -1642,18 +1642,25 @@ class UvPypi(DryRun):
     HOST = "https://files.pythonhosted.org"
 
     def __init__(
-        self, lock_file: Path, dry: bool, verbose: bool, quiet: bool, slim: bool = False
+        self,
+        lock_file: Path,
+        dry: bool,
+        verbose: bool,
+        quiet: bool,
+        slim: bool = False,
+        reverse: bool = False,
     ) -> None:
         super().__init__(dry=dry)
         self.lock_file = lock_file
         self._verbose = _ensure_bool(verbose)
         self._quiet = _ensure_bool(quiet)
         self._slim = _ensure_bool(slim)
+        self._reverse = _ensure_bool(reverse)
 
     def run(self) -> None:
         try:
             rc = self.update_lock(
-                self.lock_file, self._verbose, self._quiet, self._slim
+                self.lock_file, self._verbose, self._quiet, self._slim, self._reverse
             )
         except ValueError as e:
             secho(str(e), fg=typer.colors.RED)
@@ -1712,16 +1719,33 @@ class UvPypi(DryRun):
 
     @classmethod
     def update_lock(
-        cls, p: Path, verbose: bool, quiet: bool, slim: bool = False
+        cls,
+        p: Path,
+        verbose: bool,
+        quiet: bool,
+        slim: bool = False,
+        reverse: bool = False,
     ) -> int:
         text = p.read_text("utf-8")
-        new_text = cls.get_target_content(text, verbose, cls.PYPI, cls.HOST)
+        target_register, target_host = cls.PYPI, cls.HOST
+        if reverse:
+            target_register, target_host = cls.get_register_from_uv_config()
+        new_text = cls.get_target_content(text, verbose, target_register, target_host)
         if new_text is None:
             if verbose:
-                echo(f"Registry of {p} is {cls.PYPI}, no need to change.")
+                echo(f"Registry of {p} is {target_register}, no need to change.")
             return 0
         return cls.slim_and_write(new_text, slim, p, verbose, quiet)
 
+    @staticmethod
+    def get_register_from_uv_config() -> tuple[str, str]:
+        config_dir = "AppData/Roaming" if is_windows() else ".config"
+        config_file = Path.home() / config_dir / "uv/uv.toml"
+        text = config_file.read_text("utf-8")
+        doc = tomllib.loads(text)
+        index_url = doc["index"][0]["url"]
+        return index_url, index_url.replace("/simple", "").rstrip("/")
+
     @staticmethod
     def slim_and_write(
         text: str, slim: bool, p: Path, verbose: bool, quiet: bool
@@ -1744,6 +1768,7 @@ def pypi(
     verbose: bool = False,
     quiet: bool = False,
     slim: bool = False,
+    reverse: bool = False,
 ) -> None:
     """Change registry of uv.lock to be pypi.org"""
     if not (p := Path(_ensure_str(file) or "uv.lock")).exists() and not (
@@ -1751,7 +1776,7 @@ def pypi(
     ):
         yellow_warn(f"{p.name!r} not found!")
         return
-    UvPypi(p, dry, verbose, quiet, slim).run()
+    UvPypi(p, dry, verbose, quiet, slim, reverse).run()
 
 
 def version_callback(value: bool) -> None:

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

@@ -37,11 +37,9 @@ dependencies = [
     "emoji >=2.12.1",
     "packaging >=20.5",
     "coverage >=7.5.1",
-    "mypy >=1.15.0",
-    "bumpversion2 >=1.4.3",
     "pytest >=8.2.0",
 ]
-version = "0.19.8"
+version = "0.20.0"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"
@@ -168,6 +166,7 @@ exclude = [
 
 [tool.ty.rules]
 unresolved-import = "ignore"
+unused-ignore-comment = "ignore"
 
 [tool.ty.environment]
 python-version = "3.10"

{fast_dev_cli-0.19.8 → fast_dev_cli-0.20.0}/scripts/check.py

@@ -23,7 +23,7 @@ if run_and_echo("fast check --skip-mypy", verbose=False) != 0:
     print("\033[1m Please run './scripts/format.py' to auto-fix style issues \033[0m")
     sys.exit(1)
 package_name = os.path.basename(work_dir).replace("-", "_").replace(" ", "_")
-if run_and_echo("mypy {} {}".format(package_name, "tests")) != 0:
+if run_and_echo("ty check {} {}".format(package_name, "tests")) != 0:
     sys.exit(1)
 if run_and_echo("bandit -r {}".format(package_name)) != 0:
     sys.exit(1)

{fast_dev_cli-0.19.8 → fast_dev_cli-0.20.0}/tests/test_pypi.py

@@ -3,7 +3,7 @@ from pathlib import Path
 
 import pytest
 
-from fast_dev_cli.cli import Exit, pypi
+from fast_dev_cli.cli import Exit, UvPypi, pypi, run_and_echo
 
 ASSERTS_DIR = Path(__file__).parent / "assets"
 
@@ -72,6 +72,7 @@ def test_pypi_slim(tmp_work_dir, capsys):
     assert "aliyun" not in new_text and "pypi.org" in new_text
     assert "upload-time" in new_text
     pypi(slim=True, verbose=True)
+    new_text = lock_file.read_text("utf-8")
     assert "upload-time" in new_text
     assert "no need to change" in capsys.readouterr().out
     shutil.copy(origin_lock, lock_file)
@@ -79,3 +80,30 @@ def test_pypi_slim(tmp_work_dir, capsys):
     new_text = lock_file.read_text("utf-8")
     assert "pypi.org" in new_text
     assert "upload-time" not in new_text
+
+
+def test_pypi_reverse(tmp_work_dir):
+    origin_lock = ASSERTS_DIR / "uv-upload-time.lock"
+    lock_file = Path("uv.lock")
+    Path("pyproject.toml").touch()
+    shutil.copy(origin_lock, lock_file)
+    text = origin_lock.read_text("utf-8")
+    pypi(quiet=True)
+    new_text = lock_file.read_text("utf-8")
+    assert new_text != text
+    assert "aliyun" in text and "pypi.org" not in text
+    assert "aliyun" not in new_text and "pypi.org" in new_text
+    assert "upload-time" in new_text
+    try:
+        pypi(reverse=True, verbose=True, quiet=True)
+    except FileNotFoundError:
+        run_and_echo("uvx pip-conf-mirror --uv aliyun")
+        pypi(reverse=True, verbose=True, quiet=True)
+        new_text = lock_file.read_text("utf-8")
+        assert "aliyun" in new_text and "pypi.org" not in new_text
+    else:
+        new_text = lock_file.read_text("utf-8")
+        assert "pypi.org" not in new_text
+        register_url = UvPypi.get_register_from_uv_config()[0]
+        assert register_url in new_text
+    assert "upload-time" in new_text

fast_dev_cli-0.19.8/fast_dev_cli/__init__.py

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