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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.20.0
+Version: 0.21.0
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta
@@ -21,10 +21,8 @@ Classifier: Typing :: Typed
 Classifier: License :: OSI Approved :: MIT License
 Project-URL: Homepage, https://github.com/waketzheng/fast-dev-cli
 Requires-Python: >=3.10
-Requires-Dist: typer-slim<1,>=0.12.3
+Requires-Dist: typer<1,>=0.24.0
 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: pytest>=8.2.0
 Provides-Extra: include-optional-dependencies
@@ -76,7 +74,7 @@ Python 3.10+
 
 ## Features
 
-- Support uv/pd/mpoetry
+- Support uv/pdm/poetry
 - Support MacOS/Linux/Windows
 
 ## Installation
@@ -100,7 +98,7 @@ uv tool install --python 3.14 fastdevcli-slim
 ```bash
 pip install fast-dev-cli
 ```
-*Will install: fast-dev-cli emoji typer-slim mypy bumpversion2 pytest coverage*
+*Will install: fast-dev-cli emoji typer packaging pytest coverage*
 
 </div>
 

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

@@ -43,7 +43,7 @@ Python 3.10+
 
 ## Features
 
-- Support uv/pd/mpoetry
+- Support uv/pdm/poetry
 - Support MacOS/Linux/Windows
 
 ## Installation
@@ -67,7 +67,7 @@ uv tool install --python 3.14 fastdevcli-slim
 ```bash
 pip install fast-dev-cli
 ```
-*Will install: fast-dev-cli emoji typer-slim mypy bumpversion2 pytest coverage*
+*Will install: fast-dev-cli emoji typer packaging pytest coverage*
 
 </div>
 

fast_dev_cli-0.21.0/fast_dev_cli/__init__.py

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

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

@@ -1398,7 +1398,7 @@ class Sync(DryRun):
             return f"python -m pip install -r {self.filename}"
         prefix = "" if is_venv() else f"{tool} run "
         ensure_pip = " {1}python -m ensurepip && {1}python -m pip install -U pip &&"
-        export_cmd = "uv export --no-hashes --all-extras --frozen"
+        export_cmd = "uv export --no-hashes --all-extras --all-groups --frozen"
         if tool in ("poetry", "pdm"):
             export_cmd = f"{tool} export --without-hashes --with=dev"
             if tool == "poetry":
@@ -1729,7 +1729,14 @@ class UvPypi(DryRun):
         text = p.read_text("utf-8")
         target_register, target_host = cls.PYPI, cls.HOST
         if reverse:
-            target_register, target_host = cls.get_register_from_uv_config()
+            try:
+                target_register, target_host = cls.get_register_from_uv_config()
+            except FileNotFoundError:
+                if verbose:
+                    echo("Skip register reverse as global uv config file not found.")
+                if quiet:
+                    return 0
+                return 1
         new_text = cls.get_target_content(text, verbose, target_register, target_host)
         if new_text is None:
             if verbose:
@@ -1737,15 +1744,19 @@ class UvPypi(DryRun):
             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"
+    @classmethod
+    def get_register_from_uv_config(cls) -> tuple[str, str]:
+        config_file = cls.get_uv_config_file()
         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 get_uv_config_file() -> Path:
+        config_dir = "AppData/Roaming" if is_windows() else ".config"
+        return Path.home() / config_dir / "uv/uv.toml"
+
     @staticmethod
     def slim_and_write(
         text: str, slim: bool, p: Path, verbose: bool, quiet: bool

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

@@ -32,14 +32,12 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
 ]
 dependencies = [
-    "typer-slim >=0.12.3,<1",
+    "typer>=0.24.0,<1",
     "tomli >=2.0.1,<3; python_version < '3.11'",
-    "emoji >=2.12.1",
-    "packaging >=20.5",
     "coverage >=7.5.1",
     "pytest >=8.2.0",
 ]
-version = "0.20.0"
+version = "0.21.0"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"
@@ -141,9 +139,8 @@ source = [
     "fast_dev_cli",
 ]
 omit = [
-    "__pypackages__/*",
     ".venv/*",
-    "venv*.bak/*",
+    "*.bak/*",
 ]
 context = "${CONTEXT}"
 
@@ -167,6 +164,7 @@ exclude = [
 [tool.ty.rules]
 unresolved-import = "ignore"
 unused-ignore-comment = "ignore"
+unused-type-ignore-comment = "ignore"
 
 [tool.ty.environment]
 python-version = "3.10"

{fast_dev_cli-0.20.0 → fast_dev_cli-0.21.0}/tests/test_exec.py

@@ -35,7 +35,7 @@ def test_exec():
     assert "success" not in out
     out = capture_cmd_output('fast exec "ls -a ~/"')
     assert "--> ls -a ~" in out
-    assert ".bashrc" in out
+    assert ".bash" in out
     home = os.path.expanduser("~")
     expected = capture_cmd_output(f"ls {home}")
     assert not (set(expected.splitlines()) - set(out.splitlines()))

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

@@ -82,7 +82,7 @@ def test_pypi_slim(tmp_work_dir, capsys):
     assert "upload-time" not in new_text
 
 
-def test_pypi_reverse(tmp_work_dir):
+def test_pypi_reverse(tmp_work_dir, mocker, capsys):
     origin_lock = ASSERTS_DIR / "uv-upload-time.lock"
     lock_file = Path("uv.lock")
     Path("pyproject.toml").touch()
@@ -94,16 +94,25 @@ def test_pypi_reverse(tmp_work_dir):
     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:
+    if not UvPypi.get_uv_config_file().exists():
         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:
+        pypi(reverse=True, verbose=True, quiet=True)
         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
+    # Check output for uv config file not exist case
+    mocker.patch(
+        "fast_dev_cli.cli.UvPypi.get_uv_config_file",
+        return_value=Path("not-exist-file"),
+    )
+    pypi(reverse=True, verbose=True, quiet=True)
+    assert (
+        "Skip register reverse as global uv config file not found."
+        in capsys.readouterr().out
+    )

{fast_dev_cli-0.20.0 → fast_dev_cli-0.21.0}/tests/test_sync.py

@@ -210,12 +210,12 @@ def test_sync_uv(mocker, tmp_path):
         toml.with_name("uv.lock").write_text(UV_LOCK_EXAMPLE)
         assert (
             Sync("req.txt", "", True, dry=True).gen()
-            == "uv export --no-hashes --all-extras --frozen -o req.txt && uv run python -m ensurepip && uv run python -m pip install -U pip && uv run python -m pip install -r req.txt"
+            == "uv export --no-hashes --all-extras --all-groups --frozen -o req.txt && uv run python -m ensurepip && uv run python -m pip install -U pip && uv run python -m pip install -r req.txt"
         )
         run_and_echo("uv run python -m ensurepip")
         assert (
             Sync("req.txt", "", True, dry=True).gen()
-            == "uv export --no-hashes --all-extras --frozen -o req.txt && uv run python -m pip install -r req.txt"
+            == "uv export --no-hashes --all-extras --all-groups --frozen -o req.txt && uv run python -m pip install -r req.txt"
         )
 
 

fast_dev_cli-0.20.0/fast_dev_cli/__init__.py

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