NREL · bnb32 · Nov 5, 2024 · Jun 27, 2024 · Jun 27, 2024 · Jun 27, 2024
diff --git a/.flake8 b/.flake8
diff --git a/.github/linters/.flake8 b/.github/linters/.flake8
@@ -1,4 +1,4 @@
 [flake8]
-ignore = E731,E402,F,W503
+ignore = E731,E402,F,W503,E203
 exclude = .git,__pycache__,docs/source/conf.py,old,build,dist,bin/tmp/*
 max-complexity = 12
diff --git a/.github/linters/.python-lint b/.github/linters/.python-lint
@@ -55,6 +55,8 @@ confidence=
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
 disable=
+        no-member,
+        attribute-defined-outside-init,
         arguments-renamed,
         unspecified-encoding,
         consider-using-f-string,
@@ -498,4 +500,4 @@ known-third-party=enchant
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "Exception"
-overgeneral-exceptions=Exception
+overgeneral-exceptions=builtin.Exception
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -24,6 +24,7 @@ jobs:
           VALIDATE_PYTHON_ISORT: false
           VALIDATE_PYTHON_MYPY: false
           VALIDATE_DOCKERFILE_HADOLINT: false
+          VALIDATE_GITHUB_ACTIONS: false
           VALIDATE_JSCPD: false
           VALIDATE_JSON: false
           VALIDATE_MARKDOWN: false

diff --git a/.github/workflows/pull_request_tests.yml b/.github/workflows/pull_request_tests.yml
@@ -1,6 +1,6 @@
 name: Pytests
 
-on: 
+on:
   pull_request:
   workflow_dispatch:
 
@@ -37,4 +37,4 @@ jobs:
         python -m pip install .[test]
     - name: Run pytest
       run: |
-        python -m pytest -v --disable-warnings
+        python -m pytest -v --disable-warnings
diff --git a/.gitignore b/.gitignore
@@ -44,6 +44,8 @@ nosetests.xml
 coverage.xml
 *.cover
 .hypothesis/
+coverage/lcov.info
+lcov.info
 *.png
 
 # Translations
@@ -119,3 +121,6 @@ tags
 # pixi environments
 .pixi
 *.egg-info
+
+# test dirs
+exo_cache
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,18 +1,25 @@
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
+  - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v2.3.0
     hooks:
-    -   id: check-json
-    -   id: check-merge-conflict
-    -   id: check-symlinks
-    -   id: check-toml
-    -   id: flake8
-    -   id: mixed-line-ending
--   repo: https://github.com/PyCQA/pylint
+      - id: check-json
+      - id: check-yaml
+      - id: check-merge-conflict
+      - id: check-symlinks
+      - id: check-toml
+      - id: flake8
+        args: [--config, .github/linters/.flake8]
+      - id: mixed-line-ending
+  - repo: https://github.com/PyCQA/pylint
     rev: v3.1.0
     hooks:
-    -   id: pylint
-- repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.4.10
-  hooks:
-    - id: ruff
+      - id: pylint
+        args:
+          [
+            --rcfile,
+            .github/linters/.python-lint,
+          ]
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.5.3
+    hooks:
+      - id: ruff
diff --git a/.pylintrc b/.pylintrc
@@ -1,4 +1,4 @@
-[MASTER]
+[MAIN]
 
 # A comma-separated list of package or module names from where C extensions may
 # be loaded. Extensions are loading into the active Python interpreter and may
@@ -55,76 +55,20 @@ confidence=
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
 disable=
+        no-name-in-module,
+        no-member,
+        attribute-defined-outside-init,
+        arguments-renamed,
+        unspecified-encoding,
+        consider-using-f-string,
         # Defaults
-        print-statement,
-        parameter-unpacking,
-        unpacking-in-except,
-        old-raise-syntax,
-        backtick,
-        import-star-module-level,
         raw-checker-failed,
         bad-inline-option,
         locally-disabled,
         file-ignored,
         suppressed-message,
         useless-suppression,
         deprecated-pragma,
-        apply-builtin,
-        basestring-builtin,
-        buffer-builtin,
-        cmp-builtin,
-        coerce-builtin,
-        execfile-builtin,
-        file-builtin,
-        long-builtin,
-        raw_input-builtin,
-        reduce-builtin,
-        standarderror-builtin,
-        unicode-builtin,
-        xrange-builtin,
-        coerce-method,
-        delslice-method,
-        getslice-method,
-        setslice-method,
-        no-absolute-import,
-        old-division,
-        dict-iter-method,
-        dict-view-method,
-        next-method-called,
-        metaclass-assignment,
-        indexing-exception,
-        raising-string,
-        reload-builtin,
-        oct-method,
-        hex-method,
-        nonzero-method,
-        cmp-method,
-        input-builtin,
-        round-builtin,
-        intern-builtin,
-        unichr-builtin,
-        map-builtin-not-iterating,
-        zip-builtin-not-iterating,
-        range-builtin-not-iterating,
-        filter-builtin-not-iterating,
-        using-cmp-argument,
-        div-method,
-        idiv-method,
-        rdiv-method,
-        exception-message-attribute,
-        invalid-str-codec,
-        sys-max-int,
-        bad-python3-import,
-        deprecated-string-function,
-        deprecated-str-translate-call,
-        deprecated-itertools-function,
-        deprecated-types-field,
-        next-method-defined,
-        dict-items-not-iterating,
-        dict-keys-not-iterating,
-        dict-values-not-iterating,
-        consider-using-f-string,
-        unspecified-encoding,
         # Custom
         protected-access,
         fixme,
@@ -145,7 +89,6 @@ disable=
         too-many-nested-blocks,
         invalid-name,
         import-error,
-        bad-continuation,
         try-except-raise,
         no-else-raise,
         no-else-return,
@@ -558,4 +501,4 @@ known-third-party=enchant
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "Exception"
-overgeneral-exceptions=Exception
+overgeneral-exceptions=builtin.Exception
diff --git a/README.rst b/README.rst
@@ -1,6 +1,6 @@
-#################
+*****************
 Welcome to SUP3R!
-#################
+*****************
 
 |Docs| |Tests| |Linter| |PyPi| |PythonV| |Codecov| |Zenodo|
 

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Documentation config file
 """
@@ -16,8 +15,8 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
-import sphinx_rtd_theme
 import sys
+
 sys.path.insert(0, os.path.abspath('../../'))
 
 # -- Project information -----------------------------------------------------
@@ -31,6 +30,7 @@
 sys.path.append(pkg)
 
 from sup3r import __version__ as v
+
 # The short X.Y version
 version = v
 # The full version, including alpha/beta/rc tags
@@ -104,8 +104,7 @@
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'sphinx_rtd_theme'
-html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+html_theme = 'pydata_sphinx_theme'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

diff --git a/examples/sup3rcc/run_configs/solar/config_fwp.json b/examples/sup3rcc/run_configs/solar/config_fwp.json
@@ -33,7 +33,7 @@
     "input_handler_kwargs": {
         "target": [23.2, -129],
         "shape": [26, 59],
-        "temporal_slice": [null, null, null],
+        "time_slice": [null, null, null],
         "nsrdb_source_fp": "/scratch/gbuster/sup3r/source_gcm_data/nsrdb_clearsky.h5",
         "nsrdb_agg": 625,
         "nsrdb_smoothing": 0,

diff --git a/examples/sup3rcc/run_configs/trh/config_fwp.json b/examples/sup3rcc/run_configs/trh/config_fwp.json
@@ -24,7 +24,7 @@
     "input_handler_kwargs": {
         "target": [23.2, -129],
         "shape": [26, 59],
-        "temporal_slice": [null, null, null],
+        "time_slice": [null, null, null],
         "worker_kwargs": {
             "max_workers": 1
         }

diff --git a/examples/sup3rcc/run_configs/wind/config_fwp.json b/examples/sup3rcc/run_configs/wind/config_fwp.json
@@ -25,7 +25,7 @@
     "input_handler_kwargs": {
         "target": [23.2, -129],
         "shape": [26, 59],
-        "temporal_slice": [null, null, null],
+        "time_slice": [null, null, null],
         "worker_kwargs": {
             "max_workers": 1
         }

diff --git a/examples/sup3rwind/README.rst b/examples/sup3rwind/README.rst
@@ -14,12 +14,12 @@ The Sup3rWind data is also loaded into `HSDS <https://www.hdfgroup.org/solutions
 Example Sup3rWind Data Usage
 -----------------------------
 
-Sup3rWind data can be used in generally the same way as Sup3rCC data, with the condition that Sup3rWind includes only wind data and ancillary variables for modeling wind energy generation. Refer to the Sup3rCC example notebook `here <https://github.com/NREL/sup3r/tree/main/examples/sup3rcc/using_the_data.ipynb>`_ for usage patterns.
+Sup3rWind data can be used in generally the same way as `Sup3rCC <https://nrel.github.io/sup3r/examples/sup3rcc.html>`_ data, with the condition that Sup3rWind includes only wind data and ancillary variables for modeling wind energy generation. Refer to the Sup3rCC example notebook `here <https://github.com/NREL/sup3r/tree/main/examples/sup3rcc/using_the_data.ipynb>`_ for usage patterns.
 
 Running Sup3rWind Models
 -------------------------
 
-The process for running the Sup3rWind models is much the same as for Sup3rCC (``sup3r/examples/sup3rcc/README.rst``).
+The process for running the Sup3rWind models is much the same as for `Sup3rCC <https://nrel.github.io/sup3r/examples/sup3rcc.html>`_.
 
 #. Download the Sup3rWind models to your hardware using the AWS CLI: ``$ aws s3 cp s3://nrel-pds-wtk/sup3rwind/models/``
 #. Download the ERA5 data that you want to downscale from `ERA5-single-levels <https://cds.climate.copernicus.eu/cdsapp#!/dataset/reanalysis-era5-single-levels?tab=overview/>`_ and/or `ERA5-pressure-levels <https://cds.climate.copernicus.eu/cdsapp#!/dataset/reanalysis-era5-pressure-levels?tab=overview/>`_.

diff --git a/pyproject.toml b/pyproject.toml
@@ -27,9 +27,9 @@ classifiers=[
   "Programming Language :: Python :: 3.11",
 ]
 dependencies = [
-  "NREL-rex>=0.2.84",
+  "NREL-rex>=0.2.87",
   "NREL-phygnn>=0.0.23",
-  "NREL-gaps>=0.6.0",
+  "NREL-gaps>=0.6.13",
   "NREL-farms>=1.0.4",
   "dask>=2022.0",
   "h5netcdf>=1.1.0",
@@ -54,11 +54,12 @@ dev = [
 ]
 doc = [
   "sphinx>=7.0",
-  "sphinx_rtd_theme>=2.0",
   "sphinx-click>=4.0",
+  "pydata-sphinx-theme>=15.4"
 ]
 test = [
   "pytest>=5.2",
+  "pytest-env"
 ]
 
 [project.urls]
@@ -224,10 +225,10 @@ max-complexity = 12
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = [
   "F401", # unused-import
-  ]
-#"docs/source/conf.py" = [
-#  "E402", # unused-import
-#  ]
+]
+"docs/source/conf.py" = [
+  "E402", # unused-import
+]
 
 [tool.ruff.lint.pylint]
 max-args = 5 # (PLR0913) Maximum number of arguments for function / method
@@ -274,16 +275,17 @@ xarray = ">=2023.0"
 
 [tool.pixi.pypi-dependencies]
 NREL-sup3r = { path = ".", editable = true }
-NREL-rex = { version = ">=0.2.84" }
+NREL-rex = { version = ">=0.2.87" }
 NREL-phygnn = { version = ">=0.0.23" }
-NREL-gaps = { version = ">=0.6.0" }
+NREL-gaps = { version = ">=0.6.13" }
 NREL-farms = { version = ">=1.0.4" }
 
 [tool.pixi.environments]
 default = { solve-group = "default" }
 dev = { features = ["dev", "doc", "test"], solve-group = "default" }
 doc = { features = ["doc"], solve-group = "default" }
 test = { features = ["test"], solve-group = "default" }
+viz = { features = ["viz"], solve-group = "default" }
 
 [tool.pixi.tasks]
 test = "pytest --pdb --durations=10 tests"
@@ -294,10 +296,19 @@ sphinx_rtd_theme = ">=2.0"
 
 [tool.pixi.feature.test.dependencies]
 pytest = ">=5.2"
+pytest-cov = ">=5.0.0"
 
 [tool.pixi.feature.dev.dependencies]
 build = ">=0.6"
 twine = ">=5.0"
 ruff = ">=0.4"
 ipython = ">=8.0"
 pytest-xdist = ">=3.0"
+
+[tool.pixi.feature.viz.dependencies]
+jupyter = ">1.0.0"
+hvplot = ">0.10.0"
+
+[tool.pytest_env]
+CUDA_VISIBLE_DEVICES = "-1"
+TF_ENABLE_ONEDNN_OPTS = "0"