diff --git a/autosubmit/autosubmit.py b/autosubmit/autosubmit.py index dd18b69ede8a4264f3d1f432adf950064dafef27..9c2d89356d477600f55a94633282c8382a9270c3 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('%(?=1.4.0 - bcrypt>=3.2.0 - python-dateutil>=2.8.2 diff --git a/requeriments.txt b/requeriments.txt index f612dafd597edd9167ce193e39a33b0250015c11..cec2b668df01df890db195303da958b6a4df05e9 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 aada781fa7ddff34462a1474034423ef02fb3a90..16579c1989ed87cb8bb019a7c6101f108569bdc8 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", diff --git a/test/unit/test_job.py b/test/unit/test_job.py index 5982ac6be186cce945486c526ec9cdb6b6db671b..31702a9c74e1c264e55dfbee9ce373c87915b50f 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