From 38b16c7baa62498da3530ea2156249c4ece03624 Mon Sep 17 00:00:00 2001 From: dbeltran Date: Thu, 1 Jun 2023 15:54:40 +0200 Subject: [PATCH] Fixes the issue with reload, updated configparse to delete unused variables --- autosubmit/autosubmit.py | 4 ++-- requeriments.txt | 2 +- setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/autosubmit/autosubmit.py b/autosubmit/autosubmit.py index 1f128baf9..e9cbf07ce 100644 --- a/autosubmit/autosubmit.py +++ b/autosubmit/autosubmit.py @@ -4484,7 +4484,7 @@ class Autosubmit: as_conf = AutosubmitConfig(expid, BasicConfig, YAMLParserFactory()) # Get original configuration - as_conf.check_conf_files(running_time=False, only_experiment_data=True, no_log=True) + as_conf.reload(force_load=True,only_experiment_data=True) # Getting output type provided by the user in config, 'pdf' as default try: if not Autosubmit._copy_code(as_conf, expid, as_conf.experiment_data.get("PROJECT",{}).get("PROJECT_TYPE","none"), False): @@ -4494,7 +4494,7 @@ class Autosubmit: except BaseException as e: raise AutosubmitCritical("Error obtaining the project data, check the parameters related to PROJECT and GIT/SVN or LOCAL sections", code=7014,trace=str(e)) # Update configuration with the new config in the dist ( if any ) - as_conf.check_conf_files(running_time=False,force_load=True, only_experiment_data=False, no_log=False) + as_conf.check_conf_files(running_time=False,force_load=True, no_log=False) if len(as_conf.experiment_data.get("JOBS",{})) == 0 and "CUSTOM_CONFIG" in as_conf.experiment_data.get("DEFAULT",{}): raise AutosubmitCritical(f'Job list is empty\nCheck if there are YML files in {as_conf.experiment_data.get("DEFAULT","").get("CUSTOM_CONFIG","")}', code=7015) output_type = as_conf.get_output_type() diff --git a/requeriments.txt b/requeriments.txt index 0485c2334..286a5d201 100644 --- a/requeriments.txt +++ b/requeriments.txt @@ -1,4 +1,4 @@ -autosubmitconfigparser==1.0.30 +autosubmitconfigparser==1.0.31 paramiko>=2.9.2 bcrypt>=3.2 PyNaCl>=1.5.0 diff --git a/setup.py b/setup.py index 2a906e992..7997af4ab 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=['ruamel.yaml==0.17.21','ruamel.yaml.clib==0.2.7','autosubmitconfigparser==1.0.30','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','pythondialog','pytest','nose','coverage','PyNaCl>=1.4.0','Pygments'], + install_requires=['ruamel.yaml==0.17.21','ruamel.yaml.clib==0.2.7','autosubmitconfigparser==1.0.31','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','pythondialog','pytest','nose','coverage','PyNaCl>=1.4.0','Pygments'], classifiers=[ "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.9", -- GitLab