Disable YAMALE YAML based approach (#17)

ncar-xdev · May 3, 2021 · 3a43508 · 3a43508
1 parent 8a5ddb4
commit 3a43508
Show file tree

Hide file tree

Showing 16 changed files with 7 additions and 659 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -15,7 +15,7 @@ jobs:
         with:
           concurrent_skipping: 'same_content'
           skip_after_successful_duplicate: 'false'
-          do_not_skip: '["workflow_dispatch", "schedule"]'
+          do_not_skip: '["pull_request", "workflow_dispatch", "schedule"]'
           paths_ignore: '["**/docs/**"]'
   build:
     needs: pre-job

diff --git a/ci/environment.yml b/ci/environment.yml
@@ -19,4 +19,3 @@ dependencies:
   - rich
   - typer
   - xarray
-  - yamale
diff --git a/ecgtools/__init__.py b/ecgtools/__init__.py
@@ -9,4 +9,4 @@
     __version__ = get_distribution(__name__).version
 except DistributionNotFound:
     # package is not installed
-    _version__ = '0.0.0'
+    __version__ = '0.0.0'
diff --git a/ecgtools/cli.py b/ecgtools/cli.py
@@ -7,9 +7,9 @@
 from distributed import Client
 from ncar_jobqueue import NCARCluster
 
-from .builders.cesm import smyle_parser
-from .builders.cmip import cmip6_parser
 from .core import Builder, console
+from .parsers.cesm import smyle_parser
+from .parsers.cmip import cmip6_parser
 
 app = typer.Typer(help='ESM Catalog Generation CLI')
 

diff --git a/ecgtools/parsers.py b/ecgtools/parsers.py
diff --git a/ecgtools/builders/__init__.py → ecgtools/parsers/__init__.py b/ecgtools/builders/__init__.py → ecgtools/parsers/__init__.py
diff --git a/ecgtools/builders/cesm.py → ecgtools/parsers/cesm.py b/ecgtools/builders/cesm.py → ecgtools/parsers/cesm.py
diff --git a/ecgtools/builders/cmip.py → ecgtools/parsers/cmip.py b/ecgtools/builders/cmip.py → ecgtools/parsers/cmip.py
diff --git a/notebooks/Generic_Interface_Example.ipynb b/notebooks/Generic_Interface_Example.ipynb
diff --git a/requirements.txt b/requirements.txt
@@ -6,5 +6,4 @@ netCDF4
 rich
 typer
 xarray
-yamale
 pyyaml
diff --git a/sample_yaml/cmip6.yaml b/sample_yaml/cmip6.yaml
diff --git a/sample_yaml/ensemble.yaml b/sample_yaml/ensemble.yaml
diff --git a/schema/generic_schema.yaml b/schema/generic_schema.yaml
diff --git a/setup.cfg b/setup.cfg
@@ -7,7 +7,7 @@ select = B,C,E,F,W,T4,B9
 
 [isort]
 known_first_party=ecgtools
-known_third_party=cf_xarray,dask,distributed,intake,ncar_jobqueue,netCDF4,pandas,pkg_resources,pytest,rich,setuptools,typer,xarray,yaml
+known_third_party=cf_xarray,dask,distributed,ncar_jobqueue,pandas,pkg_resources,rich,setuptools,typer,xarray
 multi_line_output=3
 include_trailing_comma=True
 force_grid_wrap=0

diff --git a/setup.py b/setup.py
@@ -35,7 +35,6 @@
     keywords='ecgtools',
     name='ecgtools',
     packages=find_packages(include=['ecgtools', 'ecgtools.*']),
-    data_files=[('schema', ['schema/generic_schema.yaml'])],
     entry_points={'console_scripts': ['ecgtools = ecgtools.cli:main']},
     url='https://github.com/NCAR/ecgtools',
     project_urls={