Fixes from bespoke

.github/linters/.python-lint

@@ -55,6 +55,7 @@ confidence=
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
 disable=
+        use-maxsplit-arg,
         consider-using-f-string,
         # Defaults
         print-statement,

.github/workflows/pull_request_tests.yml

@@ -27,6 +27,7 @@ jobs:
       shell: bash -l {0}
       run: |
         conda install rtree pip pytest geopandas
+        pip install --upgrade --force-reinstall shapely
         pip install pytest-cov
         pip install -e .
         pip install HOPP

reVX/least_cost_xmission/cost_creator_cli.py

@@ -66,7 +66,7 @@ def run_local(ctx, config):
                default_mults=config.default_mults,
                tiff_dir=config.tiff_dir,
                extra_layers=config.extra_layers,
-               log_dir=config.logdir,
+               log_dir=config.log_directory,
                verbose=config.log_level)
 
 
@@ -188,7 +188,7 @@ def get_node_cmd(config):
             '-dm {}'.format(SLURM.s(config.default_mults)),
             '-tiff {}'.format(SLURM.s(config.tiff_dir)),
             '-lyrs {}'.format(SLURM.s(config.extra_layers)),
-            '-log {}'.format(SLURM.s(config.logdir)),
+            '-log {}'.format(SLURM.s(config.log_directory)),
             ]
 
     if config.log_level == logging.DEBUG:
@@ -213,7 +213,7 @@ def eagle(config):
 
     cmd = get_node_cmd(config)
     name = config.name
-    log_dir = config.logdir
+    log_dir = config.log_directory
     stdout_path = os.path.join(log_dir, 'stdout/')
 
     slurm_manager = SLURM()

reVX/least_cost_xmission/least_cost_paths_cli.py

@@ -66,7 +66,7 @@ def run_local(ctx, config):
                max_workers=config.execution_control.max_workers,
                save_paths=config.save_paths,
                out_dir=config.dirout,
-               log_dir=config.logdir,
+               log_dir=config.log_directory,
                verbose=config.log_level)
 
 
@@ -189,7 +189,7 @@ def get_node_cmd(config):
             '-bmult {}'.format(SLURM.s(config.barrier_mult)),
             '-mw {}'.format(SLURM.s(config.execution_control.max_workers)),
             '-o {}'.format(SLURM.s(config.dirout)),
-            '-log {}'.format(SLURM.s(config.logdir)),
+            '-log {}'.format(SLURM.s(config.log_directory)),
             ]
 
     if config.save_paths:
@@ -217,7 +217,7 @@ def eagle(config):
 
     cmd = get_node_cmd(config)
     name = config.name
-    log_dir = config.logdir
+    log_dir = config.log_directory
     stdout_path = os.path.join(log_dir, 'stdout/')
 
     slurm_manager = SLURM()

reVX/least_cost_xmission/least_cost_xmission_cli.py

@@ -68,7 +68,7 @@ def run_local(ctx, config):
                barrier_mult=config.barrier_mult,
                max_workers=config.execution_control.max_workers,
                out_dir=config.dirout,
-               log_dir=config.logdir,
+               log_dir=config.log_directory,
                verbose=config.log_level)
 
 
@@ -201,7 +201,7 @@ def get_node_cmd(config):
             '-bmult {}'.format(SLURM.s(config.barrier_mult)),
             '-mw {}'.format(SLURM.s(config.execution_control.max_workers)),
             '-o {}'.format(SLURM.s(config.dirout)),
-            '-log {}'.format(SLURM.s(config.logdir)),
+            '-log {}'.format(SLURM.s(config.log_directory)),
             ]
 
     if config.log_level == logging.DEBUG:
@@ -226,7 +226,7 @@ def eagle(config):
 
     cmd = get_node_cmd(config)
     name = config.name
-    log_dir = config.logdir
+    log_dir = config.log_directory
     stdout_path = os.path.join(log_dir, 'stdout/')
 
     slurm_manager = SLURM()

reVX/offshore/assembly_areas_cli.py

@@ -60,7 +60,7 @@ def run_local(ctx, config):
                assembly_areas=config.assembly_areas,
                excl_fpath=config.excl_fpath,
                ports_dset=config.ports_dset,
-               log_dir=config.logdir,
+               log_dir=config.log_directory,
                verbose=config.log_level)
 
 
@@ -149,7 +149,7 @@ def get_node_cmd(config):
             '-areas {}'.format(SLURM.s(config.assembly_areas)),
             '-excl {}'.format(SLURM.s(config.excl_fpath)),
             '-ports {}'.format(SLURM.s(config.ports_dset)),
-            '-log {}'.format(SLURM.s(config.logdir)),
+            '-log {}'.format(SLURM.s(config.log_directory)),
             ]
 
     if config.log_level == logging.DEBUG:
@@ -174,7 +174,7 @@ def eagle(config):
 
     cmd = get_node_cmd(config)
     name = config.name
-    log_dir = config.logdir
+    log_dir = config.log_directory
     stdout_path = os.path.join(log_dir, 'stdout/')
 
     slurm_manager = SLURM()

reVX/offshore/dist_to_ports_cli.py

@@ -62,7 +62,7 @@ def run_local(ctx, config):
                input_dist_layer=config.input_dist_layer,
                max_workers=config.execution_control.max_workers,
                replace=config.replace,
-               log_dir=config.logdir,
+               log_dir=config.log_directory,
                verbose=config.log_level)
 
 
@@ -163,7 +163,7 @@ def get_node_cmd(config):
             '-idl {}'.format(SLURM.s(config.input_dist_layer)),
             '-odl {}'.format(SLURM.s(config.output_dist_layer)),
             '-mw {}'.format(SLURM.s(config.execution_control.max_workers)),
-            '-log {}'.format(SLURM.s(config.logdir)),
+            '-log {}'.format(SLURM.s(config.log_directory)),
             ]
 
     if config.replace:
@@ -191,7 +191,7 @@ def eagle(config):
 
     cmd = get_node_cmd(config)
     name = config.name
-    log_dir = config.logdir
+    log_dir = config.log_directory
     stdout_path = os.path.join(log_dir, 'stdout/')
 
     slurm_manager = SLURM()

reVX/offshore/offshore_inputs_cli.py

@@ -62,7 +62,7 @@ def run_local(ctx, config):
                input_layers=config.input_layers,
                out_dir=config.dirout,
                tm_dset=config.tm_dset,
-               log_dir=config.logdir,
+               log_dir=config.log_directory,
                verbose=config.log_level)
 
 
@@ -165,7 +165,7 @@ def get_node_cmd(config):
             '-layers {}'.format(SLURM.s(config.input_layers)),
             '-o {}'.format(SLURM.s(config.dirout)),
             '-tm {}'.format(SLURM.s(config.tm_dset)),
-            '-log {}'.format(SLURM.s(config.logdir)),
+            '-log {}'.format(SLURM.s(config.log_directory)),
             ]
 
     if config.log_level == logging.DEBUG:
@@ -190,7 +190,7 @@ def eagle(config):
 
     cmd = get_node_cmd(config)
     name = config.name
-    log_dir = config.logdir
+    log_dir = config.log_directory
     stdout_path = os.path.join(log_dir, 'stdout/')
 
     slurm_manager = SLURM()

reVX/reeds/reeds_cli.py

@@ -66,7 +66,7 @@ def run_local(ctx, config):
     ctx.obj['NAME'] = config.name
     ctx.invoke(local,
                out_dir=config.dirout,
-               log_dir=config.logdir)
+               log_dir=config.log_directory)
 
     if config.classify is not None:
         ctx.invoke(classify,
@@ -379,7 +379,7 @@ def get_node_cmd(config):
     args = ['-n {}'.format(SLURM.s(config.name)),
             'local',
             '-o {}'.format(SLURM.s(config.dirout)),
-            '-log {}'.format(SLURM.s(config.logdir)),
+            '-log {}'.format(SLURM.s(config.log_directory)),
             ]
 
     if config.log_level == logging.DEBUG:
@@ -447,7 +447,7 @@ def eagle(config):
 
     cmd = get_node_cmd(config)
     name = config.name
-    log_dir = config.logdir
+    log_dir = config.log_directory
     stdout_path = os.path.join(log_dir, 'stdout/')
 
     logger.info('Running reVX-REEDS pipeline on Eagle with '

reVX/rpm/rpm_cli.py

@@ -64,7 +64,7 @@ def run_local(ctx, config):
     ctx.invoke(local,
                out_dir=config.dirout,
                cf_profiles=config.cf_profiles,
-               log_dir=config.logdir,
+               log_dir=config.log_directory,
                max_workers=config.execution_control.max_workers)
 
     if config.cluster is not None:
@@ -291,7 +291,7 @@ def get_node_cmd(config):
             '-o {}'.format(SLURM.s(config.dirout)),
             '-cf {}'.format(SLURM.s(config.cf_profiles)),
             '-mw {}'.format(SLURM.s(config.execution_control.max_workers)),
-            '-log {}'.format(SLURM.s(config.logdir)),
+            '-log {}'.format(SLURM.s(config.log_directory)),
             ]
 
     if config.log_level == logging.DEBUG:
@@ -344,7 +344,7 @@ def eagle(config):
 
     cmd = get_node_cmd(config)
     name = config.name
-    log_dir = config.logdir
+    log_dir = config.log_directory
     stdout_path = os.path.join(log_dir, 'stdout/')
 
     logger.info('Running reVX-RPM pipeline on Eagle with '

reVX/turbine_flicker/turbine_flicker_cli.py

@@ -67,7 +67,7 @@ def run_local(ctx, config):
                flicker_threshold=config.flicker_threshold,
                resolution=config.resolution,
                max_workers=config.execution_control.max_workers,
-               log_dir=config.logdir,
+               log_dir=config.log_directory,
                verbose=config.log_level)
 
 
@@ -196,7 +196,7 @@ def get_node_cmd(config):
             '-ft {}'.format(SLURM.s(config.flicker_threshold)),
             '-res {}'.format(SLURM.s(config.resolution)),
             '-mw {}'.format(SLURM.s(config.execution_control.max_workers)),
-            '-log {}'.format(SLURM.s(config.logdir)),
+            '-log {}'.format(SLURM.s(config.log_directory)),
             ]
 
     if config.log_level == logging.DEBUG:
@@ -221,7 +221,7 @@ def eagle(config):
 
     cmd = get_node_cmd(config)
     name = config.name
-    log_dir = config.logdir
+    log_dir = config.log_directory
     stdout_path = os.path.join(log_dir, 'stdout/')
 
     slurm_manager = SLURM()

reVX/wind_dirs/mean_wind_dirs_cli.py

@@ -68,7 +68,7 @@ def run_local(ctx, config):
                min_area=config.min_area,
                max_workers=config.execution_control.max_workers,
                sites_per_worker=config.execution_control.sites_per_worker,
-               log_dir=config.logdir,
+               log_dir=config.log_directory,
                verbose=config.log_level)
 
 
@@ -219,7 +219,7 @@ def get_node_cmd(config):
             '-ma {}'.format(SLURM.s(config.min_area)),
             '-mw {}'.format(SLURM.s(config.execution_control.max_workers)),
             '-spw {}'.format(SLURM.s(spw)),
-            '-log {}'.format(SLURM.s(config.logdir)),
+            '-log {}'.format(SLURM.s(config.log_directory)),
             ]
 
     if config.log_level == logging.DEBUG:
@@ -244,7 +244,7 @@ def eagle(config):
 
     cmd = get_node_cmd(config)
     name = config.name
-    log_dir = config.logdir
+    log_dir = config.log_directory
     stdout_path = os.path.join(log_dir, 'stdout/')
 
     slurm_manager = SLURM()

reVX/wind_dirs/prominent_wind_dirs_cli.py

@@ -65,7 +65,7 @@ def run_local(ctx, config):
                excl_area=config.excl_area,
                max_workers=config.execution_control.max_workers,
                sites_per_worker=config.execution_control.sites_per_worker,
-               log_dir=config.logdir,
+               log_dir=config.log_directory,
                verbose=config.log_level)
 
 
@@ -198,7 +198,7 @@ def get_node_cmd(config):
             '-ea {}'.format(SLURM.s(config.excl_area)),
             '-mw {}'.format(SLURM.s(config.execution_control.max_workers)),
             '-spw {}'.format(SLURM.s(spw)),
-            '-log {}'.format(SLURM.s(config.logdir)),
+            '-log {}'.format(SLURM.s(config.log_directory)),
             ]
 
     if config.log_level == logging.DEBUG:
@@ -223,7 +223,7 @@ def eagle(config):
 
     cmd = get_node_cmd(config)
     name = config.name
-    log_dir = config.logdir
+    log_dir = config.log_directory
     stdout_path = os.path.join(log_dir, 'stdout/')
 
     slurm_manager = SLURM()

reVX/wind_setbacks/wind_setbacks_cli.py

@@ -357,7 +357,7 @@ def get_node_cmd(name, config):
             '-regs {}'.format(SLURM.s(config.regs_fpath)),
             '-mult {}'.format(SLURM.s(config.multiplier)),
             '-mw {}'.format(SLURM.s(config.execution_control.max_workers)),
-            '-log {}'.format(SLURM.s(config.logdir)),
+            '-log {}'.format(SLURM.s(config.log_directory)),
             ]
 
     if config.replace:
@@ -398,7 +398,7 @@ def launch_job(config):
     config : reVX.config.wind_setbacks.WindSetbacks
         Wind Setbacks config object.
     """
-    log_dir = config.logdir
+    log_dir = config.log_directory
     stdout_path = os.path.join(log_dir, 'stdout/')
     name = os.path.basename(config.features_path).split('.')[0]
     name = "{}-{}".format(config.name, name)

requirements.txt

@@ -1,8 +1,8 @@
 dask>=2.8
 dask[array]>=2.8
 geopandas>=0.8
-NREL-reV>=0.5.12
-NREL-rex>=0.2.57
+NREL-reV>=0.6.0
+NREL-rex>=0.2.69
 psycopg2-binary>=2.8
 pyproj>=3.0.1
 pywavelets>=1.0

tests/test_assembly_areas.py

@@ -60,9 +60,7 @@ def test_cli(runner):
         excl_fpath = os.path.join(td, excl_fpath)
         shutil.copy(EXCL_H5, excl_fpath)
         config = {
-            "directories": {
-                "log_directory": td,
-            },
+            "log_directory": td,
             "execution_control": {
                 "option": "local"
             },

tests/test_dist_to_ports.py

@@ -132,9 +132,7 @@ def test_cli(runner, ports_layer):
     """
     with tempfile.TemporaryDirectory() as td:
         config = {
-            "directories": {
-                "log_directory": td,
-            },
+            "log_directory": td,
             "execution_control": {
                 "option": "local",
                 "max_workers": 1

tests/test_mean_wind_dirs.py

@@ -70,10 +70,7 @@ def test_cli(runner, excl_dict, baseline_name):
 
     with tempfile.TemporaryDirectory() as td:
         config = {
-            "directories": {
-                "log_directory": td,
-                "output_directory": td
-            },
+            "log_directory": td,
             "excl_fpath": EXCL_H5,
             "excl_dict": excl_dict,
             "execution_control": {

tests/test_offshore_inputs.py

@@ -71,10 +71,7 @@ def test_cli(runner):
             json.dump({'input_layers': INPUT_LAYERS}, f)
 
         config = {
-            "directories": {
-                "log_directory": td,
-                "output_directory": td
-            },
+            "log_directory": td,
             "execution_control": {
                 "option": "local"
             },

tests/test_prominent_wind_dirs.py

@@ -78,10 +78,7 @@ def test_cli(runner):
 
     with tempfile.TemporaryDirectory() as td:
         config = {
-            "directories": {
-                "log_directory": td,
-                "output_directory": td
-            },
+            "log_directory": td,
             "excl_fpath": EXCL_H5,
             "execution_control": {
                 "option": "local"