Skip to content

Commit

Permalink
Merge pull request #484 from creare-com/hotfix/fixes
Browse files Browse the repository at this point in the history
Hotfix/fixes
  • Loading branch information
mpu-creare committed Jun 4, 2021
2 parents c6d6f16 + bae61d6 commit 81059ca
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
3 changes: 1 addition & 2 deletions podpac/core/compositor/compositor.py
Expand Up @@ -73,8 +73,7 @@ def _validate_sources(self, d):
"The sources must all be standard single-output nodes or all multi-output nodes."
)

# copy so that interpolation trait of the input source is not overwritten
return [copy.deepcopy(source) for source in sources]
return sources

@tl.validate("source_coordinates")
def _validate_source_coordinates(self, d):
Expand Down
5 changes: 3 additions & 2 deletions podpac/core/interpolation/xarray_interpolator.py
Expand Up @@ -112,15 +112,16 @@ def interpolate(self, udims, source_coordinates, source_data, eval_coordinates,

coords["kwargs"] = kwargs

if self.method == "bilinear":
self.method = "linear"

if self.fill_nan:
for d in source_coordinates.dims:
if not np.any(np.isnan(source_data)):
break
# use_coordinate=False allows for interpolation when dimension is not monotonically increasing
source_data = source_data.interpolate_na(method=self.method, dim=d, use_coordinate=False)

if self.method == "bilinear":
self.method = "linear"
if nn_coords:
source_data = source_data.sel(method="nearest", **nn_coords)

Expand Down
2 changes: 1 addition & 1 deletion podpac/core/settings.py
Expand Up @@ -376,7 +376,7 @@ def allow_unsafe_eval(self):

def set_unsafe_eval(self, allow=False):
_logger.warning(
"DEPRECATION WARNING: The `set_unsafe_eval` method has been deprecated and will be removed in future versions of PODPAC. Use `allow_unrestricted_code_execuation` instead. "
"DEPRECATION WARNING: The `set_unsafe_eval` method has been deprecated and will be removed in future versions of PODPAC. Use `allow_unrestricted_code_execution` instead. "
)
self.allow_unrestricted_code_execution(allow)

Expand Down
2 changes: 1 addition & 1 deletion podpac/version.py
Expand Up @@ -17,7 +17,7 @@
##############
MAJOR = 3
MINOR = 1
HOTFIX = 0
HOTFIX = 1
##############


Expand Down

0 comments on commit 81059ca

Please sign in to comment.