fast-dev-cli 0.6.6__tar.gz → 0.7.0__tar.gz

{fast_dev_cli-0.6.6 → fast_dev_cli-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.6.6
+Version: 0.7.0
 Summary: 
 Author: Waket Zheng
 Author-email: waketzheng@gmail.com
@@ -9,11 +9,9 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: all
-Requires-Dist: black (>=23.9.1) ; extra == "all"
 Requires-Dist: bumpversion (>=0.6.0,<0.7.0) ; extra == "all"
 Requires-Dist: click (>=7.1.1)
 Requires-Dist: coverage (>=6.5.0) ; extra == "all"
-Requires-Dist: isort (>=5.12.0) ; extra == "all"
 Requires-Dist: mypy (>=1.5.0) ; extra == "all"
 Requires-Dist: pytest (>=8.1.1,<9.0.0) ; extra == "all"
 Requires-Dist: ruff (>=0.3) ; extra == "all"

{fast_dev_cli-0.6.6 → fast_dev_cli-0.7.0}/fast_dev_cli/cli.py

@@ -246,7 +246,8 @@ class Project:
     def get_work_dir(
         cls: Type[Self], name=TOML_FILE, cwd: Path | None = None, allow_cwd=False
     ) -> Path:
-        if d := cls.work_dir(name, cwd or Path.cwd(), cls.path_depth):
+        cwd = cwd or Path.cwd()
+        if d := cls.work_dir(name, cwd, cls.path_depth):
             return d
         if allow_cwd:
             return cls.get_root_dir(cwd)
@@ -422,7 +423,7 @@ class UpgradeDependencies(Project, DryRun):
         return _upgrade
 
     def gen(self: Self) -> str:
-        return self.gen_cmd() + " && poetry update"
+        return self.gen_cmd() + " && poetry lock && poetry update"
 
 
 @cli.command()
@@ -487,36 +488,20 @@ class LintCode(DryRun):
 
     @staticmethod
     def check_lint_tool_installed() -> bool:
-        return check_call("black --version")
+        return check_call("ruff --version")
 
     @classmethod
     def to_cmd(cls: Type[Self], paths=".", check_only=False) -> str:
         cmd = ""
-        tools = ["isort --profile=black", "black", "ruff check --fix", "mypy"]
+        tools = ["ruff check --extend-select=I --fix", "ruff format", "mypy"]
         if check_only:
-            tools[0] += " --check-only"
-            tools[1] += " --check --fast"
+            tools[1] += " --check"
         if check_only or load_bool("NO_FIX"):
-            tools[2] = tools[2].replace(" --fix", "")
+            tools[0] = tools[0].replace(" --fix", "")
         if load_bool("SKIP_MYPY"):
             # Sometimes mypy is too slow
             tools = tools[:-1]
         lint_them = " && ".join("{0}{%d} {1}" % i for i in range(2, len(tools) + 2))
-        current_path = Path.cwd()
-        root = Project.get_work_dir(cwd=current_path, allow_cwd=True)
-        app_name = root.name.replace("-", "_")
-        if (app_dir := root / app_name).exists() or (app_dir := root / "app").exists():
-            if current_path == app_dir:
-                tools[0] += " --src=."
-            elif current_path == root:
-                tools[0] += f" --src={app_dir.name}"
-            else:
-                parents = "../"
-                for i, p in enumerate(current_path.parents):
-                    if p == root:
-                        parents *= i + 1
-                        break
-                tools[0] += f" --src={parents}{app_dir.name}"
         prefix = "poetry run "
         if is_venv():
             if cls.check_lint_tool_installed():
@@ -550,7 +535,7 @@ def make_style(
     check_only: bool = Option(False, "--check-only", "-c"),
     dry: bool = Option(False, "--dry", help="Only print, not really run shell command"),
 ) -> None:
-    """Run: isort+black+ruff to reformat code and then mypy to check"""
+    """Run: ruff check/format to reformat code and then mypy to check"""
     if isinstance(files, str):
         files = [files]
     if check_only:

{fast_dev_cli-0.6.6 → fast_dev_cli-0.7.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fast-dev-cli"
-version = "0.6.6"
+version = "0.7.0"
 description = ""
 authors = ["Waket Zheng <waketzheng@gmail.com>"]
 readme = "README.md"
@@ -9,8 +9,6 @@ packages = [{include = "fast_dev_cli"}]
 [tool.poetry.dependencies]
 python = "^3.11"
 click = ">=7.1.1"
-isort = {version = ">=5.12.0", optional = true}
-black = {version = ">=23.9.1", optional = true}
 ruff = {version = ">=0.3", optional = true}
 mypy = {version = ">=1.5.0", optional = true}
 coverage = {version = ">=6.5.0", optional = true}
@@ -19,11 +17,9 @@ pytest = {version = "^8.1.1", optional = true}
 typer = {version = ">=0.12.0", optional = true}
 
 [tool.poetry.extras]
-all = ["isort", "black", "ruff", "typer", "mypy", "bumpversion", "pytest", "coverage"]
+all = ["ruff", "typer", "mypy", "bumpversion", "pytest", "coverage"]
 
 [tool.poetry.group.dev.dependencies]
-isort = "*"
-black = "*"
 ruff = ">=0.3"
 mypy = "*"
 pytest = "*"
@@ -41,8 +37,8 @@ build-backend = "poetry.core.masonry.api"
 [tool.poetry.scripts]
 fast = "fast_dev_cli:cli"
 
-[tool.isort]
-profile = "black"
+[tool.ruff]
+target-version = "py311"
 
 [tool.mypy]
 pretty = true