Merge pull request #74 from andersy005/master

Add function to flexibly compute weights and dimensions to use in statistical ops

.circleci/config.yml

@@ -170,10 +170,10 @@ jobs:
             flake8 
 
             echo "[black]"
-            black --check . 
+            black --check --line-length=100 -S --exclude='esmlab/_version.py|versioneer.py' . 
 
             echo "[isort]"
-            isort --recursive --check-only .
+            isort --recursive -w 100 --check-only .
       - run:
           name: Check documentation build 
           command: |

.pre-commit-config.yaml

@@ -1,24 +1,30 @@
 repos:
 -   repo: https://github.com/ambv/black
-    rev: stable
+    rev: 18.9b0
     hooks:
     - id: black
+      args: ["--line-length", "100", "--skip-string-normalization", 
+            "--exclude", '''/(esmlab/_version.py|versioneer.py)/''']
+
 
 -   repo: https://github.com/pre-commit/mirrors-autopep8
     rev: v1.4.3
     hooks:
     -   id: autopep8
+        entry: autopep8
+        args: ["--in-place", "--aggressive"]
 
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.0.0
+    rev: v2.1.0
     hooks:
     - id: flake8
 
 -   repo: https://github.com/asottile/seed-isort-config
-    rev: v1.5.0
+    rev: v1.6.0
     hooks:
     -   id: seed-isort-config
 -   repo: https://github.com/pre-commit/mirrors-isort
     rev: v4.3.4
     hooks:
-    -   id: isort
+    -   id: isort
+        args: ["line_length=100"]

docs/source/conf.py

@@ -140,9 +140,7 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass
 # [howto, manual, or own class]).
-latex_documents = [
-    (master_doc, "esmlab.tex", u"esmlab Documentation", author, "manual")
-]
+latex_documents = [(master_doc, "esmlab.tex", u"esmlab Documentation", author, "manual")]
 
 
 # -- Options for manual page output ------------------------------------

esmlab/__init__.py

@@ -1,13 +1,12 @@
 #!/usr/bin/env python
-"""Top-level package for esmlab."""
+"""Top-level module for esmlab."""
+
 
 import sys
-from .config import set_options, get_options
 
+from . import climatology, datasets, statistics
 from ._version import get_versions
-from . import climatology
-from . import statistics
-from . import datasets
+from .config import get_options, set_options
 
 if sys.version_info > (3, 0):
     from .regrid import regridder

esmlab/climatology.py

@@ -68,15 +68,10 @@ def compute_mon_climatology(dset, time_coord_name=None):
 
     if tm.time_bound is not None:
         computed_dset[tm.tb_name] = tm.time_bound - tm.time_bound[0, 0]
-        computed_dset[time_coord_name].values = (
-            computed_dset[tm.tb_name].mean(tm.tb_dim).values
-        )
+        computed_dset[time_coord_name].values = computed_dset[tm.tb_name].mean(tm.tb_dim).values
 
         encoding[tm.tb_name] = {"dtype": "float", "_FillValue": None}
-        attrs[tm.tb_name] = {
-            "long_name": tm.tb_name,
-            "units": "days since 0001-01-01 00:00:00",
-        }
+        attrs[tm.tb_name] = {"long_name": tm.tb_name, "units": "days since 0001-01-01 00:00:00"}
 
         attrs[time_coord_name] = {
             "long_name": time_coord_name,
@@ -145,10 +140,7 @@ def compute_mon_anomaly(dset, slice_mon_clim_time=None, time_coord_name=None):
 
     # Put the attributes, encoding back
     computed_dset = set_metadata(
-        computed_dset,
-        attrs,
-        encoding,
-        additional_attrs={"month": {"long_name": "Month"}},
+        computed_dset, attrs, encoding, additional_attrs={"month": {"long_name": "Month"}}
     )
 
     computed_dset = tm.restore_dataset(computed_dset)
@@ -192,9 +184,7 @@ def compute_ann_mean(dset, weights=None, time_coord_name=None):
     # Compute weights
     if weights:
         if len(weights) != len(dset[time_coord_name]):
-            raise ValueError(
-                "weights and dataset time values must be of the same length"
-            )
+            raise ValueError("weights and dataset time values must be of the same length")
         else:
             dt = xr.ones_like(dset[time_coord_name], dtype=bool)
             dt.values = weights

esmlab/config.py

@@ -51,10 +51,7 @@ def _check_exists(value):
     return os.path.exists(value)
 
 
-_VALIDATORS = {
-    GRIDFILE_DIRECTORY: _check_path_write_access,
-    GRID_DEFITIONS_FILE: _check_exists,
-}
+_VALIDATORS = {GRIDFILE_DIRECTORY: _check_path_write_access, GRID_DEFITIONS_FILE: _check_exists}
 
 _SETTERS = {GRIDFILE_DIRECTORY: _full_path}
 
@@ -72,9 +69,7 @@ def __init__(self, **kwargs):
                     )
                 )
             if key in _VALIDATORS and not _VALIDATORS[key](val):
-                raise ValueError(
-                    "{val} is not a valid value for {key}".format(key=key, val=val)
-                )
+                raise ValueError("{val} is not a valid value for {key}".format(key=key, val=val))
             self.old[key] = SETTINGS[key]
         self._apply_update(kwargs)
 

esmlab/regrid.py

@@ -56,9 +56,7 @@ class regridder(object):
     """Class to enable regridding between named grids.
     """
 
-    def __init__(
-        self, name_grid_src, name_grid_dst, method="bilinear", overwrite_existing=False
-    ):
+    def __init__(self, name_grid_src, name_grid_dst, method="bilinear", overwrite_existing=False):
         """
         Parameters
         ----------
@@ -181,9 +179,7 @@ def regrid_dataarray(
         # pull data, dims and coords from incoming DataArray
         data_src = da_in.values
         non_lateral_dims = da_in.dims[:-2]
-        copy_coords = {
-            d: da_in.coords[d] for d in non_lateral_dims if d in da_in.coords
-        }
+        copy_coords = {d: da_in.coords[d] for d in non_lateral_dims if d in da_in.coords}
 
         # if renormalize == True, remap a field of ones
         if renormalize:
@@ -206,11 +202,7 @@ def regrid_dataarray(
 
         # reform into xarray.DataArray
         da_out = xr.DataArray(
-            data_dst,
-            name=da_in.name,
-            dims=da_in.dims,
-            attrs=da_in.attrs,
-            coords=copy_coords,
+            data_dst, name=da_in.name, dims=da_in.dims, attrs=da_in.attrs, coords=copy_coords
         )
         da_out.attrs["regrid_method"] = self.method
 
@@ -231,9 +223,7 @@ def regrid_dataarray(
         # apply a missing-values mask
         if apply_mask is not None:
             if apply_mask.dims != da_in.dims:
-                logger.warning(
-                    f"masking {apply_mask.dims}; " f"data have dims: {da_in.dims}"
-                )
+                logger.warning(f"masking {apply_mask.dims}; " f"data have dims: {da_in.dims}")
             da_out = da_out.where(apply_mask)
 
         # apply a post_method