Merge pull request #140 from NOAA-GFDL/128.and_other_small_things

intakebuilder --> catalogbuilder edits

environment.yml

@@ -10,7 +10,7 @@ dependencies:
   - pyyaml
   - pylint
   - jsonschema
-  - noaa-gfdl::intakebuilder
+  - noaa-gfdl::catalogbuilder
   - conda-forge::cylc-flow>=8.2.0
   - conda-forge::cylc-rose
   - conda-forge::metomi-rose

fre/catalog/frecatalog.py

@@ -1,37 +1,13 @@
 import click
-from scripts import gen_intake_gfdl
-from scripts import test_catalog
+import catalogbuilder
+from catalogbuilder.scripts import gen_intake_gfdl
+from catalogbuilder.scripts import test_catalog
 
 @click.group(help=click.style(" - access fre catalog subcommands", fg=(64,94,213)))
 def catalogCli():
+    ''' entry point for click into fre catalog cli calls '''
     pass
 
-#@catalogCli.command()
-#@click.option('-i',
-#              '--input_path',
-#              required = True,
-#              nargs = 1)
-#@click.option('-o',
-#              '--output_path',
-#              required = True,
-#              nargs = 1)
-#@click.option('--filter_realm',
-#              nargs = 1)
-#@click.option('--filter_freq',
-#              nargs = 1)
-#@click.option('--filter_chunk',
-#              nargs = 1)
-#@click.option('--overwrite',
-#              is_flag = True,
-#              default = False)
-#@click.option('--append',
-#              is_flag = True,
-#              default = False)
-#@click.pass_context
-#def build(context, input_path, output_path, filter_realm, filter_freq, filter_chunk,
-#          overwrite,append):
-#    """ - Execute fre catalog build """
-#    context.forward(build_script)
 
 @catalogCli.command()
 #TODO arguments dont have help message. So consider changing arguments to options?

fre/catalog/tests/test_fre_catalog.py

@@ -0,0 +1,5 @@
+#!/usr/bin/env python3
+
+def test_fre_catalog_import():
+    from fre import catalog
+    assert catalog is not None

meta.yaml

@@ -31,7 +31,7 @@ requirements:
     - pyyaml
     - pylint
     - jsonschema
-    - noaa-gfdl::intakebuilder
+    - noaa-gfdl::catalogbuilder
     - conda-forge::cylc-flow>=8.2.0
     - conda-forge::cylc-rose
     - conda-forge::metomi-rose
@@ -58,6 +58,7 @@ test:
     - fre.make
     - fre.app
     - fre.cmor
+    - fre.catalog
   commands:
     - pytest --config-file=fre/pytest.ini --cov-config=fre/coveragerc --cov=fre fre/
     - pylint fre/ || echo "pylint returned non-zero exit code and will kill the workflow. guarding against this now."

setup.py

@@ -13,6 +13,7 @@
         'pyyaml',
         'pylint',
         'pytest',
+        'catalogbuilder',
         'jsonschema',
         'cylc-flow',
         'cylc-rose',