From 60893a31790ba4ffecaed51df5fdfe897287a8c0 Mon Sep 17 00:00:00 2001 From: "Bruno P. Kinoshita" Date: Mon, 17 Apr 2023 11:17:47 +0200 Subject: [PATCH] Remove unused WrongTemplateException --- autosubmit/autosubmit.py | 1 - autosubmit/job/job_exceptions.py | 29 --------------------------- autosubmit/platforms/pjmplatform.py | 4 ---- autosubmit/platforms/platform.py | 8 -------- autosubmit/platforms/slurmplatform.py | 4 ---- 5 files changed, 46 deletions(-) delete mode 100644 autosubmit/job/job_exceptions.py diff --git a/autosubmit/autosubmit.py b/autosubmit/autosubmit.py index c2a54ec06..c83b4daef 100644 --- a/autosubmit/autosubmit.py +++ b/autosubmit/autosubmit.py @@ -22,7 +22,6 @@ import requests import collections import platform from .job.job_packager import JobPackager -from .job.job_exceptions import WrongTemplateException from .platforms.paramiko_submitter import ParamikoSubmitter from .platforms.platform import Platform from .notifications.notifier import Notifier diff --git a/autosubmit/job/job_exceptions.py b/autosubmit/job/job_exceptions.py deleted file mode 100644 index bc130b35a..000000000 --- a/autosubmit/job/job_exceptions.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python3 - -# Copyright 2017-2020 Earth Sciences Department, BSC-CNS - -# This file is part of Autosubmit. - -# Autosubmit is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# Autosubmit is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with Autosubmit. If not, see . - - -class WrongTemplateException(Exception): - """ - Class to alert when the template checking fails for a given job - """ - - def __init__(self, job_name): - super(WrongTemplateException, self).__init__() - self.job_name = job_name - diff --git a/autosubmit/platforms/pjmplatform.py b/autosubmit/platforms/pjmplatform.py index 57bcb7de3..30362e977 100644 --- a/autosubmit/platforms/pjmplatform.py +++ b/autosubmit/platforms/pjmplatform.py @@ -23,7 +23,6 @@ from time import sleep from typing import List, Union from autosubmit.job.job_common import Status -from autosubmit.job.job_exceptions import WrongTemplateException from autosubmit.platforms.paramiko_platform import ParamikoPlatform from autosubmit.platforms.headers.pjm_header import PJMHeader from autosubmit.platforms.wrappers.wrapper_factory import PJMWrapperFactory @@ -146,9 +145,6 @@ class PJMPlatform(ParamikoPlatform): job.write_submit_time(hold=hold) i += 1 save = True - except WrongTemplateException as e: - raise AutosubmitCritical("Invalid parameter substitution in {0} template".format( - e.job_name), 7014, str(e)) except AutosubmitError as e: raise except AutosubmitCritical as e: diff --git a/autosubmit/platforms/platform.py b/autosubmit/platforms/platform.py index edcb3c001..b96251437 100644 --- a/autosubmit/platforms/platform.py +++ b/autosubmit/platforms/platform.py @@ -5,7 +5,6 @@ import traceback from autosubmit.job.job_common import Status from typing import List, Union -from autosubmit.job.job_exceptions import WrongTemplateException from log.log import AutosubmitCritical, AutosubmitError, Log class Platform(object): @@ -158,10 +157,6 @@ class Platform(object): else: error_message += "\ncheck that {1} platform has set the correct scheduler. Sections that could be affected: {0}".format( error_msg[:-1], self.name) - - except WrongTemplateException as e: - raise AutosubmitCritical("Invalid parameter substitution in {0} template".format( - e.job_name), 7014, e.message) except AutosubmitCritical: raise except Exception as e: @@ -169,9 +164,6 @@ class Platform(object): raise AutosubmitError( "{0} submission failed. May be related to running a job with check=on_submission and another that affect this job template".format( self.name), 6015, str(e)) - except WrongTemplateException as e: - raise AutosubmitCritical( - "Invalid parameter substitution in {0} template".format(e.job_name), 7014) except AutosubmitCritical as e: raise AutosubmitCritical(e.message, e.code, e.trace) except AutosubmitError as e: diff --git a/autosubmit/platforms/slurmplatform.py b/autosubmit/platforms/slurmplatform.py index 104f5c5ec..4a1457454 100644 --- a/autosubmit/platforms/slurmplatform.py +++ b/autosubmit/platforms/slurmplatform.py @@ -28,7 +28,6 @@ from typing import List, Union from xml.dom.minidom import parseString from autosubmit.job.job_common import Status, parse_output_number -from autosubmit.job.job_exceptions import WrongTemplateException from autosubmit.platforms.paramiko_platform import ParamikoPlatform from autosubmit.platforms.headers.slurm_header import SlurmHeader from autosubmit.platforms.wrappers.wrapper_factory import SlurmWrapperFactory @@ -172,9 +171,6 @@ class SlurmPlatform(ParamikoPlatform): package.jobs[0].platform.cancel_cmd + " {0}".format(job_id)) raise AutosubmitError("{0} submission failed, some hold jobs failed to be held".format(self.name), 6015) save = True - except WrongTemplateException as e: - raise AutosubmitCritical("Invalid parameter substitution in {0} template".format( - e.job_name), 7014, str(e)) except AutosubmitError as e: raise except AutosubmitCritical as e: -- GitLab