nctoolkit 1.1.2__tar.gz → 1.1.5__tar.gz

{nctoolkit-1.1.2 → nctoolkit-1.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nctoolkit
-Version: 1.1.2
+Version: 1.1.5
 Summary: A Python package for netCDF analysis and post-processing
 Home-page: https://github.com/pmlmodelling/nctoolkit
 Author: Robert Wilson
@@ -17,12 +17,27 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.6.1
-Provides-Extra: complete
 License-File: LICENSE
+Requires-Dist: xarray
+Requires-Dist: netCDF4
+Requires-Dist: hvplot
+Requires-Dist: panel
+Requires-Dist: pandas
+Requires-Dist: ncplot>=0.2.8
+Requires-Dist: dill
+Requires-Dist: python-dateutil
+Requires-Dist: matplotlib
+Requires-Dist: multiprocess
+Provides-Extra: complete
+Requires-Dist: geoviews; extra == "complete"
+Requires-Dist: rioxarray; extra == "complete"
+Requires-Dist: cfchecker; extra == "complete"
+Requires-Dist: geocube; extra == "complete"
+Requires-Dist: geopandas; extra == "complete"
 
 
 
-**nctoolkit** is a comprehensive Python (3.6 and above) package for analyzing netCDF data on Linux and macOS.
+**nctoolkit** is a comprehensive Python (3.8 and above) package for analyzing netCDF data on Linux and macOS.
 
 Core abilities of nctoolkit include:
 

{nctoolkit-1.1.2 → nctoolkit-1.1.5}/nctoolkit/__init__.py

@@ -11,6 +11,7 @@ from nctoolkit.api import (
     open_url,
 )
 
+
 from nctoolkit.unify import unify
 from nctoolkit.shape import open_shape
 

{nctoolkit-1.1.2 → nctoolkit-1.1.5}/nctoolkit/anomaly.py

@@ -9,9 +9,13 @@ from nctoolkit.show import nc_years
 from nctoolkit.temp_file import temp_file
 from nctoolkit.session import remove_safe, session_info, nc_safe_par, nc_safe
 from nctoolkit.api import update_options
+from nctoolkit.runners import ann_anomaly
 
 if platform.system() == "Linux":
     import multiprocessing as mp
+    #start = mp.get_start_method()
+    #if start != "spawn":
+    #    mp.set_start_method("spawn")
     from multiprocessing import Manager
 
     manager = Manager()
@@ -22,55 +26,6 @@ else:
     manager = Manager()
 
 
-def ann_anomaly(
-    ff, baseline, metric, window, align, precision, new_files, new_commands, nc_safe
-):
-    """
-    Function to calculate the anomaly for a single file
-    """
-
-    # throw error if baseline is not valid
-    orig_safe = copy.deepcopy(nc_safe)
-    target = temp_file("nc")
-    nc_safe.append(target)
-    try:
-        if len([yy for yy in baseline if yy not in nc_years(ff)]) > 0:
-            raise ValueError("Check that the years in baseline are in the dataset!")
-
-        # create the target file
-        # generate the cdo command
-        if metric == "absolute":
-            cdo_command = (
-                f"cdo -sub -runmean,{window} -yearmean {ff} -timmean "
-                f"-selyear,{baseline[0]}/{baseline[1]} {ff} {target}"
-            )
-        else:
-            cdo_command = (
-                f"cdo -div -runmean,{window} -yearmean {ff} -timmean "
-                f"-selyear,{baseline[0]}/{baseline[1]} {ff} {target}"
-            )
-
-        # run the command and save the temp file
-
-        cdo_command = tidy_command(cdo_command)
-        cdo_command = cdo_command.replace(
-            "cdo ", f"cdo --timestat_date {align} "
-        ).replace("  ", " ")
-
-        target = run_cdo(cdo_command, target, precision=precision)
-        if target not in nc_safe:
-            nc_safe.append(target)
-
-        # update the new files and commands
-        new_files.append(target)
-        new_commands.append(cdo_command)
-    except BaseException as e:
-        try:
-            nc_safe.remove(target)
-        except:
-            pass
-        return e
-
 
 def annual_anomaly(self, baseline=None, metric="absolute", window=1, align="right"):
     """
@@ -163,6 +118,9 @@ def annual_anomaly(self, baseline=None, metric="absolute", window=1, align="righ
     # This cannot possibly be threaded in cdo. Release it
 
     self.run()
+    for ff in self:
+        if len([yy for yy in baseline if yy not in nc_years(ff)]) > 0:
+            raise ValueError("Check that the years in baseline are in the dataset!")
 
     # calculate the anomalies for each file
     # this is not parallelized yet
@@ -185,7 +143,7 @@ def annual_anomaly(self, baseline=None, metric="absolute", window=1, align="righ
         target_list = []
         results = dict()
 
-        pool = mp.pool.Pool(cores)
+        pool = mp.get_context('fork').Pool(cores)
         precision = copy.deepcopy(self._precision)
         for ff in self:
             results[ff] = pool.apply_async(

{nctoolkit-1.1.2 → nctoolkit-1.1.5}/nctoolkit/api.py

@@ -137,21 +137,7 @@ cdo_methods.append("reduce_dim")
 session_info["cdo_methods"] = cdo_methods
 
 
-def coast_check():
-    try:
-        import geoviews
-        import cartopy
-        from cartopy import crs
-        import cartopy.crs as ccrs
-
-        projection = ccrs.PlateCarree()
-        return True
-    except:
-        return False
-
-
-session_info["coast"] = coast_check()
-#session_info["coast"] = None 
+session_info["coast"] = None 
 
 
 session_info["interactive"] = sys.__stdin__.isatty()
@@ -1935,7 +1921,6 @@ class DataSet(object):
 
     from nctoolkit.phenology import phenology
 
-    # from nctoolkit.phenology import initiation
 
     from nctoolkit.plot import plot
     from nctoolkit.static_plot import pub_plot

{nctoolkit-1.1.2 → nctoolkit-1.1.5}/nctoolkit/ensembles.py

@@ -167,7 +167,8 @@ def ensemble_median(self):
     self.run()
 
     if len(self) == 1:
-        warnings.warn(message="There is only one file in the dataset")
+        warnings.warn(message="There is only one file in the dataset, so ensemble median cannot be calculated.")
+        return None
 
     cdo_command = "--sortname -enspctl,50"
 

{nctoolkit-1.1.2 → nctoolkit-1.1.5}/nctoolkit/mp_matchups.py

@@ -131,7 +131,8 @@ def matchup(self, tmean=False, regrid="bil", max_extrap=5, quiet = False):
     points = points.merge(grid)
 
     if len(points) == 0:
-        raise ValueError("None of the points are contained within the dataset grid")
+        warnings.warn("None of the points are contained within the dataset grid")
+        return None
 
     if len(points) < n_start:
         n_remove = n_start - len(points)

{nctoolkit-1.1.2 → nctoolkit-1.1.5}/nctoolkit/plot.py

@@ -1,9 +1,21 @@
 import signal
-from ncplot import view
 
 from contextlib import contextmanager
 from nctoolkit.session import session_info
 
+def coast_check():
+    try:
+        import geoviews
+        import cartopy
+        from cartopy import crs
+        import cartopy.crs as ccrs
+
+        projection = ccrs.PlateCarree()
+        return True
+    except:
+        return False
+
+
 
 class TimeoutException(Exception):
     pass
@@ -37,7 +49,7 @@ def plot(self, vars=None, autoscale=True, out=None, coast=None, **kwargs):
     out: str
         Name of output file if you want to save as html. Defaults to None.
     coast: bool
-        Set to True if you want a coastline to show up on spatial map. Default is True if cartopy is installed and working. Otherwise it is False.
+        Set to True if you want a coastline to show up on spatial map. Default is True if a working version of cartopy is available. It is False otherwise.
 
     **kwargs: Optional args to be sent to hvplot
 
@@ -59,7 +71,10 @@ def plot(self, vars=None, autoscale=True, out=None, coast=None, **kwargs):
     >>> ds.plot("var_of_choice")
 
     """
+    from ncplot import view
 
+    if session_info["coast"] is None:
+        session_info["coast"] = coast_check()
 
     if "title" not in kwargs.keys():
         kwargs["title"] = ""