Bnb/nc4 dep removal

.github/workflows/publish_to_pypi.yml

@@ -13,6 +13,10 @@ jobs:
  id-token: write
  steps:
  - uses: actions/checkout@v4
+ with:
+ ref: ${{ github.event.pull_request.head.ref }}
+ fetch-depth: 0
+ fetch-tags: true
  - name: Set up Python
  uses: actions/setup-python@v4
  with:

pyproject.toml

@@ -32,15 +32,16 @@ dependencies = [
  "NREL-farms>=1.0.4",
  "dask>=2022.0",
  "google-auth-oauthlib==0.5.3",
+ "h5netcdf>=1.1.0",
+ "cftime>=1.6.2",
  "matplotlib>=3.1",
  "numpy>=1.7.0",
- "netCDF4==1.5.8",
  "pandas>=2.0",
  "pillow>=10.0",
  "pytest>=5.2",
  "scipy>=1.0.0",
  "sphinx>=7.0",
- "tensorflow>2.4,<2.16",
+ "tensorflow>2.4,<2.10",
  "xarray>=2023.0",
 ]
 

sup3r/models/base.py

@@ -688,7 +688,8 @@ def train_epoch(self,
 
  if only_gen or (train_gen and not gen_too_good):
  trained_gen = True
- b_loss_details = self.run_gradient_descent(
+ b_loss_details = self.timer(
+ self.run_gradient_descent,
  batch.low_res,
  batch.high_res,
  self.generator_weights,
@@ -700,7 +701,8 @@ def train_epoch(self,
 
  if only_disc or (train_disc and not disc_too_good):
  trained_disc = True
- b_loss_details = self.run_gradient_descent(
+ b_loss_details = self.timer(
+ self.run_gradient_descent,
  batch.low_res,
  batch.high_res,
  self.discriminator_weights,

sup3r/utilities/__init__.py

@@ -1,20 +1,19 @@
 """Sup3r utilities"""
 import sys
-import pandas as pd
-import numpy as np
-import tensorflow as tf
-import sklearn
-import dask
-import xarray
-import netCDF4
 from enum import Enum
 
+import dask
+import h5netcdf
+import numpy as np
+import pandas as pd
 import phygnn
 import rex
+import sklearn
+import tensorflow as tf
+import xarray
 
 from sup3r import __version__
 
-
 VERSION_RECORD = {'sup3r': __version__,
  'tensorflow': tf.__version__,
  'sklearn': sklearn.__version__,
@@ -24,7 +23,7 @@
  'nrel-rex': rex.__version__,
  'python': sys.version,
  'xarray': xarray.__version__,
- 'netCDF4': netCDF4.__version__,
+ 'h5netcdf': h5netcdf.__version__,
  'dask': dask.__version__,
  }
 
@@ -56,6 +55,7 @@ def __format__(self, format_spec):
  @classmethod
  def all_names(cls):
  """All module names.
+
  Returns
  -------
  set