Skip to content

Address DeprecationWarning-s for pyparsing functions #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NoureldinYosri merged 2 commits into from
Jan 5, 2026
Merged

Address DeprecationWarning-s for pyparsing functions #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67b5a9d
Address DeprecationWarning-s for pyparsing functions
pavoljuhas Jan 5, 2026
f9ff8bd
Address mypy complaint about implicit optional argument
pavoljuhas Jan 5, 2026
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
2 changes: 1 addition & 1 deletion tunits/core/__init__.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ class ValueArray(Generic[ValueType2], WithUnit):
def __init__(self, data: Any, unit: Any = None) -> None: ...
def allclose(self, other: ValueArray | Value, *args: Any, **kwargs: float) -> bool: ...
def unique(self: ArrayType) -> ArrayType: ...
def __array__(self, dtype: DTypeLike = None) -> NDArray[Any]: ...
def __array__(self, dtype: DTypeLike | None = None) -> NDArray[Any]: ...
def __array_wrap__(self, out_arr: NDArray[Any], context: Any = None) -> NDArray[Any]: ...
def __copy__(self: ArrayType) -> ArrayType: ...
def __deepcopy__(self: ArrayType) -> ArrayType: ...
Expand Down
2 changes: 1 addition & 1 deletion tunits/core/cython/unit_database.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class UnitDatabase:
"""
if formula in self.known_units:
return self.known_units[formula]
parsed = unit_regex.parseString(formula)
parsed = unit_regex.parse_string(formula)
result = Value(parsed.factor or 1)
for item in parsed.posexp:
result *= self._parse_unit_item(item, +1, auto_create)
Expand Down
10 changes: 5 additions & 5 deletions tunits/core/cython/unit_grammar.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,18 @@ scalar_combine = Combine(
+ Optional('.' + Optional(Word(nums)))
+ Optional('e' + Word('+-' + nums, nums))
)
scalar = scalar_combine.setParseAction(lambda s, l, t: [float(t[0])])('factor')
scalar = scalar_combine.set_parse_action(lambda s, l, t: [float(t[0])])('factor')

number = Word(nums).setParseAction(lambda s, l, t: [int(t[0])])
number = Word(nums).set_parse_action(lambda s, l, t: [int(t[0])])
name = Word(alphas, alphanums)

negatable = Optional(Literal('-'))('neg')
exponent = _maybe_parens(negatable + _maybe_parens(number('num') + Optional('/' + number('denom'))))

single_unit = name('name') + Optional('^' + exponent)
head = Group(single_unit).setResultsName('posexp', True)
times_unit = Group('*' + single_unit).setResultsName('posexp', True)
over_unit = Group('/' + single_unit).setResultsName('negexp', True)
head = Group(single_unit).set_results_name('posexp', True)
times_unit = Group('*' + single_unit).set_results_name('posexp', True)
over_unit = Group('/' + single_unit).set_results_name('negexp', True)

unit_regex = (
stringStart
Expand Down
Loading