diff --git a/autosubmit/autosubmit.py b/autosubmit/autosubmit.py index 1796337f0ead874952e14549332c320a60df4ac4..c4d6c34df6d367ffc956cef61113d88d2e92db81 100644 --- a/autosubmit/autosubmit.py +++ b/autosubmit/autosubmit.py @@ -73,7 +73,7 @@ import re import random import signal import datetime -import log.fd_show as fd_show +# import log.fd_show as fd_show import portalocker from pkg_resources import require, resource_listdir, resource_string, resource_filename from collections import defaultdict @@ -5449,7 +5449,7 @@ class Autosubmit: referenced_jobs_to_remove = set() job_list_wrappers = copy.deepcopy(job_list) jobs_wr = copy.deepcopy(job_list.get_job_list()) - [job for job in jobs_wr if ( + jobs_wr = [job for job in jobs_wr if ( job.status != Status.COMPLETED)] for job in jobs_wr: for child in job.children: diff --git a/autosubmit/database/db_common.py b/autosubmit/database/db_common.py index 9f93e04c5ee48c9378fc0f0751b1a3a87bf01b42..81692d9543430dd4fb798ed77a976c0632439c58 100644 --- a/autosubmit/database/db_common.py +++ b/autosubmit/database/db_common.py @@ -23,8 +23,7 @@ Module containing functions to manage autosubmit's database. import os import sqlite3 import multiprocessing -import autosubmit -from log.log import Log, AutosubmitCritical, AutosubmitError +from log.log import Log, AutosubmitCritical Log.get_logger("Autosubmit") from autosubmitconfigparser.config.basicconfig import BasicConfig diff --git a/autosubmit/experiment/statistics.py b/autosubmit/experiment/statistics.py index 793210923d0e28c3325cc1ad098e2dc73621d51c..3f2ec09ed50e51487efa970d4f9f33e86e7e0c8e 100644 --- a/autosubmit/experiment/statistics.py +++ b/autosubmit/experiment/statistics.py @@ -20,7 +20,7 @@ import datetime from autosubmit.job.job import Job from autosubmit.monitor.utils import FixedSizeList -from log.log import Log, AutosubmitError, AutosubmitCritical +from log.log import Log def timedelta2hours(deltatime): diff --git a/autosubmit/git/autosubmit_git.py b/autosubmit/git/autosubmit_git.py index 976b02f9fb157bc5728e667b58efbbc388dc93aa..6ef5ae462f1a30363a989b3bd9893cbe351e0229 100644 --- a/autosubmit/git/autosubmit_git.py +++ b/autosubmit/git/autosubmit_git.py @@ -25,7 +25,7 @@ import shutil # from autosubmit import Autosubmit from autosubmitconfigparser.config.basicconfig import BasicConfig from time import time -from log.log import Log, AutosubmitCritical, AutosubmitError +from log.log import Log, AutosubmitCritical Log.get_logger("Autosubmit") diff --git a/autosubmit/helpers/utils.py b/autosubmit/helpers/utils.py index fca94a126a7310ab6184ca25a0580ab12d1b520a..146a727aff47fe624cf848d231f4daea9fe938d9 100644 --- a/autosubmit/helpers/utils.py +++ b/autosubmit/helpers/utils.py @@ -1,9 +1,7 @@ import os import pwd -from log.log import Log, AutosubmitCritical -from autosubmitconfigparser.config.basicconfig import BasicConfig -from typing import Tuple +from log.log import AutosubmitCritical def check_experiment_ownership(expid, basic_config, raise_error=False, logger=None): # [A-Za-z09]+ variable is not needed, LOG is global thus it will be read if available diff --git a/autosubmit/history/platform_monitor/platform_utils.py b/autosubmit/history/platform_monitor/platform_utils.py index 433e654ec225a2d7190ae4ecac067bdb07a8aab7..7dbad5e20dd4cfeb6cd13f86906f205a12c8755f 100644 --- a/autosubmit/history/platform_monitor/platform_utils.py +++ b/autosubmit/history/platform_monitor/platform_utils.py @@ -16,7 +16,6 @@ # You should have received a copy of the GNU General Public License # along with Autosubmit. If not, see . -import os from time import mktime from datetime import datetime diff --git a/autosubmit/history/strategies.py b/autosubmit/history/strategies.py index c18ae96f5142c3f2851f021d52b55fbece3f8952..5a544fd46bc012f79daa18ea21070c610b375eca 100644 --- a/autosubmit/history/strategies.py +++ b/autosubmit/history/strategies.py @@ -20,7 +20,7 @@ from abc import ABCMeta, abstractmethod import autosubmit.history.database_managers.database_models as Models import traceback from .internal_logging import Logging -from .database_managers.database_manager import DEFAULT_LOCAL_ROOT_DIR, DEFAULT_HISTORICAL_LOGS_DIR +from .database_managers.database_manager import DEFAULT_HISTORICAL_LOGS_DIR class PlatformInformationHandler: def __init__(self, strategy): diff --git a/autosubmit/job/job_dict.py b/autosubmit/job/job_dict.py index 9645f493f5f38e39fa7ec068536493020e1b44ee..8ece823da724b1cc59dda62804c96c81fe380aea 100644 --- a/autosubmit/job/job_dict.py +++ b/autosubmit/job/job_dict.py @@ -20,8 +20,8 @@ from autosubmit.job.job import Job from bscearth.utils.date import date2str from autosubmit.job.job_common import Status, Type -from log.log import Log, AutosubmitError, AutosubmitCritical -from collections.abc import Iterable +from log.log import AutosubmitCritical + class DicJobs: """ Class to create jobs from conf file and to find jobs by start date, member and chunk diff --git a/autosubmit/job/job_list.py b/autosubmit/job/job_list.py index af80e2158d1c186dd85a54c7f5dabdea8195b835..35f91e4fb81faa9b5b496d463cbc6caafc5015cb 100644 --- a/autosubmit/job/job_list.py +++ b/autosubmit/job/job_list.py @@ -1576,12 +1576,12 @@ class JobList(object): select_jobs_by_name = jobs_to_check[0] unparsed_jobs = jobs_to_check[1] if not ";" in unparsed_jobs: - if '[': + if '[' in unparsed_jobs: select_all_jobs_by_section = unparsed_jobs filter_jobs_by_section = "" else: select_all_jobs_by_section = "" - filter_jobs_by_section = unparsed_jbos + filter_jobs_by_section = unparsed_jobs else: aux = unparsed_jobs.split(';') select_all_jobs_by_section = aux[0] diff --git a/autosubmit/job/job_packager.py b/autosubmit/job/job_packager.py index 67e833e2719049822cd43220dc0ea68a96bc7ad5..810dcf9c8a25574b50384f40062396d8c1e5028c 100644 --- a/autosubmit/job/job_packager.py +++ b/autosubmit/job/job_packager.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with Autosubmit. If not, see . import collections -from log.log import Log, AutosubmitCritical, AutosubmitError +from log.log import Log, AutosubmitCritical from autosubmit.job.job_common import Status, Type from bscearth.utils.date import sum_str_hours from autosubmit.job.job_packages import JobPackageSimple, JobPackageVertical, JobPackageHorizontal, \ @@ -124,7 +124,6 @@ class JobPackager(object): self._maxTotalProcessors = 0 def compute_weight(self, job_list): - job = self jobs_by_section = dict() held_jobs = self._jobs_list.get_held_jobs() jobs_held_by_section = dict() diff --git a/autosubmit/job/job_packages.py b/autosubmit/job/job_packages.py index ebdbf3d7c4e5d005d3159f619f0592ce76cfd789..567631ac3da9649f52efb58b980a30388cf46a3e 100644 --- a/autosubmit/job/job_packages.py +++ b/autosubmit/job/job_packages.py @@ -98,7 +98,6 @@ class JobPackageBase(object): for job in jobs: if str(job.check).lower() == str(Job.CHECK_ON_SUBMISSION).lower(): if only_generate: - exit_ = True break if not os.path.exists(os.path.join(configuration.get_project_dir(), job.file)): lock.acquire() diff --git a/autosubmit/monitor/monitor.py b/autosubmit/monitor/monitor.py index f1de4888578fce3b3c09d5ba6eddc6c8af4ebb3f..e1e01181723a740166c8f6a353ff16a7224f9d4e 100644 --- a/autosubmit/monitor/monitor.py +++ b/autosubmit/monitor/monitor.py @@ -480,8 +480,8 @@ class Monitor: Log.result('Status txt created at {0}', output_file) def write_output_txt_recursive(self, job, output_file, level, path): - log_out = "" - log_err = "" + # log_out = "" + # log_err = "" # + " " + log_out + " " + log_err + "\n" output = level + job.name + " " + \ Status().VALUE_TO_KEY[job.status] + "\n" diff --git a/autosubmit/platforms/ecplatform.py b/autosubmit/platforms/ecplatform.py index 3c4110f006fa3ff842e0146593e496db6e98de87..b029c6070eeaa6152aaa5f55d63f969e4c475787 100644 --- a/autosubmit/platforms/ecplatform.py +++ b/autosubmit/platforms/ecplatform.py @@ -16,7 +16,6 @@ # You should have received a copy of the GNU General Public License # along with Autosubmit. If not, see . -import locale import os import subprocess from autosubmit.platforms.paramiko_platform import ParamikoPlatform, ParamikoPlatformException diff --git a/autosubmit/platforms/locplatform.py b/autosubmit/platforms/locplatform.py index 7f41060eb80398eddce42dca098ca6260a49fa5b..201f2c9568b89df23447494c63155381d8a40179 100644 --- a/autosubmit/platforms/locplatform.py +++ b/autosubmit/platforms/locplatform.py @@ -27,7 +27,7 @@ from autosubmit.platforms.headers.local_header import LocalHeader from autosubmitconfigparser.config.basicconfig import BasicConfig from time import sleep -from log.log import Log, AutosubmitError, AutosubmitCritical +from log.log import Log, AutosubmitError class LocalPlatform(ParamikoPlatform): """ @@ -232,8 +232,6 @@ class LocalPlatform(ParamikoPlatform): os.rename(os.path.join(path_root, src),os.path.join(path_root, dest)) return True except IOError as e: - raise AutosubmitError('File {0} does not exists, something went wrong with the platform'.format( - path_root), 6004, str(e)) if must_exist: raise AutosubmitError("File {0} does not exists".format( os.path.join(path_root,src)), 6004, str(e)) diff --git a/autosubmit/platforms/paramiko_platform.py b/autosubmit/platforms/paramiko_platform.py index 58582bc0b9e71963111afe547c5ef8ced1975ea9..74ef11412311327c018fbacf8edfe9803b3b08fc 100644 --- a/autosubmit/platforms/paramiko_platform.py +++ b/autosubmit/platforms/paramiko_platform.py @@ -1,5 +1,4 @@ import locale -from binascii import hexlify from contextlib import suppress from time import sleep import sys @@ -7,7 +6,6 @@ import socket import os import paramiko import datetime -import time import select import re from datetime import timedelta @@ -15,7 +13,6 @@ import random from autosubmit.job.job_common import Status from autosubmit.job.job_common import Type from autosubmit.platforms.platform import Platform -from bscearth.utils.date import date2str from log.log import AutosubmitError, AutosubmitCritical, Log from paramiko.ssh_exception import (SSHException) import Xlib.support.connect as xlib_connect diff --git a/autosubmit/platforms/paramiko_submitter.py b/autosubmit/platforms/paramiko_submitter.py index ce8c9b358cc3ee1091f33061ca58901ba3f73c1a..e575e0869d0073a03345f6386837d1d628317649 100644 --- a/autosubmit/platforms/paramiko_submitter.py +++ b/autosubmit/platforms/paramiko_submitter.py @@ -21,7 +21,7 @@ import os from collections import defaultdict -from log.log import Log,AutosubmitCritical,AutosubmitError +from log.log import Log,AutosubmitError from autosubmitconfigparser.config.basicconfig import BasicConfig from autosubmitconfigparser.config.configcommon import AutosubmitConfig from .submitter import Submitter diff --git a/autosubmit/platforms/platform.py b/autosubmit/platforms/platform.py index 95fea2bcda04e3993c69f3936503dc22b5f3431e..2c654afa0092490f621ea563be07739c260d4c6b 100644 --- a/autosubmit/platforms/platform.py +++ b/autosubmit/platforms/platform.py @@ -1,6 +1,5 @@ import locale import os -from pathlib import Path import traceback from autosubmit.job.job_common import Status @@ -8,7 +7,7 @@ from typing import List, Union from autosubmit.helpers.parameters import autosubmit_parameter from log.log import AutosubmitCritical, AutosubmitError, Log -import getpass + class Platform(object): """ Class to manage the connections to the different platforms. diff --git a/autosubmit/platforms/slurmplatform.py b/autosubmit/platforms/slurmplatform.py index acfaaf7baad1fccec44a06ce1f1a2965917fd15b..b9085ac3e9b84fedca1a9fda2b7073ad202f7a61 100644 --- a/autosubmit/platforms/slurmplatform.py +++ b/autosubmit/platforms/slurmplatform.py @@ -386,7 +386,6 @@ class SlurmPlatform(ParamikoPlatform): detailed_data[name] = extra_data steps.append(name) submit = start = finish = energy = nnodes = ncpus = 0 - status = "UNKNOWN" # Take first line as source line = lines[0].strip().split() ncpus = int(line[2] if len(line) > 2 else 0)