diff --git a/autosubmit_api/components/experiment/configuration_facade.py b/autosubmit_api/components/experiment/configuration_facade.py index e349861b951145e6adaf007890af7e265ce6467c..910e3931290a05db00ba963ba05156a5fce140dc 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: diff --git a/autosubmit_api/config/config_common.py b/autosubmit_api/config/config_common.py index ca5cc4bca38fddfe2ce6eb4abe2ea241d77550dc..bca8cb3039259c22b26d0a8b82abc65904067585 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 diff --git a/autosubmit_api/experiment/common_db_requests.py b/autosubmit_api/experiment/common_db_requests.py index 247bf5910d28babaf9610cf7bd242e5f4e00ea95..7088eaf60bc8384711bc8e7811d9679cc79f0414 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 4fd6fc2ec4e9b232ce33cb81996b636ebbec613f..b59ce34eee16e562dfd8d607980a217e3c7a408b 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'])