From 7c0d9b60ca8b60cf7b6c581d877d0e4fc7cd4ae8 Mon Sep 17 00:00:00 2001
From: dbeltran <daniel.beltran@bsc.es>
Date: Fri, 24 Mar 2023 14:34:22 +0100
Subject: [PATCH 1/4] small fixes

---
 autosubmit/autosubmit.py |  2 +-
 autosubmit/job/job.py    | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/autosubmit/autosubmit.py b/autosubmit/autosubmit.py
index dd18b69ed..9c2d89356 100644
--- a/autosubmit/autosubmit.py
+++ b/autosubmit/autosubmit.py
@@ -3909,7 +3909,7 @@ class Autosubmit:
                 shutil.copyfile(template_path, backup_path)
             template_content = open(template_path, 'r', encoding=locale.getlocale()[1]).read()
             # Look for %_%
-            variables = re.findall('%(?<!%%)[a-zA-Z0-9_.]+%(?!%%)', template_content)
+            variables = re.findall('%(?<!%%)[a-zA-Z0-9_.]+%(?!%%)', template_content,flags=re.IGNORECASE)
             variables = [variable[1:-1].upper() for variable in variables]
             results = {}
             # Change format
diff --git a/autosubmit/job/job.py b/autosubmit/job/job.py
index ecb7889ba..070062c1b 100644
--- a/autosubmit/job/job.py
+++ b/autosubmit/job/job.py
@@ -1133,7 +1133,7 @@ class Job(object):
             parameters['CHUNK_SECOND_TO_LAST_HOUR'] = str(chunk_end_1.hour).zfill(2)
 
             parameters['CHUNK_END_DATE'] = date2str(
-                chunk_end_1, self.date_format)
+                chunk_end, self.date_format)
             parameters['CHUNK_END_YEAR'] = str(chunk_end.year)
             parameters['CHUNK_END_MONTH'] = str(chunk_end.month).zfill(2)
             parameters['CHUNK_END_DAY'] = str(chunk_end.day).zfill(2)
@@ -1142,14 +1142,14 @@ class Job(object):
             parameters['PREV'] = str(subs_dates(self.date, chunk_start, cal))
 
             if chunk == 1:
-                parameters['Chunk_FIRST'] = 'TRUE'
+                parameters['CHUNK_FIRST'] = 'TRUE'
             else:
-                parameters['Chunk_FIRST'] = 'FALSE'
+                parameters['CHUNK_FIRST'] = 'FALSE'
 
             if total_chunk == chunk:
-                parameters['Chunk_LAST'] = 'TRUE'
+                parameters['CHUNK_LAST'] = 'TRUE'
             else:
-                parameters['Chunk_LAST'] = 'FALSE'
+                parameters['CHUNK_LAST'] = 'FALSE'
         parameters['NUMMEMBERS'] = len(as_conf.get_member_list())
         parameters['DEPENDENCIES'] = str(as_conf.jobs_data[self.section].get("DEPENDENCIES",""))
         # This shouldn't be necessary anymore as now all sub is done in the as_conf.reload()
@@ -1187,6 +1187,7 @@ class Job(object):
         chunk = 1
         as_conf.reload()
         parameters = parameters.copy()
+        parameters.update(as_conf.parameters)
         parameters.update(default_parameters)
         parameters = as_conf.substitute_dynamic_variables(parameters,25)
         parameters['ROOTDIR'] = os.path.join(
@@ -1197,6 +1198,7 @@ class Job(object):
         parameters = self.update_platform_associated_parameters(as_conf, parameters, self._platform, parameters['CHUNK'])
         parameters = self.update_wrapper_parameters(as_conf, parameters)
         parameters = as_conf.substitute_dynamic_variables(parameters,25)
+        parameters = as_conf.normalize_parameters_keys(parameters,default_parameters)
         # For some reason, there is return but the assignee is also necessary
         self.parameters = parameters
         # This returns is only being used by the mock , to change the mock
@@ -1399,11 +1401,11 @@ class Job(object):
         parameters = self.update_parameters(as_conf, parameters)
         template_content,additional_templates = self.update_content(as_conf)
         if template_content is not False:
-            variables = re.findall('%(?<!%%)[a-zA-Z0-9_.]+%(?!%%)', template_content)
+            variables = re.findall('%(?<!%%)[a-zA-Z0-9_.]+%(?!%%)', template_content,flags=re.IGNORECASE)
             variables = [variable[1:-1] for variable in variables]
             variables = [variable for variable in variables if variable not in self.default_parameters]
             for template in additional_templates:
-                variables_tmp = re.findall('%(?<!%%)[a-zA-Z0-9_.]+%(?!%%)', template)
+                variables_tmp = re.findall('%(?<!%%)[a-zA-Z0-9_.]+%(?!%%)', template,flags=re.IGNORECASE)
                 variables_tmp = [variable[1:-1] for variable in variables_tmp]
                 variables_tmp = [variable for variable in variables_tmp if variable not in self.default_parameters]
                 variables.extend(variables_tmp)
-- 
GitLab


From b2d19fb6dd46e8dffecb8d626f26648ccffd2249 Mon Sep 17 00:00:00 2001
From: dbeltran <daniel.beltran@bsc.es>
Date: Fri, 24 Mar 2023 14:49:42 +0100
Subject: [PATCH 2/4] pipeline

---
 test/unit/test_job.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/unit/test_job.py b/test/unit/test_job.py
index 5982ac6be..31702a9c7 100644
--- a/test/unit/test_job.py
+++ b/test/unit/test_job.py
@@ -289,10 +289,15 @@ class TestJob(TestCase):
         dummy_platform = MagicMock()
         dummy_platform.serial_platform = dummy_serial_platform
         self.as_conf.substitute_dynamic_variables = MagicMock()
-        self.as_conf.substitute_dynamic_variables.return_value = {'d': '%d%', 'd_': '%d_%', 'Y': '%Y%', 'Y_': '%Y_%',
+        default = {'d': '%d%', 'd_': '%d_%', 'Y': '%Y%', 'Y_': '%Y_%',
                                               'M': '%M%', 'M_': '%M_%', 'm': '%m%', 'm_': '%m_%'}
+        self.as_conf.substitute_dynamic_variables.return_value = default
         dummy_platform.custom_directives = '["whatever"]'
         self.as_conf.dynamic_variables = MagicMock()
+        self.as_conf.parameters = MagicMock()
+        self.as_conf.return_value = {}
+        self.as_conf.normalize_parameters_keys = MagicMock()
+        self.as_conf.normalize_parameters_keys.return_value = default
         self.job._platform = dummy_platform
         parameters = {}
         # Act
-- 
GitLab


From 5c5548e92e0d1aaae3737fee5eb1a73e5db6b2b1 Mon Sep 17 00:00:00 2001
From: dbeltran <daniel.beltran@bsc.es>
Date: Fri, 24 Mar 2023 14:53:14 +0100
Subject: [PATCH 3/4] autosubmitconfigparser version to 1.0.24

---
 environment.yml  | 2 +-
 requeriments.txt | 2 +-
 setup.py         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/environment.yml b/environment.yml
index 31128274d..64d7ba14d 100644
--- a/environment.yml
+++ b/environment.yml
@@ -19,7 +19,7 @@ dependencies:
 - networkx
 - sqlite
 - pip:
-  - autosubmitconfigparser==1.0.22
+  - autosubmitconfigparser==1.0.24
   - argparse>=1.4.0
   - bcrypt>=3.2.0
   - python-dateutil>=2.8.2
diff --git a/requeriments.txt b/requeriments.txt
index f612dafd5..cec2b668d 100644
--- a/requeriments.txt
+++ b/requeriments.txt
@@ -1,4 +1,4 @@
-autosubmitconfigparser==1.0.22
+autosubmitconfigparser==1.0.24
 paramiko>=2.9.2
 bcrypt>=3.2
 PyNaCl>=1.5.0
diff --git a/setup.py b/setup.py
index aada781fa..16579c198 100644
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@ setup(
     url='http://www.bsc.es/projects/earthscience/autosubmit/',
     download_url='https://earth.bsc.es/wiki/doku.php?id=tools:autosubmit',
     keywords=['climate', 'weather', 'workflow', 'HPC'],
-    install_requires=['autosubmitconfigparser==1.0.22','bcrypt>=3.2','packaging>19','six>=1.10.0','configobj>=5.0.6','argparse>=1.4.0','python-dateutil>=2.8.2','matplotlib<3.6','numpy<1.22','py3dotplus>=1.1.0','pyparsing>=3.0.7','paramiko>=2.9.2','mock>=4.0.3','portalocker>=2.3.2','networkx==2.6.3','requests>=2.27.1','bscearth.utils>=0.5.2','cryptography>=36.0.1','setuptools>=60.8.2','xlib>=0.21','pip>=22.0.3','ruamel.yaml','pythondialog','pytest','nose','coverage','PyNaCl>=1.4.0','Pygments'],
+    install_requires=['autosubmitconfigparser==1.0.24','bcrypt>=3.2','packaging>19','six>=1.10.0','configobj>=5.0.6','argparse>=1.4.0','python-dateutil>=2.8.2','matplotlib<3.6','numpy<1.22','py3dotplus>=1.1.0','pyparsing>=3.0.7','paramiko>=2.9.2','mock>=4.0.3','portalocker>=2.3.2','networkx==2.6.3','requests>=2.27.1','bscearth.utils>=0.5.2','cryptography>=36.0.1','setuptools>=60.8.2','xlib>=0.21','pip>=22.0.3','ruamel.yaml','pythondialog','pytest','nose','coverage','PyNaCl>=1.4.0','Pygments'],
     classifiers=[
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.9",
-- 
GitLab


From e763e5266087db1ff331e34cad9a71facbfc4c94 Mon Sep 17 00:00:00 2001
From: dbeltran <daniel.beltran@bsc.es>
Date: Mon, 27 Mar 2023 09:10:45 +0200
Subject: [PATCH 4/4] small fix githook output

---
 autosubmit/git/autosubmit_git.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autosubmit/git/autosubmit_git.py b/autosubmit/git/autosubmit_git.py
index 3e1d315b0..4f8dddcfc 100644
--- a/autosubmit/git/autosubmit_git.py
+++ b/autosubmit/git/autosubmit_git.py
@@ -263,7 +263,7 @@ class AutosubmitGit:
                         as_conf.parse_githooks()
                         subprocess.check_output(command_githook, shell=True)
                     command_1 = "cd {0}; {1} ".format(git_path,command_1)
-                    Log.debug('Githook + Checkout and Submodules: {0}', command_githook, command_1)
+                    Log.debug(f'Githook + Checkout and Submodules: {command_githook} {command_1}')
                     output_1 = subprocess.check_output(command_1, shell=True)
                 except BaseException as e:
                     submodule_failure = True
-- 
GitLab