[gemma4] make pytest and linters happy

pyproject.toml

@@ -11,7 +11,7 @@ dependencies = [
 ]
 requires-python = ">= 3.11"
 
-[project.optional-dependencies]
+[dependency-groups]
 dev = [
     "black",
     "mypy",
@@ -30,14 +30,15 @@ requires = [
 skillls = "skillls.main:main"
 
 
-[tools.black]
+[tool.black]
 line-length = 100
 target-version = "py311"
 include = "skillls"
 
-[tools.ruff]
+[tool.ruff]
 line-length = 100
-include = ['ALL']
+target-version = "py311"
+include = ["pyproject.toml", "skillls/**/*.py"]
 
 [tool.uv.sources]
 tree-sitter-skill = { git = "ssh://git@git.acereca.net/acereca/tree-sitter-skill.git" }

skillls/checker.py

@@ -1,9 +1,8 @@
 from dataclasses import dataclass
-from enum import Enum, auto
+from enum import Enum
 
-from lsprotocol.types import Location, Position, Range
+from lsprotocol.types import Position, Range
 
-from skillls.types import URI
 
 
 class SyntaxError(Exception):
@@ -28,7 +27,6 @@ def _check_for_matching_parens(content: str) -> list[Exception]:
     line = 0
     col = 0
     last_open: Position = Position(0, 0)
-    last_close: Position = Position(0, 0)
     for char in content:
         match char:
             case "(":
@@ -45,7 +43,6 @@ def _check_for_matching_parens(content: str) -> list[Exception]:
                         )
                     )
                     opened = 0
-                last_close = Position(line, col)
             case "\n":
                 line += 1
                 col = -1

skillls/helpers.py

@@ -9,7 +9,7 @@ from re import MULTILINE, compile as recompile, finditer
 from pygls.workspace import TextDocument
 
 from skillls.checker import check_content_for_errors
-from skillls.types import URI, Node, NodeKind
+from skillls.types import Node, NodeKind
 
 logger = getLogger(__name__)
 

skillls/types.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from enum import Enum, auto
+from enum import Enum
 from lsprotocol.types import DocumentSymbol, Range, SymbolKind
 
 URI = str

uv.lock

@@ -344,7 +344,7 @@ dependencies = [
     { name = "tree-sitter-skill" },
 ]
 
-[package.optional-dependencies]
+[package.dev-dependencies]
 dev = [
     { name = "black" },
     { name = "mypy" },
@@ -355,18 +355,21 @@ dev = [
 
 [package.metadata]
 requires-dist = [
-    { name = "black", marker = "extra == 'dev'" },
-    { name = "mypy", marker = "extra == 'dev'" },
     { name = "parsimonious", specifier = "~=0.10.0" },
     { name = "pygls", specifier = "~=2.0" },
-    { name = "pytest", marker = "extra == 'dev'" },
     { name = "rich" },
-    { name = "ruff", marker = "extra == 'dev'" },
     { name = "tree-sitter", specifier = ">=0.24.0" },
-    { name = "tree-sitter-skill", directory = "../tree-sitter-skill" },
-    { name = "types-parsimonious", marker = "extra == 'dev'" },
+    { name = "tree-sitter-skill", git = "ssh://git@git.acereca.net/acereca/tree-sitter-skill.git" },
+]
+
+[package.metadata.requires-dev]
+dev = [
+    { name = "black" },
+    { name = "mypy" },
+    { name = "pytest" },
+    { name = "ruff" },
+    { name = "types-parsimonious" },
 ]
-provides-extras = ["dev"]
 
 [[package]]
 name = "tree-sitter"
@@ -400,14 +403,11 @@ wheels = [
 [[package]]
 name = "tree-sitter-skill"
 version = "0.1.4"
-source = { directory = "../tree-sitter-skill" }
+source = { git = "ssh://git@git.acereca.net/acereca/tree-sitter-skill.git#854d43328ede7077b1944ef4095c2c8f519369bb" }
 dependencies = [
     { name = "tree-sitter" },
 ]
 
-[package.metadata]
-requires-dist = [{ name = "tree-sitter", specifier = "~=0.24" }]
-
 [[package]]
 name = "types-parsimonious"
 version = "0.10.0.20240331"