Merge pull request #104 from kmpaul/fixactions

Fix GitHub actions

Author: Kevin Paul

.github/workflows/linting.yml

@@ -17,5 +17,5 @@ jobs:
         with:
           python-version: '2.7'
       - run: pip install flake8==3.7.9 isort==4.3.21
-      - run: flake8 source/
+      - run: flake8
       - run: isort --recursive -w 100 --check-only

README.rst

@@ -1,6 +1,15 @@
 .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3895009.svg
    :target: https://doi.org/10.5281/zenodo.3895009
 
+.. image:: https://codecov.io/gh/NCAR/PyConform/branch/master/graph/badge.svg
+  :target: https://codecov.io/gh/NCAR/PyConform
+
+.. image:: https://github.com/NCAR/PyConform/workflows/Tests/badge.svg
+  :target: https://github.com/NCAR/PyConform/actions?query=workflow%3ATests
+
+.. image:: https://github.com/NCAR/PyConform/workflows/Linting/badge.svg
+  :target: https://github.com/NCAR/PyConform/actions?query=workflow%3ALinting
+
 PyConform
 =========
 
@@ -81,9 +90,11 @@ Dependencies
 The PyConform package directly depends upon 4 main external packages:
 
 * ASAPTools (>=0.6)
-* netCDF4-python
 * cf-units
 * dreqpy
+* netCDF4-python
+* ply
+* python-dateutil
 
 These dependencies imply the dependencies:
 
@@ -146,27 +157,3 @@ user installs, and therefore only needs to be added to the PYTHONPATH once.
 The documentation_ for PyConform is hosted on GitHub Pages.
 
 .. _documentation:  https://ncar.github.io/pyconform
-
-
-Before Using the PyConform Package
-----------------------------------
-
-Before the PyConform package can be used, you must make sure that the
-site-packages directory containing the 'pyconform' source directory is in
-your PYTHONPATH.  Depending on the PREFIX used during installation, this
-path should look like be::
-
-    $PREFIX/lib/python2.7/site-packages
-
-depending on the version of Python that you
-are using to install the package.
-
-To use the PyConform scripts (e.g., ...), you must add the
-script binary directory to your PATH.  Depending on the PREFIX used during
-installation, this path will be::
-
-    $PREFIX/bin/
-
-Once the script binary directory has been added to your PATH and the
-site-packages directory has been added to your PYTHONPATH, you may use the
-PyConform package without issue.

pyconform/cli/__init__.py

@@ -16,9 +16,6 @@
 from pyconform import parsing
 
 
-#=========================================================================
-# Command-line Interface
-#=========================================================================
 def cli(argv=None):
     desc = """This tool will analyze a definitions text file or a JSON standardization
               file and print out the variables needed for each defined output variable."""
@@ -38,9 +35,6 @@ def cli(argv=None):
     return parser.parse_args(argv)
 
 
-#=========================================================================
-# variable_search
-#=========================================================================
 def variable_search(obj, vars=None):
     if vars is None:
         vars = set()
@@ -57,9 +51,6 @@ def variable_search(obj, vars=None):
     return vars
 
 
-#=========================================================================
-# print_columnar
-#=========================================================================
 def print_columnar(x, textwidth=10000000, indent=0, header=''):
     hrstrp = '{}  '.format(str(header).rstrip())
     if len(hrstrp) > indent:
@@ -75,9 +66,6 @@ def print_columnar(x, textwidth=10000000, indent=0, header=''):
         print '{}{}'.format(' ' * indent, '   '.join('{: <{Lmax}}'.format(r, Lmax=Lmax) for r in row))
 
 
-#=========================================================================
-# Main Script Function
-#=========================================================================
 def main(argv=None):
     args = cli(argv)
 
@@ -138,8 +126,5 @@ def main(argv=None):
     print_columnar(sorted(alldeps), indent=3)
 
 
-#=========================================================================
-# Command-line Operation
-#=========================================================================
 if __name__ == '__main__':
     main()

pyconform/cli/iconform.py

@@ -11,26 +11,22 @@
 LICENSE: See the LICENSE.rst file for details
 """
 
-from os.path import exists
+from argparse import ArgumentParser, ArgumentTypeError
+from collections import OrderedDict
 from glob import glob
+from imp import load_source
 from json import load as json_load
-from collections import OrderedDict
-from argparse import ArgumentParser, ArgumentTypeError
+from os.path import exists
 from warnings import simplefilter
-from datetime import datetime
-from imp import load_source
 
-from asaptools.simplecomm import create_comm
 from asaptools.partition import Duplicate
+from asaptools.simplecomm import create_comm
 
-from pyconform.datasets import InputDatasetDesc, OutputDatasetDesc
 from pyconform.dataflow import DataFlow
+from pyconform.datasets import InputDatasetDesc, OutputDatasetDesc
 from pyconform.flownodes import ValidationWarning
 
 
-#=========================================================================
-# chunk - Chunksize for a named dimension
-#=========================================================================
 def chunk(arg):
     try:
         name, size_str = arg.split(',')
@@ -40,9 +36,6 @@ def chunk(arg):
         raise ArgumentTypeError("Chunks must be formatted as 'name,size'")
 
 
-#=========================================================================
-# Command-line Interface
-#=========================================================================
 def cli(argv=None):
     desc = """This is the PyConform command-line tool.  This scripts takes
               input from the command-line and a predefined output
@@ -84,9 +77,6 @@ def cli(argv=None):
     return parser.parse_args(argv)
 
 
-#=========================================================================
-# Main Script Function
-#=========================================================================
 def main(argv=None):
     args = cli(argv)
 
@@ -165,8 +155,5 @@ def main(argv=None):
                      deflate=args.deflate, debug=args.debug)
 
 
-#=========================================================================
-# Command-line Operation
-#=========================================================================
 if __name__ == '__main__':
     main()