crackerjack 0.13.0__tar.gz → 0.13.2__tar.gz

{crackerjack-0.13.0 → crackerjack-0.13.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: crackerjack
-Version: 0.13.0
+Version: 0.13.2
 Summary: Default template for PDM package
 Keywords: black,ruff,mypy,creosote,refurb
 Author-Email: lesleslie <les@wedgwoodwebworks.com>

{crackerjack-0.13.0 → crackerjack-0.13.2}/crackerjack/crackerjack.py

@@ -66,11 +66,10 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
             comment_start = comment_match.start()
             code_part = line[:comment_start].rstrip()
             comment = line[comment_start:].strip()
-            if code_part:
-                if re.match("^#(?: type: ignore| noqa)(.*)?$", comment):
-                    cleaned_lines.append(line)
-                else:
-                    cleaned_lines.append(code_part)
+            if re.match("^#\\s*(?:type: ignore|noqa)(?:\\[[^\\]]*\\])?", comment):
+                cleaned_lines.append(line)
+            elif code_part:
+                cleaned_lines.append(code_part)
         return "\n".join(cleaned_lines)
 
     def remove_extra_whitespace(self, code: str) -> str:

{crackerjack-0.13.0 → crackerjack-0.13.2}/crackerjack/pyproject.toml

@@ -114,13 +114,13 @@ reportUnknownArgumentType = false
 reportInvalidTypeForm = false
 reportUnknownLambdaType = false
 reportUnknownParameterType = "warning"
-reportPrivateUsage = "warning"
+reportPrivateUsage = false
 pythonVersion = "3.13"
 pythonPlatform = "Darwin"
 
 [project]
 name = "crackerjack"
-version = "0.12.1"
+version = "0.13.1"
 description = "Default template for PDM package"
 requires-python = ">=3.13"
 readme = "README.md"

{crackerjack-0.13.0 → crackerjack-0.13.2}/pyproject.toml

@@ -118,13 +118,13 @@ reportUnknownArgumentType = false
 reportInvalidTypeForm = false
 reportUnknownLambdaType = false
 reportUnknownParameterType = "warning"
-reportPrivateUsage = "warning"
+reportPrivateUsage = false
 pythonVersion = "3.13"
 pythonPlatform = "Darwin"
 
 [project]
 name = "crackerjack"
-version = "0.13.0"
+version = "0.13.2"
 description = "Default template for PDM package"
 requires-python = ">=3.13"
 readme = "README.md"

crackerjack-0.13.2/tests/data/comments_sample.txt

@@ -0,0 +1,10 @@
+def test_func():
+    # This comment should be removed
+    return True  # remove this inline comment
+
+    async def load_bytecode(self, bucket: Bucket) -> t.Optional[bytes]:  # type: ignore[override]
+        code = await self.client.get(self.get_bucket_name(bucket.key))  # type: ignore
+
+# Full line comment
+x = 1  # type: ignore
+y = 2  # noqa

crackerjack-0.13.2/tests/data/expected_comments_sample.txt

@@ -0,0 +1,8 @@
+def test_func():
+    return True
+
+    async def load_bytecode(self, bucket: Bucket) -> t.Optional[bytes]:  # type: ignore[override]
+        code = await self.client.get(self.get_bucket_name(bucket.key))  # type: ignore
+
+x = 1  # type: ignore
+y = 2  # noqa

{crackerjack-0.13.0 → crackerjack-0.13.2}/tests/test_crackerjack.py

@@ -905,6 +905,7 @@ class TestCrackerjackProcess:
         assert '"""Method docstring."""' not in cleaned_code, f"Got: {cleaned_code!r}"
 
     def test_code_cleaner_remove_line_comments(self) -> None:
+        from pathlib import Path
         from rich.console import Console
         from crackerjack.crackerjack import CodeCleaner
 
@@ -913,18 +914,12 @@ class TestCrackerjackProcess:
             Path(__file__).parent / "data" / "comments_sample.txt"
         ).read_text()
         cleaned_code = code_cleaner.remove_line_comments(code_with_comments)
-        assert "x = 1  # type: ignore" in cleaned_code, f"Got: {cleaned_code!r}"
-        assert "y = 2  # noqa" in cleaned_code, f"Got: {cleaned_code!r}"
-        assert "# This comment should be removed" not in cleaned_code, (
-            f"Got: {cleaned_code!r}"
-        )
-        assert "# remove this inline comment" not in cleaned_code, (
-            f"Got: {cleaned_code!r}"
+        expected_cleaned = (
+            Path(__file__).parent / "data" / "expected_comments_sample.txt"
+        ).read_text()
+        assert cleaned_code == expected_cleaned, (
+            f"Cleaned code does not match expected.\nExpected:\n{expected_cleaned}\nGot:\n{cleaned_code}"
         )
-        assert (
-            "def test_func():\n    return True\n\nx = 1  # type: ignore\ny = 2  # noqa\n"
-            in cleaned_code
-        ), f"Got: {cleaned_code!r}"
 
     def test_code_cleaner_remove_extra_whitespace(self) -> None:
         from rich.console import Console

crackerjack-0.13.0/tests/data/comments_sample.txt

@@ -1,7 +0,0 @@
-def test_func():
-    # This comment should be removed
-    return True  # remove this inline comment
-
-# Full line comment
-x = 1  # type: ignore
-y = 2  # noqa