From b07a279a833226032de60b8ddaa225f4c485b71b Mon Sep 17 00:00:00 2001 From: Ian Bolliger Date: Wed, 3 Apr 2024 04:14:26 +0000 Subject: [PATCH] autoformat --- notebooks/shared.py | 1 + pyCIAM/io.py | 1 + pyCIAM/run.py | 3 ++- pyCIAM/utils.py | 3 ++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/notebooks/shared.py b/notebooks/shared.py index 2d575fc..209ea45 100644 --- a/notebooks/shared.py +++ b/notebooks/shared.py @@ -5,6 +5,7 @@ import geopandas as gpd import xarray as xr from dask_gateway import GatewayCluster + from pyCIAM import __file__ DIR_SCRATCH = Path("/tmp/ciam-scratch") diff --git a/pyCIAM/io.py b/pyCIAM/io.py index 64a951e..258326d 100644 --- a/pyCIAM/io.py +++ b/pyCIAM/io.py @@ -13,6 +13,7 @@ import pandas as pd import pint_xarray # noqa: F401 import xarray as xr + from pyCIAM.utils import spherical_nearest_neighbor as snn from .utils import _s2d diff --git a/pyCIAM/run.py b/pyCIAM/run.py index 6e1378d..51b5e6a 100644 --- a/pyCIAM/run.py +++ b/pyCIAM/run.py @@ -16,6 +16,8 @@ import xarray as xr from cloudpathlib import AnyPath, CloudPath from distributed import Client, wait +from rhg_compute_tools.xarray import dataarray_from_delayed + from pyCIAM.constants import CASE_DICT, CASES, COSTTYPES, PLIST, RLIST, SOLVCASES from pyCIAM.io import ( check_finished_zarr_workflow, @@ -38,7 +40,6 @@ collapse_econ_inputs_to_seg, subset_econ_inputs, ) -from rhg_compute_tools.xarray import dataarray_from_delayed def calc_costs( diff --git a/pyCIAM/utils.py b/pyCIAM/utils.py index 5430db3..c96fee2 100644 --- a/pyCIAM/utils.py +++ b/pyCIAM/utils.py @@ -7,9 +7,10 @@ import pandas as pd import xarray as xr from cloudpathlib import CloudPath -from pyCIAM.constants import CASE_DICT from sklearn.neighbors import BallTree +from pyCIAM.constants import CASE_DICT + def _s2d(ds): for v in ds.data_vars: