Skip to content

Commit

Permalink
Fixes #324 (#325)
Browse files Browse the repository at this point in the history
  • Loading branch information
scottwedge authored Oct 9, 2020
1 parent a459145 commit 4cadf37
Show file tree
Hide file tree
Showing 16 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion docs/source/installing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Once installed run::

usage: maestro [-h] [-l LOGPATH] [-d DEBUG_LVL] [-c] {cancel,run,status} ...

The Maestro Workflow Conductor for specifiying, launching, and managing general workflows.
The Maestro Workflow Conductor for specifying, launching, and managing general workflows.

positional arguments:
{cancel,run,status}
Expand Down
2 changes: 1 addition & 1 deletion maestrowf/abstracts/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
The core abstract APIs that define various class behaviors.
This module contains all of the abstract classes and APIs for defining objects.
Abstracts include abstract data stuctures (like a graph), APIs for concepts
Abstracts include abstract data structures (like a graph), APIs for concepts
such as queueing adapters and environment APIs, as well as fundamental data
structures.
"""
Expand Down
2 changes: 1 addition & 1 deletion maestrowf/abstracts/abstractclassmethod.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

class abstractclassmethod(classmethod):
"""Python 2.7 does not include built in @abstractclassmethod so we create
our own class that extends @classmethod and then attachs a
our own class that extends @classmethod and then attaches a
__isabstractmethod variable to the callable function. See ref:
https://stackoverflow.com/a/11218474"""

Expand Down
8 changes: 4 additions & 4 deletions maestrowf/abstracts/envobject.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class EnvObject:
The EnvObject is meant to be used to represent entities in the larger
environment that affect the execution of a study (and therefore jobs).
This abstact base class should be used to represent things such as data
This abstract base class should be used to represent things such as data
dependencies, code dependencies, variables, aliases, etc. The only method
we require is _verify, to allow users to verify that they've provided the
minimal information for the object to be valid.
Expand Down Expand Up @@ -112,8 +112,8 @@ def apply(self, data):
Apply the Source to some string data.
Subclasses of Source should use this method in order to apply an
environment alterating change. The 'data' parameter should be a string
representing a command to apply Source to or a list of other comands
environment altering change. The 'data' parameter should be a string
representing a command to apply Source to or a list of other commands
that Source should be included with.
:param data: A string representing a command or set of other sources.
Expand All @@ -139,7 +139,7 @@ class Dependency(Substitution):
* External APIs that a workflow needs to pull data from
The goal of this base class is to make it so that this package is able to
pull exernal dependencies in a consistent manner.
pull external dependencies in a consistent manner.
"""

@abstractmethod
Expand Down
6 changes: 3 additions & 3 deletions maestrowf/abstracts/interfaces/schedulerscriptadapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def __init__(self, **kwargs):
# NOTE: The _batch member should be used to store persistent batching
# parameters. The entries in this dictionary are meant to capture the
# the base settings for submission to a batch. This member variables
# should never be used publicallly outside of an instance.
# should never be used publicly outside of an instance.

# Call super to set self._exec
super(SchedulerScriptAdapter, self).__init__(**kwargs)
Expand Down Expand Up @@ -105,7 +105,7 @@ def get_header(self, step):
@abstractmethod
def get_parallelize_command(self, procs, nodes, **kwargs):
"""
Generate the parallelization segement of the command line.
Generate the parallelization segment of the command line.
:param procs: Number of processors to allocate to the parallel call.
:param nodes: Number of nodes to allocate to the parallel call
Expand All @@ -117,7 +117,7 @@ def get_parallelize_command(self, procs, nodes, **kwargs):

def _substitute_parallel_command(self, step_cmd, **kwargs):
"""
Substitute parallelized segements into a specified command.
Substitute parallelized segments into a specified command.
:param step_cmd: Command string to parallelize.
:param nodes: Total number of requested nodes.
Expand Down
2 changes: 1 addition & 1 deletion maestrowf/conductor.py
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ def monitor_study(self):

LOGGER.info("Checking DAG status at %s", str(datetime.now()))
# Execute steps that are ready
# Recieves StudyStatus enum
# Receives StudyStatus enum
completion_status = dag.execute_ready_steps()
# Re-pickle the ExecutionGraph.
dag.pickle(pkl_path)
Expand Down
2 changes: 1 addition & 1 deletion maestrowf/datastructures/core/parameters.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ class ParameterGenerator:
defined and will generate each combination one by one. The end user should
NEVER SEE AN INVALID COMBINATION. Because this class generates the
combinations as specified by the parameters added (eventually with types
or enforced inheritence), and eventually constraints, it opens up being
or enforced inheritance), and eventually constraints, it opens up being
able to quietly change how this class generates its combinations.
Easily convert studies to other types of studies. Because the API doesn't
Expand Down
4 changes: 2 additions & 2 deletions maestrowf/datastructures/core/study.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def __eq__(self, other):
: returns: True if other is equal to self, False otherwise.
"""
if isinstance(other, self.__class__):
# This works because the classes are currently intefaces over
# This works because the classes are currently interfaces over
# internals that are all based on Python builtin classes.
# NOTE: This method will need to be reworked if something more
# complex is done with the class.
Expand Down Expand Up @@ -798,7 +798,7 @@ def _stage_linear(self, dag):
used_spaces = re.findall(WSREGEX, cmd)
for match in used_spaces:
# In this case we don't need to look for any parameters, or
# combination depdendent ("funnel") steps. It's a simple sub.
# combination dependent ("funnel") steps. It's a simple sub.
LOGGER.info("Workspace found -- %s", match)
workspace_var = "$({}.workspace)".format(match)
ws = self.workspaces[match]
Expand Down
2 changes: 1 addition & 1 deletion maestrowf/datastructures/dag.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
# SOFTWARE.
###############################################################################

"""Module that contains the implemenation of a Directed-Acyclic Graph."""
"""Module that contains the implementation of a Directed-Acyclic Graph."""

from collections import deque, OrderedDict
import logging
Expand Down
2 changes: 1 addition & 1 deletion maestrowf/datastructures/environment/gitdependency.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def __init__(self, name, value, path, token='$', **kwargs):
Currently, the GitDependency class only supports three optional
parameters: branch, hash, and tag. Each operate as their name specifies
according to how they would be used in git. The class will acquire the
specfic repository in accordance with a specified optional (example:
specific repository in accordance with a specified optional (example:
if a tag is specfied, the class will clone then checkout the tag). The
only caveat to the optionals is that only one may be used at a time.
Expand Down
2 changes: 1 addition & 1 deletion maestrowf/interfaces/script/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def job_identifier(self):
"""
Property for the job identifier for the record.
:returns: A string representing the job identifer assigned by the
:returns: A string representing the job identifier assigned by the
scheduler.
"""
return self._info.get("jobid", None)
Expand Down
2 changes: 1 addition & 1 deletion maestrowf/interfaces/script/slurmscriptadapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ def get_parallelize_command(self, procs, nodes=None, **kwargs):
for key in supported:
value = kwargs.get(key)
if key not in self._cmd_flags:
LOGGER.warning("'%s' is not supported -- ommitted.", key)
LOGGER.warning("'%s' is not supported -- omitted.", key)
continue
if value:
args += [
Expand Down
4 changes: 2 additions & 2 deletions maestrowf/maestro.py
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ def setup_argparser():
"""Set up the program's argument parser."""
parser = ArgumentParser(
prog="maestro",
description="The Maestro Workflow Conductor for specifiying, launching"
description="The Maestro Workflow Conductor for specifying, launching"
", and managing general workflows.",
formatter_class=RawTextHelpFormatter)
subparsers = parser.add_subparsers(dest='subparser')
Expand Down Expand Up @@ -439,7 +439,7 @@ def main():
This function uses command line arguments to locate the study description.
It makes use of the maestrowf core data structures as a high level class
inerface.
interface.
"""
# Set up the necessary base data structures to begin study set up.
parser = setup_argparser()
Expand Down
4 changes: 2 additions & 2 deletions samples/documentation/lulesh_sample1_unix_commented.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ env:
# Study Block (Required)
####################################
# The study block is where the steps in the workflow are defined. This section
# of the specfication represents the unexpanded set of tasks that the study
# of the specification represents the unexpanded set of tasks that the study
# is composed of.
####################################
study:
Expand Down Expand Up @@ -214,7 +214,7 @@ study:
# There are three keys per parameter:
# 1. A list of values that the parameter takes.
# 2. A label that represents a "pretty printed" version of the parameter. The
# parameter values is specfied by the '%%' moniker (for example, for SIZE --
# parameter values is specified by the '%%' moniker (for example, for SIZE --
# when SIZE is equal to 10, the label will be 'SIZE.10'). To access the label
# for SIZE, for example, the token '$(SIZE.label)' is used.
# Labels can take one of two forms: A single string with the '%%' marker or
Expand Down
2 changes: 1 addition & 1 deletion samples/parameterization/lulesh_itertools_pgen.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ def get_custom_generator(env, **kwargs):
Create a custom populated ParameterGenerator.
This function recreates the exact same parameter set as the sample LULESH
specifications. The difference here is that itertools is employed to
programatically generate the samples instead of manually writing out
programmatically generate the samples instead of manually writing out
all of the combinations.
:params env: A StudyEnvironment object containing custom information.
:params kwargs: A dictionary of keyword arguments this function uses.
Expand Down
2 changes: 1 addition & 1 deletion tests/interfaces/test_script_adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def test_factory():
def test_get_valid_adapters():
"""
Test to verify that the keys in the internal factory is the same set as
the resutls from get_valid_adapters()
the results from get_valid_adapters()
"""
saf = ScriptAdapterFactory
assert(saf.factories.keys() == ScriptAdapterFactory.get_valid_adapters())
Expand Down

0 comments on commit 4cadf37

Please sign in to comment.