From 668c94be6d8238360199d3d409dd6b3acbbb5353 Mon Sep 17 00:00:00 2001 From: dooruk Date: Thu, 28 Aug 2025 12:02:31 -0400 Subject: [PATCH 1/3] use full words in regex --- src/eva/transforms/arithmetic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/eva/transforms/arithmetic.py b/src/eva/transforms/arithmetic.py index 569a1664..214b33b5 100644 --- a/src/eva/transforms/arithmetic.py +++ b/src/eva/transforms/arithmetic.py @@ -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(fname) expression_elements = re.split(regex_string, expression) # Remove empty elements and duplicates from expression elements From be28655e055dfcb0e9fe37f0badb0b762e45704e Mon Sep 17 00:00:00 2001 From: dooruk Date: Thu, 28 Aug 2025 12:05:31 -0400 Subject: [PATCH 2/3] fix GMAO requirements --- requirements_sles15.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements_sles15.txt b/requirements_sles15.txt index 52dfb8e6..39ce5a93 100644 --- a/requirements_sles15.txt +++ b/requirements_sles15.txt @@ -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 From de4eb65a0ad50633c94418cf690d72230ceece29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Doruk=20Arda=C4=9F?= <38666458+Dooruk@users.noreply.github.com> Date: Thu, 28 Aug 2025 12:14:42 -0400 Subject: [PATCH 3/3] safety Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/eva/transforms/arithmetic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/eva/transforms/arithmetic.py b/src/eva/transforms/arithmetic.py index 214b33b5..fe13e172 100644 --- a/src/eva/transforms/arithmetic.py +++ b/src/eva/transforms/arithmetic.py @@ -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 += r'|\b{}\b'.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