Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ci:

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: "v5.0.0"
rev: "v6.0.0"
hooks:
- id: check-case-conflict
- id: check-executables-have-shebangs
Expand All @@ -21,26 +21,26 @@ repos:
- id: requirements-txt-fixer
- id: trailing-whitespace

- repo: https://github.com/psf/black
rev: "25.1.0"
- repo: https://github.com/psf/black-pre-commit-mirror
rev: "25.12.0"
hooks:
- id: black-jupyter
args: ["--line-length", "100"]

- repo: https://github.com/asottile/blacken-docs
rev: "1.19.1"
rev: "1.20.0"
hooks:
- id: blacken-docs
additional_dependencies: [black==23.3.0]

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: "v0.12.2"
rev: "v0.14.10"
hooks:
- id: ruff
args: ["--fix", "--show-fixes"]

- repo: https://github.com/mgedmin/check-manifest
rev: "0.50"
rev: "0.51"
hooks:
- id: check-manifest
stages: [manual]
Expand All @@ -65,7 +65,7 @@ repos:
- id: rst-inline-touching-normal

- repo: https://github.com/shellcheck-py/shellcheck-py
rev: "v0.10.0.1"
rev: "v0.11.0.1"
hooks:
- id: shellcheck

Expand All @@ -76,7 +76,7 @@ repos:
types_or: [yaml, markdown, html, css, scss, javascript, json]

- repo: https://github.com/kynan/nbstripout
rev: "0.8.1"
rev: "0.8.2"
hooks:
- id: nbstripout
args:
Expand All @@ -87,7 +87,7 @@ repos:
]

- repo: https://github.com/pre-commit/mirrors-clang-format
rev: "v20.1.7"
rev: "v21.1.8"
hooks:
- id: clang-format
types_or: [c++, c, cuda]
10 changes: 5 additions & 5 deletions src/pyg4ometry/fluka/RegionExpression/RegionParser.py
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,7 @@ def __init__(self, parser, parent: ParserRuleContext = None, invokingState: int
super().__init__(parent, invokingState)
self.parser = parser

def region(self, i: Optional[int] = None):
def region(self, i: int | None = None):
if i is None:
return self.getTypedRuleContexts(RegionParser.RegionContext)
else:
Expand Down Expand Up @@ -994,13 +994,13 @@ def __init__(
super().__init__(parser)
self.copyFrom(ctx)

def zone(self, i: Optional[int] = None):
def zone(self, i: int | None = None):
if i is None:
return self.getTypedRuleContexts(RegionParser.ZoneContext)
else:
return self.getTypedRuleContext(RegionParser.ZoneContext, i)

def Bar(self, i: Optional[int] = None):
def Bar(self, i: int | None = None):
if i is None:
return self.getTokens(RegionParser.Bar)
else:
Expand All @@ -1019,13 +1019,13 @@ def __init__(
super().__init__(parser)
self.copyFrom(ctx)

def Bar(self, i: Optional[int] = None):
def Bar(self, i: int | None = None):
if i is None:
return self.getTokens(RegionParser.Bar)
else:
return self.getToken(RegionParser.Bar, i)

def zone(self, i: Optional[int] = None):
def zone(self, i: int | None = None):
if i is None:
return self.getTypedRuleContexts(RegionParser.ZoneContext)
else:
Expand Down
22 changes: 11 additions & 11 deletions src/pyg4ometry/gdml/GdmlExpression/GdmlExpressionParser.py
Original file line number Diff line number Diff line change
Expand Up @@ -1158,7 +1158,7 @@ def __init__(self, parser, parent: ParserRuleContext = None, invokingState: int
super().__init__(parent, invokingState)
self.parser = parser

def expression(self, i: Optional[int] = None):
def expression(self, i: int | None = None):
if i is None:
return self.getTypedRuleContexts(GdmlExpressionParser.ExpressionContext)
else:
Expand Down Expand Up @@ -1202,15 +1202,15 @@ def __init__(self, parser, parent: ParserRuleContext = None, invokingState: int
super().__init__(parent, invokingState)
self.parser = parser

def multiplyingExpression(self, i: Optional[int] = None):
def multiplyingExpression(self, i: int | None = None):
if i is None:
return self.getTypedRuleContexts(GdmlExpressionParser.MultiplyingExpressionContext)
else:
return self.getTypedRuleContext(
GdmlExpressionParser.MultiplyingExpressionContext, i
)

def operatorAddSub(self, i: Optional[int] = None):
def operatorAddSub(self, i: int | None = None):
if i is None:
return self.getTypedRuleContexts(GdmlExpressionParser.OperatorAddSubContext)
else:
Expand Down Expand Up @@ -1260,13 +1260,13 @@ def __init__(self, parser, parent: ParserRuleContext = None, invokingState: int
super().__init__(parent, invokingState)
self.parser = parser

def powExpression(self, i: Optional[int] = None):
def powExpression(self, i: int | None = None):
if i is None:
return self.getTypedRuleContexts(GdmlExpressionParser.PowExpressionContext)
else:
return self.getTypedRuleContext(GdmlExpressionParser.PowExpressionContext, i)

def operatorMulDiv(self, i: Optional[int] = None):
def operatorMulDiv(self, i: int | None = None):
if i is None:
return self.getTypedRuleContexts(GdmlExpressionParser.OperatorMulDivContext)
else:
Expand Down Expand Up @@ -1402,13 +1402,13 @@ def __init__(self, parser, parent: ParserRuleContext = None, invokingState: int
super().__init__(parent, invokingState)
self.parser = parser

def signedAtom(self, i: Optional[int] = None):
def signedAtom(self, i: int | None = None):
if i is None:
return self.getTypedRuleContexts(GdmlExpressionParser.SignedAtomContext)
else:
return self.getTypedRuleContext(GdmlExpressionParser.SignedAtomContext, i)

def POW(self, i: Optional[int] = None):
def POW(self, i: int | None = None):
if i is None:
return self.getTokens(GdmlExpressionParser.POW)
else:
Expand Down Expand Up @@ -1648,7 +1648,7 @@ def variable(self):
def LBRACKET(self):
return self.getToken(GdmlExpressionParser.LBRACKET, 0)

def expression(self, i: Optional[int] = None):
def expression(self, i: int | None = None):
if i is None:
return self.getTypedRuleContexts(GdmlExpressionParser.ExpressionContext)
else:
Expand All @@ -1657,7 +1657,7 @@ def expression(self, i: Optional[int] = None):
def RBRACKET(self):
return self.getToken(GdmlExpressionParser.RBRACKET, 0)

def COMMA(self, i: Optional[int] = None):
def COMMA(self, i: int | None = None):
if i is None:
return self.getTokens(GdmlExpressionParser.COMMA)
else:
Expand Down Expand Up @@ -1799,7 +1799,7 @@ def funcname(self):
def LPAREN(self):
return self.getToken(GdmlExpressionParser.LPAREN, 0)

def expression(self, i: Optional[int] = None):
def expression(self, i: int | None = None):
if i is None:
return self.getTypedRuleContexts(GdmlExpressionParser.ExpressionContext)
else:
Expand All @@ -1808,7 +1808,7 @@ def expression(self, i: Optional[int] = None):
def RPAREN(self):
return self.getToken(GdmlExpressionParser.RPAREN, 0)

def COMMA(self, i: Optional[int] = None):
def COMMA(self, i: int | None = None):
if i is None:
return self.getTokens(GdmlExpressionParser.COMMA)
else:
Expand Down
Loading