From b4a15f3211b0f7ed954ce19493e57035f73491bc Mon Sep 17 00:00:00 2001 From: "Bruno P. Kinoshita" Date: Fri, 28 Jul 2023 10:24:45 +0200 Subject: [PATCH 1/3] os.popen3 is gone in Py3, fix return values too --- autosubmit_api/components/experiment/configuration_facade.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autosubmit_api/components/experiment/configuration_facade.py b/autosubmit_api/components/experiment/configuration_facade.py index e349861b..910e3931 100644 --- a/autosubmit_api/components/experiment/configuration_facade.py +++ b/autosubmit_api/components/experiment/configuration_facade.py @@ -153,7 +153,7 @@ class AutosubmitConfigurationFacade(ConfigurationFacade): def get_owner_name(self): # type: () -> str try: - _, stdout, _ = os.popen3("id -nu {0}".format(str(self.get_owner_id()))) + stdout = os.popen("id -nu {0}".format(str(self.get_owner_id()))) owner_name = stdout.read().strip() return str(owner_name) except: -- GitLab From ed5e826d1791164377164d353d47cf70e3813b1e Mon Sep 17 00:00:00 2001 From: "Bruno P. Kinoshita" Date: Fri, 28 Jul 2023 10:27:24 +0200 Subject: [PATCH 2/3] Replace pysqlite3 imports by sqlite3 --- autosubmit_api/experiment/common_db_requests.py | 2 +- autosubmit_api/workers/populate_details/populate.py | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/autosubmit_api/experiment/common_db_requests.py b/autosubmit_api/experiment/common_db_requests.py index 247bf591..7088eaf6 100644 --- a/autosubmit_api/experiment/common_db_requests.py +++ b/autosubmit_api/experiment/common_db_requests.py @@ -5,7 +5,7 @@ import time import pickle import textwrap import traceback -import pysqlite3 as sqlite3 +import sqlite3 import copy from datetime import datetime from collections import OrderedDict diff --git a/autosubmit_api/workers/populate_details/populate.py b/autosubmit_api/workers/populate_details/populate.py index 4fd6fc2e..b59ce34e 100644 --- a/autosubmit_api/workers/populate_details/populate.py +++ b/autosubmit_api/workers/populate_details/populate.py @@ -8,9 +8,6 @@ from ...builders.configuration_facade_builder import ConfigurationFacadeDirector from ...config.basicConfig import BasicConfig from configparser import ParsingError from collections import namedtuple -from pysqlite3 import dbapi2 -import pysqlite3 as sqlite3 -from pysqlite3 import Connection from typing import List, Dict, Any, Tuple ExperimentDetails = namedtuple("ExperimentDetails", ['owner', 'created', 'model', 'branch', 'hpc']) -- GitLab From 73c0d07c0b68bac22bddd7db4a61f96119200d11 Mon Sep 17 00:00:00 2001 From: "Bruno P. Kinoshita" Date: Fri, 28 Jul 2023 10:28:57 +0200 Subject: [PATCH 3/3] Search for AS3 files first to determine AS version --- autosubmit_api/config/config_common.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autosubmit_api/config/config_common.py b/autosubmit_api/config/config_common.py index ca5cc4bc..bca8cb30 100644 --- a/autosubmit_api/config/config_common.py +++ b/autosubmit_api/config/config_common.py @@ -61,13 +61,13 @@ class AutosubmitConfig(object): self.parser_factory = parser_factory # check which type of config files (AS3 or AS4) - platform_conf_file = os.path.join(self.basic_config.LOCAL_ROOT_DIR, expid, "conf", "platforms_" + expid + "." + extension) - if os.path.exists(platform_conf_file): - logger.info("Setting AS4 Config strategy - yml") - self._configWrapper = ymlConfigStrategy(expid, basic_config, parser_factory, ".yml") - else: + expdef_conf_file = os.path.join(self.basic_config.LOCAL_ROOT_DIR, expid, "conf", "expdef_" + expid + ".conf") + if os.path.exists(expdef_conf_file): logger.info("Setting AS3 Config strategy - conf") self._configWrapper = confConfigStrategy(expid, basic_config, parser_factory, ".conf") + else: + logger.info("Setting AS4 Config strategy - yml") + self._configWrapper = ymlConfigStrategy(expid, basic_config, parser_factory, ".yml") @property -- GitLab