Skip to content

Bugfix/regex arithmetic #248

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
CoryMartin-NOAA merged 3 commits into from
Aug 28, 2025
Merged

Bugfix/regex arithmetic #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
668c94b
use full words in regex
Dooruk Aug 28, 2025
be28655
fix GMAO requirements
Dooruk Aug 28, 2025
de4eb65
safety
Dooruk Aug 28, 2025
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
8 changes: 4 additions & 4 deletions requirements_sles15.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
setuptools>=59.4.0
pyyaml>=6.0
pycodestyle>=2.8.0
pycodestyle>=2.11.0
netCDF4
matplotlib
cartopy>=0.21.1
scipy>=1.9.3
xarray>=2022.3.0
pandas>=1.4.0
numpy==1.22.3
attrs==21.4.0
numpy<2
attrs

# Not explicitly part of eva but dependcies of eva dependencies already in spack-stack
# versions need to be set to avoid other versions being picked
pyproj
importlib_metadata==7.1.0
contourpy==1.0.7
contourpy
msgpack>=1.0.0

# Additional packages
Expand Down
2 changes: 1 addition & 1 deletion src/eva/transforms/arithmetic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def arithmetic(config, data_collections):
regex_string = r'\(|\)|-|\*|\+|\/|,'
# add defined functions the user may apply
for fname in defined_functions:
regex_string += '|{}'.format(fname)
regex_string += r'|\b{}\b'.format(re.escape(fname))
expression_elements = re.split(regex_string, expression)

# Remove empty elements and duplicates from expression elements
Expand Down