diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 19dc6469d88dcb3da43f37a096b98474fc213ea0..460507683640c41bbfe6d03044f27b9b6a41b646 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,8 +4,8 @@ **GitLab:** https://earth.bsc.es/gitlab/es/autosubmit -**Mailinglist:** autosubmit@bsc.es +**Mailing list:** autosubmit@bsc.es -The porduction branch generally reflects the Autosubmit release on Pypi, and is considered stable: it should work 'out of the box' for the supported backends. For a list of supported backends, please refer to the documentation. +The production branch generally reflects the Autosubmit release on Pypi, and is considered stable: it should work 'out of the box' for the supported backends. For a list of supported backends, please refer to the documentation. -The master branch (and any other branches than production, for that matter) may not correspond to the publised documentation, and specifically may have dependencies which need to be resolved manually. Please contact us over the mailing list if you need advice on the usage of any non-production branch. \ No newline at end of file +The master branch (and any other branches than production, for that matter) may not correspond to the published documentation, and specifically may have dependencies which need to be resolved manually. Please contact us over the mailing list if you need advice on the usage of any non-production branch. \ No newline at end of file diff --git a/autosubmit/autosubmit.py b/autosubmit/autosubmit.py index 55ec20671a54293b0a3f6ea3c5e65b18827c945d..d67ce02ab7cab3d0c5fb0443fc0e3f4db9c49d62 100644 --- a/autosubmit/autosubmit.py +++ b/autosubmit/autosubmit.py @@ -406,7 +406,7 @@ class Autosubmit: '-fp', '--folder_path', type=str, help='Allows to select a non-default folder.') subparser.add_argument( '-p', '--placeholders', default=False, action='store_true', - help='disables the sustitution of placeholders by -') + help='disables the substitution of placeholders by -') subparser.add_argument('-v', '--update_version', action='store_true', default=False, help='Update experiment version') # Create @@ -452,7 +452,7 @@ class Autosubmit: subparser.add_argument('-jc', '--jobsconfpath', default=None, help='path to jobs.yml file to use by ' 'default. Optional') subparser.add_argument( - '-sm', '--smtphostname', default=None, help='STMP server hostname. Optional') + '-sm', '--smtphostname', default=None, help='SMTP server hostname. Optional') subparser.add_argument( '-mf', '--mailfrom', default=None, help='Notifications sender address. Optional') group = subparser.add_mutually_exclusive_group() @@ -613,7 +613,7 @@ class Autosubmit: except Exception as e: if type(e) is SystemExit: # todo check - # Version keyword force an exception in parse arg due and os_exit(0) but the program is succesfully finished + # Version keyword force an exception in parse arg due and os_exit(0) but the program is successfully finished if "0" in str(e): print(Autosubmit.autosubmit_version) return 0 @@ -929,7 +929,7 @@ class Autosubmit: :param expid_delete: identifier of the experiment to delete :type force: boolean :param force: True if the force flag has been sent - :return: True if succesfully deleted, False otherwise + :return: True if successfully deleted, False otherwise :rtype: boolean """ message = "The {0} experiment was removed from the local disk and from the database.".format(expid_delete) @@ -1293,7 +1293,7 @@ class Autosubmit: :param expid: identifier of the experiment to delete :param force: if True, does not ask for confirmation - :returns: True if succesful, False if not + :returns: True if successful, False if not :rtype: bool """ @@ -1339,7 +1339,7 @@ class Autosubmit: else: platform = platforms[as_conf.get_platform()] platform.add_parameters(parameters, True) - # Attach paramenters to JobList + # Attach parameters to JobList parameters['STARTDATES'] = [] for date in job_list._date_list: parameters['STARTDATES'].append(date2str(date, job_list.get_date_format())) @@ -1410,7 +1410,7 @@ class Autosubmit: jobs_cw = job_list.get_completed() else: if (force and not locked) or (force and locked): - Log.info("Overwritting all cmd scripts") + Log.info("Overwriting all cmd scripts") jobs = job_list.get_job_list() elif locked: Log.warning( @@ -1527,7 +1527,7 @@ class Autosubmit: :return: Nothing\n :rtype: \n """ - Log.warning("Generating the auxiliar job_list used for the -CW flag.") + Log.warning("Generating the auxiliary job_list used for the -CW flag.") job_list._job_list = jobs_filtered job_list._persistence_file = job_list._persistence_file + "_cw_flag" parameters = as_conf.load_parameters() @@ -1897,7 +1897,7 @@ class Autosubmit: Autosubmit._load_parameters(as_conf, job_list, submitter.platforms) # Log.info("FD 2: {0}".format(log.fd_show.fd_table_status_str())) except BaseException as e: - raise AutosubmitError("Config files seems to not be accesible", 6040, str(e)) + raise AutosubmitError("Config files seems to not be accessible", 6040, str(e)) total_jobs = len(job_list.get_job_list()) Log.info("\n\n{0} of {1} jobs remaining ({2})".format( total_jobs - len(job_list.get_completed()), total_jobs, time.strftime("%H:%M"))) @@ -1958,7 +1958,7 @@ class Autosubmit: for platform in platforms_to_test: platform_jobs = jobs_to_check.get(platform.name, []) - # not all platforms are doing this check simultaneosly + # not all platforms are doing this check simultaneously if len(platform_jobs) == 0: continue platform.check_Alljobs(platform_jobs, as_conf) @@ -2230,7 +2230,7 @@ class Autosubmit: issues = "" platform_issues = "" ssh_config_issues = "" - private_key_error = "Please, add your private key to the ssh-agent ( ssh-add ) or use a non-encrypted key\nIf ssh agent is not inicializated, prompt first eval `ssh-agent -s`" + private_key_error = "Please, add your private key to the ssh-agent ( ssh-add ) or use a non-encrypted key\nIf ssh agent is not initialized, prompt first eval `ssh-agent -s`" for platform in platform_to_test: platform_issues = "" try: @@ -2275,13 +2275,13 @@ class Autosubmit: else: if platform.connected: platform.connected = False - Log.printlog("[{1}] Connection sucessful to host {0}, however there are issues with %HPCROOT%".format(platform.host, platform.name), + Log.printlog("[{1}] Connection successful to host {0}, however there are issues with %HPCROOT%".format(platform.host, platform.name), Log.WARNING) else: Log.printlog("[{1}] Connection failed to host {0}".format(platform.host, platform.name), Log.WARNING) if issues != "": if ssh_config_issues.find(private_key_error[:-2]) != -1: - raise AutosubmitCritical("Private key is encrypted, Autosubmit does not run in interative mode.\nPlease, add the key to the ssh agent(ssh-add ).\nIt will remain open as long as session is active, for force clean you can prompt ssh-add -D",7073, issues + "\n" + ssh_config_issues) + raise AutosubmitCritical("Private key is encrypted, Autosubmit does not run in interactive mode.\nPlease, add the key to the ssh agent(ssh-add ).\nIt will remain open as long as session is active, for force clean you can prompt ssh-add -D",7073, issues + "\n" + ssh_config_issues) else: raise AutosubmitCritical("Issues while checking the connectivity of platforms.", 7010, issues + "\n" + ssh_config_issues) @@ -2322,7 +2322,7 @@ class Autosubmit: inspect=inspect, only_wrappers=only_wrappers, hold=hold) - # Jobs that are being retrieved in batch. Right now, only avaliable for slurm platforms. + # Jobs that are being retrieved in batch. Right now, only available for slurm platforms. if not inspect and len(valid_packages_to_submit) > 0: job_list.save() save_2 = False @@ -2490,7 +2490,7 @@ class Autosubmit: # Class constructor creates table if it does not exist packages_persistence = JobPackagePersistence(os.path.join(BasicConfig.LOCAL_ROOT_DIR, expid, "pkl"), "job_packages_" + expid) - # Permissons + # Permissions os.chmod(os.path.join(BasicConfig.LOCAL_ROOT_DIR, expid, "pkl", "job_packages_" + expid + ".db"), 0o644) # Database modification packages_persistence.reset_table(True) @@ -2521,7 +2521,7 @@ class Autosubmit: packages = JobPackagePersistence(os.path.join(BasicConfig.LOCAL_ROOT_DIR, expid, "pkl"), "job_packages_" + expid).load() except BaseException as e: - raise AutosubmitCritical("Issues during the wrapper loading, may be related to IOissues", 7040, str(e)) + raise AutosubmitCritical("Issues during the wrapper loading, may be related to IO issues", 7040, str(e)) groups_dict = dict() try: if group_by: @@ -2681,7 +2681,7 @@ class Autosubmit: monitor_autosubmit = Monitor() monitor_autosubmit.clean_stats(expid) except BaseException as e: - raise AutosubmitCritical("Couldn't clean this experiment, check if you have the correct permisions", 7012, + raise AutosubmitCritical("Couldn't clean this experiment, check if you have the correct permissions", 7012, str(e)) return True @@ -3154,7 +3154,7 @@ class Autosubmit: finished = False pipeline_broke = False Log.info( - "Rsync launched {0} times. Can take up to 150 retrials or until all data is transfered".format( + "Rsync launched {0} times. Can take up to 150 retrials or until all data is transferred".format( rsync_retries + 1)) try: p.send_command( @@ -3313,7 +3313,7 @@ class Autosubmit: except Exception as e: raise AutosubmitCritical( "Unable to gather the parameters from config files, check permissions.", 7012) - # Performace Metrics call + # Performance Metrics call try: BasicConfig.read() request = requests.get( @@ -3826,7 +3826,7 @@ class Autosubmit: while True: try: (code, tag) = d.form(text="", - elements=[("STMP server hostname", 1, 1, smtp_hostname, 1, 40, 20, 20), + elements=[("SMTP server hostname", 1, 1, smtp_hostname, 1, 40, 20, 20), ("Notifications sender address", 2, 1, mail_from, 2, 40, 40, 200)], height=20, width=80, @@ -3975,7 +3975,7 @@ class Autosubmit: def update_old_script(root_dir, template_path, as_conf): # Do a backup and tries to update warn = "" - sustituted = "" + substituted = "" Log.info("Checking {0}".format(template_path)) if template_path.exists(): backup_path = root_dir / Path(template_path.name + "_AS_v3_backup_placeholders") @@ -4005,7 +4005,7 @@ class Autosubmit: key, new_key) else: new_key = new_key.pop().upper() - sustituted += "{0} translated to {1}\n".format(key.upper(), new_key) + substituted += "{0} translated to {1}\n".format(key.upper(), new_key) template_content = re.sub('%(? CURRENT_DATABASE_VERSION: @@ -209,7 +209,7 @@ def update_experiment_descrip_version(name, description=None, version=None): def get_autosubmit_version(expid): """ - Get the minimun autosubmit version needed for the experiment. Anti-lock version. + Get the minimum autosubmit version needed for the experiment. Anti-lock version. :param expid: Experiment name :type expid: str @@ -259,7 +259,7 @@ def delete_experiment(experiment_id): :param experiment_id: experiment identifier :type experiment_id: str - :return: True if delete is succesful + :return: True if delete is successful :rtype: bool """ queue = multiprocessing.Queue(1) @@ -300,7 +300,7 @@ def _save_experiment(name, description, version): except sqlite3.IntegrityError as e: close_conn(conn, cursor) raise AutosubmitCritical( - 'Couldn''t register experiment', 7005, str(e)) + 'Could not register experiment', 7005, str(e)) conn.commit() close_conn(conn, cursor) @@ -413,7 +413,7 @@ def _update_experiment_descrip_version(name, description=None, version=None): def _get_autosubmit_version(expid): """ - Get the minimun autosubmit version needed for the experiment + Get the minimum autosubmit version needed for the experiment :param expid: Experiment name :type expid: str @@ -509,7 +509,7 @@ def _delete_experiment(experiment_id): :param experiment_id: experiment identifier :type experiment_id: str - :return: True if delete is succesful + :return: True if delete is successful :rtype: bool """ if not check_db(): diff --git a/autosubmit/git/autosubmit_git.py b/autosubmit/git/autosubmit_git.py index 34e95df085be53bd634373550fdbd59384691e80..b95ed4ce800d1f61684a103caacfac80cc11fa4a 100644 --- a/autosubmit/git/autosubmit_git.py +++ b/autosubmit/git/autosubmit_git.py @@ -84,7 +84,7 @@ class AutosubmitGit: @staticmethod def check_commit(as_conf): """ - Function to check uncommited changes + Function to check uncommitted changes :param as_conf: experiment configuration :type as_conf: autosubmitconfigparser.config.AutosubmitConfig @@ -104,7 +104,7 @@ class AutosubmitGit: if output: Log.printlog( - "There are local changes not commited to git", 3000) + "There are local changes not committed to git", 3000) return True else: output = subprocess.check_output("cd {0}; git log --branches --not --remotes".format(dirname_path), diff --git a/autosubmit/history/experiment_history.py b/autosubmit/history/experiment_history.py index dfd4450aba741333c371be5d236f3dfec70e372b..b92c54d1579a40be13c80b3fe7364b4da3dd8eac 100644 --- a/autosubmit/history/experiment_history.py +++ b/autosubmit/history/experiment_history.py @@ -83,7 +83,7 @@ class ExperimentHistory: self._log.log(str(exp), traceback.format_exc()) return None - def write_start_time(self, job_name, start=0, status="UNKWOWN", ncpus=0, wallclock="00:00", qos="debug", date="", + def write_start_time(self, job_name, start=0, status="UNKNOWN", ncpus=0, wallclock="00:00", qos="debug", date="", member="", section="", chunk=0, platform="NA", job_id=0, wrapper_queue=None, wrapper_code=None, children=""): try: job_data_dc_last = self.manager.get_job_data_dc_unique_latest_by_job_name(job_name) diff --git a/autosubmit/job/job.py b/autosubmit/job/job.py index 57bdca689a66eac997a059e42fa841d5877f07e5..d26ff475ac6fade18953aa477301fa4847413b27 100644 --- a/autosubmit/job/job.py +++ b/autosubmit/job/job.py @@ -286,7 +286,7 @@ class Job(object): @property def long_name(self): """ - Job's long name. If not setted, returns name + Job's long name. If not set, returns name :return: long name :rtype: str @@ -994,7 +994,7 @@ class Job(object): """ chunk = 1 as_conf.reload() - #parameters = as_conf.sustitute_dynamic_variables(parameters,25) + #parameters = as_conf.substitute_dynamic_variables(parameters,25) parameters = parameters.copy() parameters.update(default_parameters) @@ -1175,7 +1175,7 @@ class Job(object): parameters[wrapper_section+"_EXTENSIBLE"] = int(as_conf.get_extensible_wallclock(as_conf.experiment_data["WRAPPERS"].get(wrapper_section))) self.dependencies = parameters['DEPENDENCIES'] - # This shouldn't be necesary anymore as now all sub is done in the as_conf.reload() + # This shouldn't be necessary anymore as now all sub is done in the as_conf.reload() if len(self.export) > 0: variables = re.findall('%(? 0: @@ -1192,7 +1192,7 @@ class Job(object): parameters['EXPORT'] = self.export parameters['PROJECT_TYPE'] = as_conf.get_project_type() - # For some reason, there is return but the assigne is also neccesary + # For some reason, there is return but the assignee is also necessary self.parameters = parameters return parameters def update_content_extra(self,as_conf,files): @@ -1465,7 +1465,7 @@ class Job(object): def write_start_time(self, enabled = False): """ Writes start date and time to TOTAL_STATS file - :return: True if succesful, False otherwise + :return: True if successful, False otherwise :rtype: bool """ if self.wrapper_type != "vertical" or enabled: diff --git a/autosubmit/job/job_common.py b/autosubmit/job/job_common.py index bc87eaaf3de27c73251c419df6403996c778b5f9..4d05d985ca2dc28415a35746cd6b1c225cc3d6b0 100644 --- a/autosubmit/job/job_common.py +++ b/autosubmit/job/job_common.py @@ -347,7 +347,7 @@ def increase_wallclock_by_chunk(current, increase, chunk): :return: HH:MM wallclock :rtype: str """ - # Pipeline is not testing this since mock is not well made + # Pipeline is not testing this since mock is not well-made try: if current and increase and chunk and chunk > 0: wallclock = current.split(":") diff --git a/autosubmit/job/job_list.py b/autosubmit/job/job_list.py index b92c892609cd8da6ea6f31f59f7dc1c6e7090428..b49854d99cd7dba34bdf7a47a4b9ba9ccf35e012 100644 --- a/autosubmit/job/job_list.py +++ b/autosubmit/job/job_list.py @@ -857,7 +857,7 @@ class JobList(object): def _create_fake_dates_members(self, filtered_jobs_list): """ - Using the list of jobs provided, creates clones of these jobs and modifies names conditionted on job.date, job.member values (testing None). + Using the list of jobs provided, creates clones of these jobs and modifies names conditioned on job.date, job.member values (testing None). The purpose is that all jobs share the same name structure. :param filtered_jobs_list: A list of jobs of only those that comply with certain criteria, e.g. those belonging to a user defined job type for wrapping. \n @@ -896,7 +896,7 @@ class JobList(object): 1] + "_" + member + "_" + fake_job.name.split("_", 2)[2] # Filling list of fake jobs, only difference is the name filtered_jobs_fake_date_member.append(fake_job) - # Mapping fake jobs to orignal ones + # Mapping fake jobs to original ones fake_original_job_map[fake_job] = job # There was no result if fake_job is None: @@ -1113,7 +1113,7 @@ class JobList(object): def get_unsubmitted(self, platform=None, wrapper=False): """ - Returns a list of unsummited jobs + Returns a list of unsubmitted jobs :param wrapper: :param platform: job platform @@ -1951,7 +1951,7 @@ class JobList(object): else: job.hold = True jobs_to_skip = self.get_skippable_jobs( - as_conf.get_wrapper_jobs()) # Get A Dict with all jobs that are listed as skipabble + as_conf.get_wrapper_jobs()) # Get A Dict with all jobs that are listed as skippable for section in jobs_to_skip: for job in jobs_to_skip[section]: diff --git a/autosubmit/job/job_packager.py b/autosubmit/job/job_packager.py index e6c5ed2b6bdec51413a00ae028e91e06cc577027..0d97a1ad142e33ca9b673464e585a1fd574e98d2 100644 --- a/autosubmit/job/job_packager.py +++ b/autosubmit/job/job_packager.py @@ -429,17 +429,17 @@ class JobPackager(object): if error: if len(active_jobs) > 0: Log.printlog( - "Wrapper policy is set to MIXED and there are not enough jobs to form a wrapper.[wrappeable:{4} <= defined_min:{5}] [wrappeable_h:{0} <= defined_min_h:{1}]|[wrappeable_v:{2} <= defined_min_v:{3}] waiting until the wrapper can be formed.\nIf all values are <=, some innerjob has failed under strict policy".format( + "Wrapper policy is set to MIXED and there are not enough jobs to form a wrapper.[wrappable:{4} <= defined_min:{5}] [wrappeable_h:{0} <= defined_min_h:{1}]|[wrappeable_v:{2} <= defined_min_v:{3}] waiting until the wrapper can be formed.\nIf all values are <=, some innerjob has failed under strict policy".format( min_h, wrapper_limits["min_h"], min_v, wrapper_limits["min_v"], wrapper_limits["min"], len(active_jobs)), 6013) else: - message = "Wrapper couldn't be formed under {0} POLICY due minimum limit not being reached: [wrappeable:{4} < defined_min:{5}] [wrappeable_h:{1} < defined_min_h:{2}]|[wrappeable_v:{3} < defined_min_v:{4}] ".format( + message = "Wrapper couldn't be formed under {0} POLICY due minimum limit not being reached: [wrappable:{4} < defined_min:{5}] [wrappable_h:{1} < defined_min_h:{2}]|[wrappeable_v:{3} < defined_min_v:{4}] ".format( self.wrapper_policy[self.current_wrapper_section], min_h, wrapper_limits["min_h"], min_v, wrapper_limits["min_v"], wrapper_limits["min"], len(active_jobs)) if hard_deadlock: - message += "\nCheck your configuration: The next wrappeable job can't be wrapped until some of inner jobs of current packages finishes which is imposible" + message += "\nCheck your configuration: The next wrappable job can't be wrapped until some of inner jobs of current packages finishes which is imposible" if min_v > 1: message += "\nCheck your configuration: Check if current {0} vertical wallclock has reached the max defined on platforms.conf.".format(wallclock_sum) else: @@ -478,15 +478,15 @@ class JobPackager(object): if len(active_jobs) > 0: if show_log: Log.printlog( - "Wrapper policy is set to MIXED and there are not enough jobs to form a wrapper.[wrappeable:{4} < defined_min:{5}] [wrappeable_h:{0} < defined_min_h:{1}]|[wrappeable_v:{2} < defined_min_v:{3}] waiting until the wrapper can be formed.".format( + "Wrapper policy is set to MIXED and there are not enough jobs to form a wrapper.[wrappable:{4} < defined_min:{5}] [wrappable_h:{0} < defined_min_h:{1}]|[wrappeable_v:{2} < defined_min_v:{3}] waiting until the wrapper can be formed.".format( min_h, wrapper_limits["min_h"], min_v, wrapper_limits["min_v"],wrapper_limits["min"],len(active_jobs)), 6013) else: - message = "Wrapper couldn't be formed under {0} POLICY due minimum limit not being reached: [wrappeable:{4} < defined_min:{5}] [wrappeable_h:{1} < defined_min_h:{2}]|[wrappeable_v:{3} < defined_min_v:{4}] ".format( + message = "Wrapper couldn't be formed under {0} POLICY due minimum limit not being reached: [wrappable:{4} < defined_min:{5}] [wrappable_h:{1} < defined_min_h:{2}]|[wrappeable_v:{3} < defined_min_v:{4}] ".format( self.wrapper_policy[self.current_wrapper_section], min_h, wrapper_limits["min_h"], min_v, wrapper_limits["min_v"],wrapper_limits["min"],len(active_jobs)) if hard_deadlock: - message += "\nCheck your configuration: The next wrappeable job can't be wrapped until some of inner jobs of current packages finishes which is imposible" + message += "\nCheck your configuration: The next wrappable job can't be wrapped until some of inner jobs of current packages finishes which is impossible" if min_v > 1: message += "\nCheck your configuration: Check if current {0} vertical wallclock has reached the max defined on platforms.conf.".format( wallclock_sum) @@ -507,7 +507,7 @@ class JobPackager(object): else: package = JobPackageSimple([job]) packages_to_submit.append(package) - Log.info("Wrapper policy is set to flexible and there is a deadlock, As will submit the jobs sequentally") + Log.info("Wrapper policy is set to flexible and there is a deadlock, As will submit the jobs sequentially") else: for job in jobs: job.packed = False @@ -680,7 +680,7 @@ class JobPackager(object): return JobPackageVerticalHorizontal(current_package, total_processors, total_wallclock, jobs_resources=jobs_resources, method=self.wrapper_method[self.current_wrapper_section], configuration=self._as_config, wrapper_section=self.current_wrapper_section ) -#TODO rename and unite JobPackerVerticalMixed to JobPackerVertical since the distinguisment between the two is not needed anymore +#TODO rename and unite JobPackerVerticalMixed to JobPackerVertical since the difference between the two is not needed anymore class JobPackagerVertical(object): """ Vertical Packager Parent Class diff --git a/autosubmit/job/job_packages.py b/autosubmit/job/job_packages.py index 4c3cc8a5fef0cacc91802345887c64ca0d61c009..b1cd2c5d5e1bc4335d4d89a713cb5dc1006662af 100644 --- a/autosubmit/job/job_packages.py +++ b/autosubmit/job/job_packages.py @@ -173,7 +173,7 @@ class JobPackageBase(object): raise except BaseException as e: #should be IOERROR raise AutosubmitCritical( - "Error on {1}, template [{0}] still does not exists in running time(check=on_submission actived) ".format(job.file,job.name), 7014) + "Error on {1}, template [{0}] still does not exists in running time(check=on_submission activated) ".format(job.file,job.name), 7014) Log.debug("Creating Scripts") if not exit_: if len(self.jobs) < thread_number: diff --git a/autosubmit/monitor/monitor.py b/autosubmit/monitor/monitor.py index f2b0ad7b8f11d668e33efb2d6fe53765e3e69c68..8b8bffc557396e8fe870fddb2bf478b950060ccc 100644 --- a/autosubmit/monitor/monitor.py +++ b/autosubmit/monitor/monitor.py @@ -53,7 +53,7 @@ class Monitor: (Status.COMPLETED, 'yellow'), (Status.FAILED, 'red'), (Status.DELAYED,'lightcyan') ,(Status.SUSPENDED, 'orange'), (Status.SKIPPED, 'lightyellow')]) def __init__(self): - self.nodes_ploted = None + self.nodes_plotted = None @staticmethod def color_status(status): @@ -145,7 +145,7 @@ class Monitor: graph.add_subgraph(legend) exp = pydotplus.Subgraph(graph_name='Experiment', label=expid) - self.nodes_ploted = set() + self.nodes_plotted = set() Log.debug('Creating job graph...') jobs_packages_dict = dict() @@ -234,9 +234,9 @@ class Monitor: return graph def _add_children(self, job, exp, node_job, groups, hide_groups): - if job in self.nodes_ploted: + if job in self.nodes_plotted: return - self.nodes_ploted.add(job) + self.nodes_plotted.add(job) if job.has_children() != 0: for child in sorted(job.children, key=lambda k: k.name): node_child, skip = self._check_node_exists( @@ -522,7 +522,7 @@ class Monitor: filelist = [f for f in files if f not in remain] for f in filelist: remove(f) - Log.result("Plots cleaned!\nLast two plots remanining there.\n") + Log.result("Plots cleaned!\nLast two plots remaining there.\n") @staticmethod def clean_stats(expid): @@ -542,7 +542,7 @@ class Monitor: filelist = [f for f in files if f not in remain] for f in filelist: remove(f) - Log.result("Stats cleaned!\nLast stats' plot remanining there.\n") + Log.result("Stats cleaned!\nLast stats' plot remaining there.\n") @staticmethod def get_general_stats(expid): diff --git a/autosubmit/platforms/paramiko_platform.py b/autosubmit/platforms/paramiko_platform.py index 039781265bcf98168b5bc542987a85df16a5981b..35b54143c0e3fca62cc82ef02b88e47d9e36159e 100644 --- a/autosubmit/platforms/paramiko_platform.py +++ b/autosubmit/platforms/paramiko_platform.py @@ -1111,7 +1111,7 @@ class ParamikoPlatform(Platform): """ Gets command to check if a job is running given process identifier - :param job_id: process indentifier + :param job_id: process identifier :type job_id: int :return: command to check job status script :rtype: str diff --git a/autosubmit/platforms/platform.py b/autosubmit/platforms/platform.py index 4a8cce357b3baef1c6d868c93b55700186617703..fbb89a0f46a44667761ba243490d1fe844710c18 100644 --- a/autosubmit/platforms/platform.py +++ b/autosubmit/platforms/platform.py @@ -427,7 +427,7 @@ class Platform(object): :type retries: int :param job_name: name of job to check :type job_name: str - :return: True if succesful, False otherwise + :return: True if successful, False otherwise :rtype: bool """ filename = job_name + '_STAT' @@ -450,7 +450,7 @@ class Platform(object): :type retries: int :param job_name: name of job to check :type job_name: str - :return: True if succesful, False otherwise + :return: True if successful, False otherwise :rtype: bool """ filename = job_name @@ -467,7 +467,7 @@ class Platform(object): :type retries: int :param job_name: name of job to check :type job_name: str - :return: True if succesful, False otherwise + :return: True if successful, False otherwise :rtype: bool """ filename = job_name diff --git a/autosubmit/statistics/test.py b/autosubmit/statistics/test.py index d337d29d85f54a6573ef32cb3b40cb5336289fd3..6a95f8397e13a3b7bbf01bb328c4931889ac199a 100644 --- a/autosubmit/statistics/test.py +++ b/autosubmit/statistics/test.py @@ -60,7 +60,7 @@ class TestStatistics(unittest.TestCase): print(exp_stats.get_summary_as_list()) failed_jobs_dict = exp_stats.build_failed_jobs_only_list() else: - raise Exception("Autosubmit API couldn't find jobs that match your search critearia (Section: {0}) in the period from {1} to {2}.".format( + raise Exception("Autosubmit API couldn't find jobs that match your search criteria (Section: {0}) in the period from {1} to {2}.".format( ft, period_ini, period_fi)) return results diff --git a/autosubmit4-config-parser b/autosubmit4-config-parser deleted file mode 160000 index 072d997cb4822cc3958e12282a16181dac9a2db0..0000000000000000000000000000000000000000 --- a/autosubmit4-config-parser +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 072d997cb4822cc3958e12282a16181dac9a2db0 diff --git a/docs/source/devguide/variables.rst b/docs/source/devguide/variables.rst index f52454899f49c93e46499e8089c8aad31fc45b70..9e3e474919526ca4f0dd2cb1611273c97623be1b 100644 --- a/docs/source/devguide/variables.rst +++ b/docs/source/devguide/variables.rst @@ -5,7 +5,7 @@ Variables reference Autosubmit uses a variable substitution system to facilitate the development of the templates. This variables can be used on the template in the form %VARIABLE_NAME%. -All configuration variables non related to current_job or platform are accesible by calling first to their parents. ex: %PROJECT.PROJECT_TYPE% or %DEFAULT.EXPID% +All configuration variables non related to current_job or platform are accessible by calling first to their parents. ex: %PROJECT.PROJECT_TYPE% or %DEFAULT.EXPID% You can review all variables at any given time by using the command :ref:`report`: @@ -31,7 +31,7 @@ This variables are relatives to the current job. - **Chunk_START_YEAR**: chunk's start year - **Chunk_START_MONTH**: chunk's start month - **Chunk_START_DAY**: chunk's start day -- **Chunk_START_HOUR**: chunk's start hout +- **Chunk_START_HOUR**: chunk's start hour - **Chunk_END_DATE**: chunk's end date - **Chunk_END_YEAR**: chunk's end year - **Chunk_END_MONTH**: chunk's end month diff --git a/docs/source/installation/index.rst b/docs/source/installation/index.rst index 84323059e70930553a31ff8ebb774197eceed81e..52b1b6b6b30d6ba3d78f9ddba5c5b395ebed7758 100644 --- a/docs/source/installation/index.rst +++ b/docs/source/installation/index.rst @@ -248,12 +248,12 @@ Mandatory parameters of /etc/autosubmit .. code-block:: ini [database] - # Accesible for all users of the filesystem + # Accessible for all users of the filesystem path = # Experiment database name can be whatever. filename = autosubmit.db - # Accesible for all users of the filesystem, can be the same as database_path + # Accessible for all users of the filesystem, can be the same as database_path [local] path = diff --git a/docs/source/qstartguide/index.rst b/docs/source/qstartguide/index.rst index 518dba4286edce2338f04b53d69ea61cda5e2184..7efa1b3abb8c8904c479521aeacf295522f8e42b 100644 --- a/docs/source/qstartguide/index.rst +++ b/docs/source/qstartguide/index.rst @@ -53,7 +53,7 @@ Description of most used commands - Generates Autosubmit scripts and batch scripts for inspection, by processing the tasks’ templates with the experiment parameters. * - **refresh ** - Updates the project directory. - * - **recovey ** + * - **recovery ** - Recovers the experiment workflow obtaining the last run complete jobs. * - **setstatus ** - Sets one or multiple jobs status to a given value. @@ -144,7 +144,7 @@ Configuration summary: * - ``autosubmit.yml`` - - This file contains the definitions that impact the workflow behavior. - - It changes workflow behavior with parameters such as job limitations, remote_dependendies and retrials. + - It changes workflow behavior with parameters such as job limitations, remote_dependencies and retrials. - It extends autosubmit functionalities with parameters such as wrappers and mail notification. * - ``proj.yml`` - diff --git a/docs/source/troubleshooting/error-codes.rst b/docs/source/troubleshooting/error-codes.rst index 21a252b9380b7583dd93ef9a26d0597c0de4c62a..065d90e9367007d3e318f098778bac495839ca33 100644 --- a/docs/source/troubleshooting/error-codes.rst +++ b/docs/source/troubleshooting/error-codes.rst @@ -121,7 +121,7 @@ Uncatalogued codes - Critical Error codes [7060+] | 7072 | Basic configuration not found | Administrator: run `autosubmit configure --advanced` or create a common file in /etc/autosubmitrc. | | | | User: run `autosubmit configure` or create a $HOME/.autosubmitrc. Following the skeleton of installation page | +------+-----------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| 7073 | Private key is encrypted | Each Sesion: Add your key into the ssh agent. ex. ssh-add $HOME/.ssh/id_rsa, then launch autosubmit. | +| 7073 | Private key is encrypted | Each Session: Add your key into the ssh agent. ex. ssh-add $HOME/.ssh/id_rsa, then launch autosubmit. | | | | Alternative: You can use a non-encrypted key, just make sure that nobody except you has access to the file. | +------+-----------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ diff --git a/docs/source/userguide/configure/develop_a_project.rst b/docs/source/userguide/configure/develop_a_project.rst index a2aa8ecb6dad4c69d45eaaafa36f7301529b62d2..74e6dbced08296794332fb63591379b3fdafe2a2 100644 --- a/docs/source/userguide/configure/develop_a_project.rst +++ b/docs/source/userguide/configure/develop_a_project.rst @@ -302,7 +302,7 @@ Platform configuration Proj configuration ================== -After filling the experiment configuration and promt ``autosubmit create cxxx -np`` create, user can go into ``proj`` which has a copy of the model. +After filling the experiment configuration and prompt ``autosubmit create cxxx -np`` create, user can go into ``proj`` which has a copy of the model. The experiment project contains the scripts specified in ``jobs_cxxx.yml`` and a copy of model source code and data specified in ``expdef_xxxx.yml``. @@ -431,7 +431,7 @@ Example: # Atmospheric nudging towards re-interpolated ERA-Interim data. BOOLEAN: TRUE, FALSE ATM_NUDGING: FALSE # Atmospheric nudging reference data experiment name. [T255L91: b0ir] - ATM_refnud: + ATM_refund: # Nudge vorticity. BOOLEAN: TRUE, FALSE NUD_VO: # Nudge divergence. BOOLEAN: TRUE, FALSE @@ -530,7 +530,7 @@ Configuration of proj.yml .. code-block:: yaml - PROJECT_ROOT: /gpfs/scratch/bsc32/bsc32070/a000/automatic_perfomance_profile + PROJECT_ROOT: /gpfs/scratch/bsc32/bsc32070/a000/automatic_performance_profile REFRESH_GIT_REPO: false Write your original script in the user project directory: @@ -711,7 +711,7 @@ The custom directives can be used for multiple parameters at the same time using # test [40] / small [40] // large [40] PROCESSORS_PER_NODE: 40 -Controling the number of active concurrent tasks in an experiment +Controlling the number of active concurrent tasks in an experiment ---------------------------------------------------------------------- In some cases, you may want to control the number of concurrent tasks/jobs that can be active in an experiment. diff --git a/docs/source/userguide/configure/index.rst b/docs/source/userguide/configure/index.rst index ad6414e92022519cdc0b4c3dc15a6664e3b89a44..3065088e83116a040ba9a0f550c27ce670a297dd 100644 --- a/docs/source/userguide/configure/index.rst +++ b/docs/source/userguide/configure/index.rst @@ -347,7 +347,7 @@ In the file: ## Script to execute. If not specified, job will be omitted from workflow. ## Path relative to the project directory # FILE : - ## Platform to execute the job. If not specified, defaults to HPCARCH in expedf file. + ## Platform to execute the job. If not specified, defaults to HPCARCH in expdef file. ## LOCAL is always defined and refers to current machine # PLATFORM : ## Queue to add the job to. If not specified, uses PLATFORM default. diff --git a/docs/source/userguide/defining_workflows/index.rst b/docs/source/userguide/defining_workflows/index.rst index 8ec731c71d31c9c323b41ceb56de21196bdc54ae..17de360bd535e79c099603bf0f3fb7e5d8a2dfb7 100644 --- a/docs/source/userguide/defining_workflows/index.rst +++ b/docs/source/userguide/defining_workflows/index.rst @@ -397,11 +397,11 @@ The resulting workflow can be seen in Figure :numref:`delay` Workflow examples: ------------------ -Example 1: How to select an specfic chunk +Example 1: How to select an specific chunk ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .. WARNING:: - This example ilustrates the old select_chunk. + This example illustrates the old select_chunk. .. code-block:: yaml diff --git a/test/README_PIP.md b/test/README_PIP.md deleted file mode 100644 index 3fce62d7225bbea1640ff6931a26e09888e51133..0000000000000000000000000000000000000000 --- a/test/README_PIP.md +++ /dev/null @@ -1,12 +0,0 @@ - -Autosubmit is a lightweight workflow manager designed to meet climate research necessities. Unlike other workflow solutions in the domain, it integrates the capabilities of an experiment manager, workflow orchestrator and monitor in a self-contained application. The experiment manager allows for defining and configuring experiments, supported by a hierarchical database that ensures reproducibility and traceability. The orchestrator is designed to run complex workflows in research and operational mode by managing their dependencies and interfacing with local and remote hosts. These multi-scale workflows can involve from a few to thousands of steps and from one to multiple platforms. - -Autosubmit facilitates easy and fast integration and relocation on new platforms. On the one hand, users can rapidly execute general scripts and progressively parametrize them by reading Autosubmit variables. On the other hand, it is a self-contained desktop application capable of submitting jobs to remote platforms without any external deployment. - -Due to its robustness, it can handle different eventualities, such as networking or I/O errors. Finally, the monitoring capabilities extend beyond the desktop application through a REST API that allows communication with workflow monitoring tools such as the Autosubmit web GUI. - -Autosubmit is a Python package provided in PyPI. Conda recipes can also be found on the website. A containerized version for testing purposes is also available but not public yet. - -It has contributed to various European research projects and runs different operational systems. During the following years, it will support some of the Earth Digital Twins as the Digital Twin Ocean. - -Concretely, it is currently used at Barcelona Supercomputing Centre (BSC) to run models (EC-Earth, MONARCH, NEMO, CALIOPE, HERMES...), operational toolchains (S2S4E), data-download workflows (ECMWF MARS), and many other. Autosubmit has run these workflows in different supercomputers in BSC, ECMWF, IC3, CESGA, EPCC, PDC, and OLCF. \ No newline at end of file diff --git a/test/regression/test_ecmwf_with_paramiko/conf/expdef.conf b/test/regression/test_ecmwf_with_paramiko/conf/expdef.conf index 837525cbd276c050ffddce4cd5e26b9593390ffe..bfe7012b1e38962b8b8ef9d53af2bf8ad39b8692 100644 --- a/test/regression/test_ecmwf_with_paramiko/conf/expdef.conf +++ b/test/regression/test_ecmwf_with_paramiko/conf/expdef.conf @@ -15,7 +15,7 @@ HPCARCH = ecmwf-cca # DATELIST = 19[60-65] DATELIST = 19960101 # Supply the list of members. Format fcX -# You can also use an abreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 +# You can also use an abbreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 # fc[0-2] <=> fc0 fc1 fc2 # MEMBERS = fc0 fc1 fc2 fc3 fc4 # MEMBERS = fc[0-4] diff --git a/test/regression/test_large_experiment_on_moore_with_paramiko/conf/expdef.conf b/test/regression/test_large_experiment_on_moore_with_paramiko/conf/expdef.conf index 95aa1f295ef0f17d0ce6f4d1b4fe1c5d107e40a6..6d9fdce6edcdb4c1e6c4fa4b9011128a48e9c0c8 100644 --- a/test/regression/test_large_experiment_on_moore_with_paramiko/conf/expdef.conf +++ b/test/regression/test_large_experiment_on_moore_with_paramiko/conf/expdef.conf @@ -15,7 +15,7 @@ HPCARCH = moore # DATELIST = 19[60-65] DATELIST = 19960101 # Supply the list of members. Format fcX -# You can also use an abreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 +# You can also use an abbreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 # fc[0-2] <=> fc0 fc1 fc2 # MEMBERS = fc0 fc1 fc2 fc3 fc4 # MEMBERS = fc[0-4] diff --git a/test/regression/test_mistral_with_paramiko/conf/expdef.conf b/test/regression/test_mistral_with_paramiko/conf/expdef.conf index c05362da1c7ea558f69e7294ddc7e3d7dc5e973b..b6960bb4d3fba67271e09ac3c7034807606999dc 100644 --- a/test/regression/test_mistral_with_paramiko/conf/expdef.conf +++ b/test/regression/test_mistral_with_paramiko/conf/expdef.conf @@ -15,7 +15,7 @@ HPCARCH = mistral # DATELIST = 19[60-65] DATELIST = 19960101 # Supply the list of members. Format fcX -# You can also use an abreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 +# You can also use an abbreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 # fc[0-2] <=> fc0 fc1 fc2 # MEMBERS = fc0 fc1 fc2 fc3 fc4 # MEMBERS = fc[0-4] diff --git a/test/regression/test_mn3_with_paramiko/conf/expdef.conf b/test/regression/test_mn3_with_paramiko/conf/expdef.conf index e008ab94398b5abeba00a53239f042f735f19e37..15af2285541f45db85a64e8852fe9fc33532a94f 100644 --- a/test/regression/test_mn3_with_paramiko/conf/expdef.conf +++ b/test/regression/test_mn3_with_paramiko/conf/expdef.conf @@ -15,7 +15,7 @@ HPCARCH = marenostrum3 # DATELIST = 19[60-65] DATELIST = 19960101 # Supply the list of members. Format fcX -# You can also use an abreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 +# You can also use an abbreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 # fc[0-2] <=> fc0 fc1 fc2 # MEMBERS = fc0 fc1 fc2 fc3 fc4 # MEMBERS = fc[0-4] diff --git a/test/regression/test_mn3_with_paramiko_python/conf/expdef.conf b/test/regression/test_mn3_with_paramiko_python/conf/expdef.conf index 136d585ec3d506d43c4d61f631dade6010623798..db91064e0ac2befb14905c9cd1432fb4b7da2a24 100644 --- a/test/regression/test_mn3_with_paramiko_python/conf/expdef.conf +++ b/test/regression/test_mn3_with_paramiko_python/conf/expdef.conf @@ -15,7 +15,7 @@ HPCARCH = marenostrum3 # DATELIST = 19[60-65] DATELIST = 19960101 # Supply the list of members. Format fcX -# You can also use an abreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 +# You can also use an abbreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 # fc[0-2] <=> fc0 fc1 fc2 # MEMBERS = fc0 fc1 fc2 fc3 fc4 # MEMBERS = fc[0-4] diff --git a/test/regression/test_mn4_horizontal_vertical_wrapper_with_paramiko/conf/expdef.conf b/test/regression/test_mn4_horizontal_vertical_wrapper_with_paramiko/conf/expdef.conf index 4d40baadfad2ef9f45ae305ca77453e17d62d773..77b3417c2fae606225df6ae60da047c13f0f175e 100644 --- a/test/regression/test_mn4_horizontal_vertical_wrapper_with_paramiko/conf/expdef.conf +++ b/test/regression/test_mn4_horizontal_vertical_wrapper_with_paramiko/conf/expdef.conf @@ -15,7 +15,7 @@ HPCARCH = marenostrum4 # DATELIST = 19[60-65] DATELIST = 19960101 # Supply the list of members. Format fcX -# You can also use an abreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 +# You can also use an abbreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 # fc[0-2] <=> fc0 fc1 fc2 # MEMBERS = fc0 fc1 fc2 fc3 fc4 # MEMBERS = fc[0-4] diff --git a/test/regression/test_mn4_horizontal_wrapper_with_paramiko/conf/expdef.conf b/test/regression/test_mn4_horizontal_wrapper_with_paramiko/conf/expdef.conf index 60679867b2b75ae5dc26767198e7a94c466bb1d2..b81836e4c4f46c75b83e070be228febf616451ac 100644 --- a/test/regression/test_mn4_horizontal_wrapper_with_paramiko/conf/expdef.conf +++ b/test/regression/test_mn4_horizontal_wrapper_with_paramiko/conf/expdef.conf @@ -15,7 +15,7 @@ HPCARCH = marenostrum4 # DATELIST = 19[60-65] DATELIST = 19960101 # Supply the list of members. Format fcX -# You can also use an abreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 +# You can also use an abbreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 # fc[0-2] <=> fc0 fc1 fc2 # MEMBERS = fc0 fc1 fc2 fc3 fc4 # MEMBERS = fc[0-4] diff --git a/test/regression/test_mn4_vertical_horizontal_wrapper_with_paramiko/conf/expdef.conf b/test/regression/test_mn4_vertical_horizontal_wrapper_with_paramiko/conf/expdef.conf index 4d40baadfad2ef9f45ae305ca77453e17d62d773..77b3417c2fae606225df6ae60da047c13f0f175e 100644 --- a/test/regression/test_mn4_vertical_horizontal_wrapper_with_paramiko/conf/expdef.conf +++ b/test/regression/test_mn4_vertical_horizontal_wrapper_with_paramiko/conf/expdef.conf @@ -15,7 +15,7 @@ HPCARCH = marenostrum4 # DATELIST = 19[60-65] DATELIST = 19960101 # Supply the list of members. Format fcX -# You can also use an abreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 +# You can also use an abbreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 # fc[0-2] <=> fc0 fc1 fc2 # MEMBERS = fc0 fc1 fc2 fc3 fc4 # MEMBERS = fc[0-4] diff --git a/test/regression/test_mn4_vertical_wrapper_with_paramiko/conf/expdef.conf b/test/regression/test_mn4_vertical_wrapper_with_paramiko/conf/expdef.conf index 15cf275eb47caadf1aed91cd6b597e25db963abc..300d9de5b3d8b6979b84995d0a9935a65b9bacc9 100644 --- a/test/regression/test_mn4_vertical_wrapper_with_paramiko/conf/expdef.conf +++ b/test/regression/test_mn4_vertical_wrapper_with_paramiko/conf/expdef.conf @@ -15,7 +15,7 @@ HPCARCH = marenostrum4 # DATELIST = 19[60-65] DATELIST = 19960101 # Supply the list of members. Format fcX -# You can also use an abreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 +# You can also use an abbreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 # fc[0-2] <=> fc0 fc1 fc2 # MEMBERS = fc0 fc1 fc2 fc3 fc4 # MEMBERS = fc[0-4] diff --git a/test/regression/test_mn4_with_paramiko/conf/expdef.conf b/test/regression/test_mn4_with_paramiko/conf/expdef.conf index d193973c31d55f8a3e9bae5e721b9a8718358e31..7b0693ede772040f10ef5ec76c9bd61e34e775d0 100644 --- a/test/regression/test_mn4_with_paramiko/conf/expdef.conf +++ b/test/regression/test_mn4_with_paramiko/conf/expdef.conf @@ -15,7 +15,7 @@ HPCARCH = marenostrum4 # DATELIST = 19[60-65] DATELIST = 19960101 # Supply the list of members. Format fcX -# You can also use an abreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 +# You can also use an abbreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 # fc[0-2] <=> fc0 fc1 fc2 # MEMBERS = fc0 fc1 fc2 fc3 fc4 # MEMBERS = fc[0-4] diff --git a/test/regression/test_mn4_with_paramiko_python/conf/expdef.conf b/test/regression/test_mn4_with_paramiko_python/conf/expdef.conf index 330bd056cdc67fdecdbce2a49fe515b0bb4eaf4c..0730b301682884fe481148e19fd85e9e6ea05a46 100644 --- a/test/regression/test_mn4_with_paramiko_python/conf/expdef.conf +++ b/test/regression/test_mn4_with_paramiko_python/conf/expdef.conf @@ -15,7 +15,7 @@ HPCARCH = marenostrum4 # DATELIST = 19[60-65] DATELIST = 19960101 # Supply the list of members. Format fcX -# You can also use an abreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 +# You can also use an abbreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 # fc[0-2] <=> fc0 fc1 fc2 # MEMBERS = fc0 fc1 fc2 fc3 fc4 # MEMBERS = fc[0-4] diff --git a/test/regression/test_moore_with_paramiko/conf/expdef.conf b/test/regression/test_moore_with_paramiko/conf/expdef.conf index c8a943b25decb4b4adfb0131b7e3ef3dc5e66127..b25d8ebca1753cf7d44f5304b40b41197db88b58 100644 --- a/test/regression/test_moore_with_paramiko/conf/expdef.conf +++ b/test/regression/test_moore_with_paramiko/conf/expdef.conf @@ -15,7 +15,7 @@ HPCARCH = moore # DATELIST = 19[60-65] DATELIST = 19960101 # Supply the list of members. Format fcX -# You can also use an abreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 +# You can also use an abbreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 # fc[0-2] <=> fc0 fc1 fc2 # MEMBERS = fc0 fc1 fc2 fc3 fc4 # MEMBERS = fc[0-4] diff --git a/test/regression/test_moore_with_paramiko_python/conf/expdef.conf b/test/regression/test_moore_with_paramiko_python/conf/expdef.conf index 35ac9101d78e12dfbbe667f4e02a27d3c03457b3..a2bfc131684468d86797aa2f0b3f566d21b9572c 100644 --- a/test/regression/test_moore_with_paramiko_python/conf/expdef.conf +++ b/test/regression/test_moore_with_paramiko_python/conf/expdef.conf @@ -15,7 +15,7 @@ HPCARCH = moore # DATELIST = 19[60-65] DATELIST = 19960101 # Supply the list of members. Format fcX -# You can also use an abreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 +# You can also use an abbreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 # fc[0-2] <=> fc0 fc1 fc2 # MEMBERS = fc0 fc1 fc2 fc3 fc4 # MEMBERS = fc[0-4] diff --git a/test/regression/test_sedema_with_paramiko/conf/expdef.conf b/test/regression/test_sedema_with_paramiko/conf/expdef.conf index 942496b06983b190c8eebeb0e262de11796e1af3..2e512577c8269ce2d060fd2336487e9666a047af 100644 --- a/test/regression/test_sedema_with_paramiko/conf/expdef.conf +++ b/test/regression/test_sedema_with_paramiko/conf/expdef.conf @@ -15,7 +15,7 @@ HPCARCH = SEDEMA # DATELIST = 19[60-65] DATELIST = 19960101 # Supply the list of members. Format fcX -# You can also use an abreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 +# You can also use an abbreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 # fc[0-2] <=> fc0 fc1 fc2 # MEMBERS = fc0 fc1 fc2 fc3 fc4 # MEMBERS = fc[0-4] diff --git a/test/regression/test_sedema_with_paramiko_python/conf/expdef.conf b/test/regression/test_sedema_with_paramiko_python/conf/expdef.conf index 562b0b2309cd874d3efa8e611622b798b4e9ec74..5be71907a2f9824ee361697f868c3e4231048476 100644 --- a/test/regression/test_sedema_with_paramiko_python/conf/expdef.conf +++ b/test/regression/test_sedema_with_paramiko_python/conf/expdef.conf @@ -15,7 +15,7 @@ HPCARCH = SEDEMA # DATELIST = 19[60-65] DATELIST = 19960101 # Supply the list of members. Format fcX -# You can also use an abreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 +# You can also use an abbreviated syntax for multiple members: fc[0 1 2] <=> fc0 fc1 fc2 # fc[0-2] <=> fc0 fc1 fc2 # MEMBERS = fc0 fc1 fc2 fc3 fc4 # MEMBERS = fc[0-4] diff --git a/test/unit/test_dic_jobs.py b/test/unit/test_dic_jobs.py index b94b34b5c57a0c8d37baa172d677a87adc272459..40b7dadff46210b9bc2e13f095118432fbeffba9 100644 --- a/test/unit/test_dic_jobs.py +++ b/test/unit/test_dic_jobs.py @@ -338,7 +338,7 @@ class TestDicJobs(TestCase): 'FREQUENCY': 123, 'DELAY': -1, 'PLATFORM': 'FAKE-PLATFORM', - 'FILE': 'fake-fike', + 'FILE': 'fake-file', 'QUEUE': 'fake-queue', 'PROCESSORS': '111', 'THREADS': '222', diff --git a/test/unit/test_job_common.py b/test/unit/test_job_common.py index aa44db03bd89daa701f0bfccd3f54c65db6e1eda..bf9e2ac68f6b0933d2049687f3a51fb897fb949b 100644 --- a/test/unit/test_job_common.py +++ b/test/unit/test_job_common.py @@ -5,7 +5,7 @@ from autosubmit.job.job_common import Status class TestJobCommon(TestCase): """ - This test is intended to prevent wrong changes on the Status classs definition + This test is intended to prevent wrong changes on the Status class definition """ def test_value_to_key_has_the_same_values_as_status_constants(self):