crackerjack 0.7.36__py3-none-any.whl → 0.8.1__py3-none-any.whl

crackerjack/.pre-commit-config.yaml

@@ -16,13 +16,10 @@ repos:
         name: check-toml
       - id: check-added-large-files
         name: check-added-large-files
-  - repo: https://github.com/psf/black
-    rev: '24.4.2'
-    hooks:
-      - id: black
-  - repo: https://github.com/charliermarsh/ruff-pre-commit
+  - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.4.7
     hooks:
+      - id: ruff-format
       - id: ruff
   - repo: https://github.com/fredrikaverpil/creosote
     rev: v3.0.0
@@ -69,14 +66,11 @@ repos:
     rev: v1.1.365
     hooks:
       - id: pyright
-  - repo: https://github.com/charliermarsh/ruff-pre-commit
+  - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.4.7
     hooks:
       - id: ruff
-  - repo: https://github.com/psf/black
-    rev: '24.4.2'
-    hooks:
-      - id: black
+      - id: ruff-format
   #  - repo: https://github.com/pdoc3/pdoc
   #    rev: master
   #    hooks:

crackerjack/__main__.py

@@ -1,12 +1,11 @@
 import asyncio
 import typing as t
 
-from click import command
-from click import help_option
-from click import option
-from crackerjack import crackerjack_it
+from click import command, help_option, option
 from pydantic import BaseModel
 
+from crackerjack import crackerjack_it
+
 
 class Options(BaseModel):
     commit: bool = False

crackerjack/crackerjack.py

@@ -5,10 +5,8 @@ import typing as t
 from pathlib import Path
 from subprocess import run
 
-from acb.actions.encode import dump
-from acb.actions.encode import load
-from aioconsole import ainput
-from aioconsole import aprint
+from acb.actions.encode import dump, load
+from aioconsole import ainput, aprint
 from aiopath import AsyncPath
 from inflection import underscore
 from pydantic import BaseModel
@@ -121,7 +119,7 @@ class Crackerjack(BaseModel, arbitrary_types_allowed=True):
             run([str(self.config.git_path), "config", "advice.addIgnoredFile", "false"])
         await self.update_pyproject_configs()
 
-    async def process(self, options: t.Any) -> None:
+    async def load_config(self) -> None:
         await self.settings_path.touch(exist_ok=True)
         try:
             self.config = Config(**await load.yaml(self.settings_path))
@@ -129,6 +127,17 @@ class Crackerjack(BaseModel, arbitrary_types_allowed=True):
             self.config = Config()
             await dump.yaml(self.config.model_dump(), self.settings_path)
             raise SystemExit("\nPlease configure '.crackerjack.yaml' and try again\n")
+
+    async def run_pre_commit(self) -> None:
+        check_all = run([str(self.config.pre_commit_path), "run", "--all-files"])
+        if check_all.returncode > 0:
+            check_all = run([str(self.config.pre_commit_path), "run", "--all-files"])
+            if check_all.returncode > 0:
+                await aprint("\n\nPre-commit failed. Please fix errors.\n")
+                raise SystemExit()
+
+    async def process(self, options: t.Any) -> None:
+        await self.load_config()
         imp_dir = self.pkg_path / "__pypackages__" / self.config.python_version / "lib"
         sys.path.append(str(imp_dir))
         self.pkg_name = underscore(self.pkg_path.stem.lower())
@@ -143,12 +152,7 @@ class Crackerjack(BaseModel, arbitrary_types_allowed=True):
         if options.interactive:
             for hook in ("refurb", "bandit", "pyright"):
                 await self.run_interactive(hook)
-        check_all = run([str(self.config.pre_commit_path), "run", "--all-files"])
-        if check_all.returncode > 0:
-            check_all = run([str(self.config.pre_commit_path), "run", "--all-files"])
-            if check_all.returncode > 0:
-                await aprint("\n\nPre-commit failed. Please fix errors.\n")
-                raise SystemExit()
+        await self.run_pre_commit()
         for option in (options.publish, options.bump):
             if option:
                 run([str(self.config.pdm_path), "bump", option])

crackerjack/pyproject.toml

@@ -19,25 +19,30 @@ fix = true
 show-fixes = true
 output-format = "full"
 
+[tool.ruff.format]
+docstring-code-format = true
+
 [tool.ruff.lint]
 ignore = [
     "F821",
+    "D100",
+    "D101",
+    "D102",
+    "D103",
+    "D104",
+    "D105",
+    "D106",
+    "D107",
+]
+extend-select = [
+    "I",
+    "C901",
+    "D",
 ]
-
-[tool.ruff.lint.isort]
-force-single-line = true
-
-[tool.ruff.lint.mccabe]
-max-complexity = 10
 
 [tool.ruff.lint.pydocstyle]
 convention = "google"
 
-[tool.black]
-target-version = [
-    "py312",
-]
-
 [tool.creosote]
 paths = [
     "crackerjack",
@@ -84,7 +89,7 @@ pythonPlatform = "Darwin"
 
 [project]
 name = "Crackerjack"
-version = "0.7.35"
+version = "0.8.0"
 description = "Crackerjack code style"
 requires-python = ">=3.12"
 readme = "README.md"

{crackerjack-0.7.36.dist-info → crackerjack-0.8.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Crackerjack
-Version: 0.7.36
+Version: 0.8.1
 Summary: Crackerjack code style
 Keywords: black,ruff,mypy,creosote,refurb
 Home-page: https://github.com/lesleslie/crackerjack
@@ -39,6 +39,7 @@ Description-Content-Type: text/markdown
 # Crackerjack Python
 
 [![Python: 3.12](https://img.shields.io/badge/python-3.12%2B-blue)](https://docs.python.org/3/)
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
 [![Checked with pyright](https://microsoft.github.io/pyright/img/pyright_badge.svg)](https://microsoft.github.io/pyright/)
 [![pdm-managed](https://img.shields.io/badge/pdm-managed-blueviolet)](https://pdm.fming.dev)
@@ -98,7 +99,6 @@ This package:
 - runs the following pre-commit hooks (in order):
   * [pdm-lock-check](https://github.com/pdm-project/pdm)
   * various core [pre-commit-hooks](https://github.com/pre-commit/pre-commit-hooks)
-  * [black](https://github.com/psf/black)
   * [ruff](https://github.com/charliermarsh/ruff-pre-commit)
   * [creosote](https://github.com/fredrikaverpil/creosote)
   * [flynt](https://github.com/ikamensh/flynt/)
@@ -107,8 +107,7 @@ This package:
   * [refurb](https://github.com/dosisod/refurb)
   * [bandit](https://github.com/PyCQA/bandit)
   * [pyright](https://github.com/RobertCraigie/pyright-python)
-  * ruff (again for sanity checking)
-  * black (again for sanity checking)
+  * [ruff](https://github.com/charliermarsh/ruff-pre-commit) (again for sanity checking)
 
 - converts/creates documentation in Markdown (md) (work in progress)
 
@@ -126,8 +125,6 @@ This package:
 
 - all docstrings, README's, and other documentation is to be done in Markdown (md)
 
-- format with black
-
 - use aiopath.AsyncPath or pathlib.Path not os.path
 
 - import typing as t
@@ -137,8 +134,6 @@ This package:
 
 - functions that deal with path operations should get passed AsyncPaths or Paths - not strings
 
-- force single line imports (will support isort Vertical Hanging Indent when ruff does)
-
 - use PDM and PEP-582(proposed) for dependency management and package building/publishing
 
 - use pdoc and mkdocs for producing documentation

{crackerjack-0.7.36.dist-info → crackerjack-0.8.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
-crackerjack-0.7.36.dist-info/METADATA,sha256=s24TO8WWaUBO7RjDVUPq_WoDf5tDzGgDASuw_DpfywY,7742
-crackerjack-0.7.36.dist-info/WHEEL,sha256=vnE8JVcI2Wz7GRKorsPArnBdnW2SWKWGow5gu5tHlRU,90
-crackerjack-0.7.36.dist-info/licenses/LICENSE,sha256=fDt371P6_6sCu7RyqiZH_AhT1LdN3sN1zjBtqEhDYCk,1531
+crackerjack-0.8.1.dist-info/METADATA,sha256=Q717NRC-wsQc1kx55v3Fyfb1K-2ZT7joZYgFVxtmG7I,7760
+crackerjack-0.8.1.dist-info/WHEEL,sha256=vnE8JVcI2Wz7GRKorsPArnBdnW2SWKWGow5gu5tHlRU,90
+crackerjack-0.8.1.dist-info/licenses/LICENSE,sha256=fDt371P6_6sCu7RyqiZH_AhT1LdN3sN1zjBtqEhDYCk,1531
 crackerjack/.gitignore,sha256=aJ2x3-AcCEcaW_quI-j8RtOUcTqGNoLJGMq8mZ3lTrA,197
 crackerjack/.libcst.codemod.yaml,sha256=TLE_I07llPTYk_tm36z-hN15O3X27qztNdJ3Ev9ODMk,768
-crackerjack/.pre-commit-config.yaml,sha256=CtNeIf_jFp4HNFlDCYJ5Ycf4qTFrtVveOiIl54VbIGA,2396
+crackerjack/.pre-commit-config.yaml,sha256=GgKMGwkKt_OtYNE2UpQ-hXXHkJTO-viRKJY2gYdv4GE,2264
 crackerjack/.ruff_cache/.gitignore,sha256=aEiIwOuxfzdCmLZe4oB1JsBmCUxwG8x-u-HBCV9JT8E,1
 crackerjack/.ruff_cache/0.1.11/3256171999636029978,sha256=-RLDsRf5uj09SyFQVzjwQ1HkTxjIRxNLLE24SEJxD4g,248
 crackerjack/.ruff_cache/0.1.14/602324811142551221,sha256=HIYvldb69IHdMzquAA8JpzU2RDT9shEB_dPvzyeFZ_g,248
@@ -20,7 +20,7 @@ crackerjack/.ruff_cache/0.3.4/676973378459347183,sha256=qQXG3ByXNuDvpqAhrhjcQVJY
 crackerjack/.ruff_cache/0.3.5/16311176246009842383,sha256=1jdzqow8vaK7V6TGKnAFbiL-JUeOUjP8XgYifP1Tg5s,248
 crackerjack/.ruff_cache/CACHEDIR.TAG,sha256=WVMVbX4MVkpCclExbq8m-IcOZIOuIZf5FrYw5Pk-Ma4,43
 crackerjack/__init__.py,sha256=AuglbbJHkUJ2GdvyT0ca35ntexo1RkT2V6DgypoFeEk,121
-crackerjack/__main__.py,sha256=hsMAXG2BglqSaHsVd8Vsyh7Mb5dHcLjvBy4ofgo0NyY,1800
-crackerjack/crackerjack.py,sha256=Zqg0h_Dyw2X_sCLDwOdH8V3ORNb9a989lmzN2TRU85U,7802
-crackerjack/pyproject.toml,sha256=Uhuq1AMtTAiiKXIAN-3wuJVd6_wF1y7f6cHtWJdWEXQ,2747
-crackerjack-0.7.36.dist-info/RECORD,,
+crackerjack/__main__.py,sha256=KF-AnEzQgY18ijVQsX11f8BgiWnfCEIqhn_URddKDec,1767
+crackerjack/crackerjack.py,sha256=jYzZLsqUYZWaLhe9RG375Y6Ij5jDCWg_Km8gLsEX2Iw,7906
+crackerjack/pyproject.toml,sha256=MJNkWXS_GUfL7wkh8Nh_TWFgBcvO-nF6W7mAQP6WmzQ,2799
+crackerjack-0.8.1.dist-info/RECORD,,