Revert maestro 1.1.8 support (#241)

* reverted support of Maestro 1.1.8

* removed tests that use maestro validation

* fixed style

CHANGELOG.md

@@ -7,7 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Added
-- Integrated Maestro validation into merlin.
 - The sample generation command now logs stdout, stderr, and cmd.sh to merlin_info.
 - Add the bank and walltime keywords to the batch slurm launch, these
   will not alter the lsf launch.
@@ -17,7 +16,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Updated to new celery (4.4.5) syntax for signature return codes.
 - Corrected prior bugfix.
-- Unfroze Maestro version dependency.
 - Slightly improved logic by using regex to match variable tokens.
 
 ## [1.6.1]

merlin/celery.py

@@ -29,10 +29,7 @@
 ###############################################################################
 
 """Updated celery configuration."""
-from __future__ import (
-    absolute_import,
-    print_function,
-)
+from __future__ import absolute_import, print_function
 
 import logging
 import os
@@ -43,10 +40,7 @@
 from celery.signals import worker_process_init
 
 import merlin.common.security.encrypt_backend_traffic
-from merlin.config import (
-    broker,
-    results_backend,
-)
+from merlin.config import broker, results_backend
 from merlin.config.configfile import CONFIG
 from merlin.log_formatter import FORMATS
 from merlin.router import route_for_task

merlin/common/sample_index_factory.py

@@ -33,10 +33,7 @@
 """
 from parse import parse
 
-from merlin.common.sample_index import (
-    MAX_SAMPLE,
-    SampleIndex,
-)
+from merlin.common.sample_index import MAX_SAMPLE, SampleIndex
 from merlin.utils import cd
 
 

merlin/common/tasks.py

@@ -29,25 +29,13 @@
 ###############################################################################
 
 """Test tasks."""
-from __future__ import (
-    absolute_import,
-    unicode_literals,
-)
+from __future__ import absolute_import, unicode_literals
 
 import logging
 import os
 
-from celery import (
-    chain,
-    chord,
-    group,
-    shared_task,
-    signature,
-)
-from celery.exceptions import (
-    OperationalError,
-    TimeoutError,
-)
+from celery import chain, chord, group, shared_task, signature
+from celery.exceptions import OperationalError, TimeoutError
 
 from merlin.common.abstracts.enums import ReturnCode
 from merlin.common.sample_index import uniform_directories

merlin/config/broker.py

@@ -36,10 +36,7 @@
 import os
 from os.path import expanduser
 
-from merlin.config.configfile import (
-    CONFIG,
-    get_ssl_entries,
-)
+from merlin.config.configfile import CONFIG, get_ssl_entries
 
 
 try:

merlin/config/results_backend.py

@@ -36,10 +36,7 @@
 import logging
 import os
 
-from merlin.config.configfile import (
-    CONFIG,
-    get_ssl_entries,
-)
+from merlin.config.configfile import CONFIG, get_ssl_entries
 
 
 try:

merlin/display.py

@@ -40,10 +40,7 @@
 from tabulate import tabulate
 
 from merlin.ascii_art import banner_small
-from merlin.config import (
-    broker,
-    results_backend,
-)
+from merlin.config import broker, results_backend
 from merlin.config.configfile import default_config_info
 
 

merlin/examples/workflows/feature_demo/scripts/learn.py

@@ -2,7 +2,6 @@
 import sys
 
 import numpy as np
-
 from sklearn.ensemble import RandomForestRegressor
 
 

merlin/examples/workflows/hpc_demo/cumulative_sample_processor.py

@@ -1,10 +1,9 @@
 import argparse
 import os
 import sys
-
-import matplotlib.pyplot as plt
 from concurrent.futures import ProcessPoolExecutor
 
+import matplotlib.pyplot as plt
 import pandas as pd
 
 

merlin/examples/workflows/hpc_demo/sample_collector.py

@@ -1,7 +1,6 @@
 import argparse
 import os
 import sys
-
 from concurrent.futures import ProcessPoolExecutor
 
 

merlin/examples/workflows/iterative_demo/cumulative_sample_processor.py

@@ -1,10 +1,9 @@
 import argparse
 import os
 import sys
-
-import matplotlib.pyplot as plt
 from concurrent.futures import ProcessPoolExecutor
 
+import matplotlib.pyplot as plt
 import pandas as pd
 
 

merlin/examples/workflows/iterative_demo/sample_collector.py

@@ -1,7 +1,6 @@
 import argparse
 import os
 import sys
-
 from concurrent.futures import ProcessPoolExecutor
 
 

merlin/examples/workflows/openfoam_wf/scripts/learn.py

@@ -1,12 +1,12 @@
 import argparse
 
-import matplotlib.pyplot as plt
 import numpy as np
-
 from joblib import dump
 from sklearn.ensemble import RandomForestRegressor
 from sklearn.metrics import mean_squared_error
 
+import matplotlib.pyplot as plt
+
 
 descript = """Using parameters to edit OpenFOAM parameters"""
 parser = argparse.ArgumentParser(description=descript)

merlin/examples/workflows/openfoam_wf_no_docker/scripts/learn.py

@@ -1,12 +1,12 @@
 import argparse
 
-import matplotlib.pyplot as plt
 import numpy as np
-
 from joblib import dump
 from sklearn.ensemble import RandomForestRegressor
 from sklearn.metrics import mean_squared_error
 
+import matplotlib.pyplot as plt
+
 
 descript = """Using parameters to edit OpenFOAM parameters"""
 parser = argparse.ArgumentParser(description=descript)

merlin/main.py

@@ -44,20 +44,11 @@
 )
 from contextlib import suppress
 
-from merlin import (
-    VERSION,
-    router,
-)
+from merlin import VERSION, router
 from merlin.ascii_art import banner_small
-from merlin.examples.generator import (
-    list_examples,
-    setup_example,
-)
+from merlin.examples.generator import list_examples, setup_example
 from merlin.log_formatter import setup_logging
-from merlin.spec.expansion import (
-    RESERVED,
-    get_spec_with_expansion,
-)
+from merlin.spec.expansion import RESERVED, get_spec_with_expansion
 from merlin.spec.specification import MerlinSpec
 from merlin.study.study import MerlinStudy
 from merlin.utils import ARRAY_FILE_FORMATS

merlin/spec/__init__.py

@@ -27,8 +27,3 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 ###############################################################################
-import os
-
-
-dirpath = os.path.dirname(os.path.abspath(__file__))
-SCHEMA_PATH = os.path.join(dirpath, "merlin_schemas.json")

merlin/spec/expansion.py

@@ -30,21 +30,12 @@
 
 import logging
 from collections import ChainMap
-from os.path import (
-    expanduser,
-    expandvars,
-)
+from os.path import expanduser, expandvars
 
 from merlin.common.abstracts.enums import ReturnCode
-from merlin.spec.override import (
-    dump_with_overrides,
-    error_override_vars,
-)
+from merlin.spec.override import dump_with_overrides, error_override_vars
 from merlin.spec.specification import MerlinSpec
-from merlin.utils import (
-    contains_shell_ref,
-    contains_token,
-)
+from merlin.utils import contains_shell_ref, contains_token
 
 
 MAESTRO_RESERVED = {"SPECROOT", "WORKSPACE", "LAUNCHER"}