From 746fe824bec4fb5e6a38dad63c09615ad9bf1e2e Mon Sep 17 00:00:00 2001 From: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com> Date: Mon, 20 Jan 2025 16:17:11 -0500 Subject: [PATCH 1/5] synchronize dependencies Signed-off-by: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com> --- environment-docs.yml | 25 +++++++++++++++++-------- pyproject.toml | 13 +++++++------ 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/environment-docs.yml b/environment-docs.yml index 49f48010..71dc340c 100644 --- a/environment-docs.yml +++ b/environment-docs.yml @@ -6,35 +6,44 @@ dependencies: - python >=3.12,<3.13 - raven-hydro >=0.3.1,<1.0 # - autodoc-pydantic # disabled + - birdy - cairosvg >=2.6.0 + - cartopy >=0.23.0 - click >=8.0.0 -# - clisops # mocked + - clisops >=0.13.0 + - gcsfs - gdal >=3.1 # Needed for notebooks/HydroShare_integration.ipynb # See: https://github.com/CSHS-CWRA/RavenPy/pull/326 # - "hsclient", + - intake <2.0.0 + - intake-esm >=2023.07.07 + - intake-xarray - ipykernel + - ipyleaflet - ipython >=8.5.0 + - jupyter-cache - jupyter_client + - jupytext - matplotlib-base >=3.6.0 - myst-nb - - jupytext - nbsphinx -# - netCDF4 # mocked + - netCDF4 <=1.6.5 - numpy >=1.23.0,<2.0.0 - notebook - pandoc - pydantic >=2.0 - - pygments <2.19 # FIXME: Newest pygments breaks sphinx-codeautolink. See: https://github.com/felix-hilden/sphinx-codeautolink/issues/153 + - pymetalink >=6.5.2 + - s3fs - salib - seaborn - sphinx >=7.1.0 - sphinx-autoapi - sphinx-click - - sphinx-codeautolink >=0.15.2,!=0.16.0 # FIXME: temporary fix for sphinx-codeautolink + - sphinx-codeautolink >=0.16.2 - sphinx-copybutton - sphinx-rtd-theme >=1.0 - - sphinxcontrib-svg2pdfconverter + - sphinxcontrib-svg2pdfconverter >=1.2.3 - typing_extensions - - wheel -# - xarray # mocked + - xarray >=2023.11.0 +# - xesmf # mocked diff --git a/pyproject.toml b/pyproject.toml index 2bd0dc17..960cbbed 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -102,7 +102,7 @@ docs = [ # See: https://github.com/CSHS-CWRA/RavenPy/pull/326 # "hsclient", "intake <2.0.0", - "intake-esm", + "intake-esm >=2023.07.07", "intake-xarray", "ipykernel", "ipyleaflet", @@ -111,19 +111,20 @@ docs = [ "jupyter-cache", "jupyter_client", "jupytext", + "matplotlib >=3.6.0", "myst_nb", "nbsphinx", - "numpydoc >=1.8.0", - "pygments <2.19", # FIXME: Newest pygments breaks sphinx-codeautolink. See: https://github.com/felix-hilden/sphinx-codeautolink/issues/153 "pymetalink >=6.5.2", - "salib", "s3fs", - "sphinx >=7.0.0", + "salib", + "sphinx >=7.1.0", + "sphinx-autoapi", "sphinx-click", - "sphinx-codeautolink >=0.15.2,!=0.16.0", # FIXME: temporary fix for sphinx-codeautolink + "sphinx-codeautolink >=0.16.2", "sphinx-copybutton", "sphinx-rtd-theme >=1.0", "sphinxcontrib-svg2pdfconverter >=1.2.3", + "typing-extensions", "xesmf" ] gis = [ From 07a8e1859c9c67b4c06229e3143e79b1f124c228 Mon Sep 17 00:00:00 2001 From: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com> Date: Mon, 20 Jan 2025 16:43:09 -0500 Subject: [PATCH 2/5] unpin intake Signed-off-by: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com> --- environment-docs.yml | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment-docs.yml b/environment-docs.yml index 71dc340c..922717e2 100644 --- a/environment-docs.yml +++ b/environment-docs.yml @@ -16,7 +16,7 @@ dependencies: # Needed for notebooks/HydroShare_integration.ipynb # See: https://github.com/CSHS-CWRA/RavenPy/pull/326 # - "hsclient", - - intake <2.0.0 + - intake - intake-esm >=2023.07.07 - intake-xarray - ipykernel diff --git a/pyproject.toml b/pyproject.toml index 960cbbed..eb0dac28 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -101,7 +101,7 @@ docs = [ # Needed for notebooks/HydroShare_integration.ipynb # See: https://github.com/CSHS-CWRA/RavenPy/pull/326 # "hsclient", - "intake <2.0.0", + "intake", "intake-esm >=2023.07.07", "intake-xarray", "ipykernel", From b88389b076c9a0878874e3e57bddc592b854f0a9 Mon Sep 17 00:00:00 2001 From: Zeitsperre <10819524+Zeitsperre@users.noreply.github.com> Date: Thu, 23 Jan 2025 13:30:18 -0500 Subject: [PATCH 3/5] add pin for zarr --- environment-dev.yml | 1 + environment-docs.yml | 1 + pyproject.toml | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/environment-dev.yml b/environment-dev.yml index 63d1b426..9252952a 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -39,6 +39,7 @@ dependencies: - xclim >=0.50.0 - xesmf - xskillscore + - zarr >=2.13,<3.0 # FIXME: zarr v3 does not support FSMap like before: https://github.com/zarr-developers/zarr-python/issues/2706 # Dev tools and testing - pip >=24.3.1 - black ==24.10.0 diff --git a/environment-docs.yml b/environment-docs.yml index 922717e2..fd2e0b43 100644 --- a/environment-docs.yml +++ b/environment-docs.yml @@ -47,3 +47,4 @@ dependencies: - typing_extensions - xarray >=2023.11.0 # - xesmf # mocked + - zarr >=2.13,<3.0 # FIXME: zarr v3 does not support FSMap like before: https://github.com/zarr-developers/zarr-python/issues/2706 diff --git a/pyproject.toml b/pyproject.toml index eb0dac28..6520c558 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -125,7 +125,8 @@ docs = [ "sphinx-rtd-theme >=1.0", "sphinxcontrib-svg2pdfconverter >=1.2.3", "typing-extensions", - "xesmf" + "xesmf", + "zarr >=2.10.0,<3.0" # FIXME: zarr v3 does not support FSMap like before: https://github.com/zarr-developers/zarr-python/issues/2706 ] gis = [ "affine >=2.4.0", From e0a0759b53dffedb891ea9214ffb843a2ee3598f Mon Sep 17 00:00:00 2001 From: Zeitsperre <10819524+Zeitsperre@users.noreply.github.com> Date: Thu, 23 Jan 2025 13:54:14 -0500 Subject: [PATCH 4/5] pin intake --- environment-docs.yml | 4 ++-- pyproject.toml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/environment-docs.yml b/environment-docs.yml index fd2e0b43..6b1c4f8d 100644 --- a/environment-docs.yml +++ b/environment-docs.yml @@ -16,9 +16,9 @@ dependencies: # Needed for notebooks/HydroShare_integration.ipynb # See: https://github.com/CSHS-CWRA/RavenPy/pull/326 # - "hsclient", - - intake + - intake <2.0 - intake-esm >=2023.07.07 - - intake-xarray + - intake-xarray <2.0 - ipykernel - ipyleaflet - ipython >=8.5.0 diff --git a/pyproject.toml b/pyproject.toml index 6520c558..226b9979 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -101,12 +101,12 @@ docs = [ # Needed for notebooks/HydroShare_integration.ipynb # See: https://github.com/CSHS-CWRA/RavenPy/pull/326 # "hsclient", - "intake", + "intake <2.0", "intake-esm >=2023.07.07", - "intake-xarray", + "intake-xarray <2.0", "ipykernel", "ipyleaflet", - "ipython", + "ipython >=8.5.0", "ipywidgets", "jupyter-cache", "jupyter_client", From 9c718bbe692a8f2f2a67c46b212d8dfa13726ff4 Mon Sep 17 00:00:00 2001 From: Zeitsperre <10819524+Zeitsperre@users.noreply.github.com> Date: Thu, 23 Jan 2025 13:56:05 -0500 Subject: [PATCH 5/5] update CHANGELOG.rst --- CHANGELOG.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7185b163..903a60cb 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,6 +14,7 @@ v0.17.0 (unreleased) * Typo and grammar fixes. * Updated the Python, Anaconda, and Ubuntu versions used to generate the documentation. * Small import fixes and minor code cleanup (`ravenpy.extractors`). (PR #436) +* Adjusted pins for `intake`, `intake-esm` and `zarr` to ensure notebooks run correctly. (PR #440) v0.16.1 (2024-12-05) --------------------