Merge pull request #326 from CSHS-CWRA/fix-310

Upgrade to pydantic v2

.pre-commit-config.yaml

@@ -32,7 +32,7 @@ repos:
     hooks:
       - id: toml-sort-fix
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 23.11.0
+    rev: 23.12.0
     hooks:
       - id: black
         exclude: ^docs/
@@ -42,19 +42,25 @@ repos:
       - id: flake8
         args: [ '--config=setup.cfg' ]
   - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
   - repo: https://github.com/nbQA-dev/nbQA
-    rev: 1.7.0
+    rev: 1.7.1
     hooks:
       - id: nbqa-pyupgrade
         args: [ '--py38-plus' ]
         additional_dependencies: [ 'pyupgrade==3.15.0' ]
       - id: nbqa-black
-        additional_dependencies: [ 'black==23.11.0' ]
+        additional_dependencies: [ 'black==23.12.0' ]
       - id: nbqa-isort
-        additional_dependencies: [ 'isort==5.12.0' ]
+        additional_dependencies: [ 'isort==5.13.2' ]
+  - repo: https://github.com/kynan/nbstripout
+    rev: 0.6.1
+    hooks:
+      - id: nbstripout
+        files: ".ipynb"
+        args: [ '--extra-keys', 'metadata.kernelspec' ]
   - repo: https://github.com/pycqa/pydocstyle
     rev: 6.3.0
     hooks:
@@ -64,14 +70,14 @@ repos:
     rev: v0.3.9
     hooks:
       - id: blackdoc
-        additional_dependencies: [ 'black==23.11.0' ]
+        additional_dependencies: [ 'black==23.12.0' ]
   - repo: https://github.com/adrienverge/yamllint.git
     rev: v1.33.0
     hooks:
       - id: yamllint
         args: [ '--config-file=.yamllint.yaml' ]
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.27.1
+    rev: 0.27.3
     hooks:
       - id: check-github-workflows
       - id: check-readthedocs

HISTORY.rst

@@ -4,8 +4,9 @@ History
 
 0.13 (unreleased)
 -----------------
+* Update to Pydantic v2
 * Fixed problem with scalar elevation in netCDF files parsed with `nc_specs` (issue #279)
-
+* Add notebook on sensitivity analysis.
 
 0.12.3 (2023-10-02)
 -------------------

docs/conf.py

@@ -65,7 +65,11 @@
 
 nb_execution_mode = "cache"
 nb_execution_allow_errors = False
-nb_execution_excludepatterns = ["notebooks/*.ipynb", "notebooks/paper/*.ipynb"]
+nb_execution_excludepatterns = [
+    "configuration.md",
+    "notebooks/*.ipynb",
+    "notebooks/paper/*.ipynb"
+]
 
 # nbsphinx_execute = "auto"
 # nbsphinx_timeout = 1
@@ -146,7 +150,8 @@
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This patterns also effect to html_static_path and html_extra_path
-exclude_patterns = ["_build", "Thumbs.db", ".DS_Store", ".jupyter_cache", "jupyter_execute", "notebooks/paper"]
+exclude_patterns = ["_build", "Thumbs.db", ".DS_Store", ".jupyter_cache", "jupyter_execute", "notebooks/paper",
+                    "notebooks/HydroShare_integration.ipynb", ]
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = "sphinx"

docs/notebooks/00_Introduction_to_JupyterLab.ipynb

@@ -204,11 +204,6 @@
   }
  ],
  "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",

docs/notebooks/01_Getting_watershed_boundaries.ipynb

@@ -42,9 +42,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "scrolled": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "# Create WPS instances# Set environment variable WPS_URL to \"http://localhost:9099\" to run on the default local server\n",
@@ -226,11 +224,6 @@
   }
  ],
  "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
-   "language": "python",
-   "name": "python3"
-  },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",