Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Jupyter Notebooks #440

Merged
merged 5 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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)
--------------------
Expand Down
1 change: 1 addition & 0 deletions environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 18 additions & 8 deletions environment-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,45 @@ 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
- intake-esm >=2023.07.07
- intake-xarray <2.0
- 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
- zarr >=2.13,<3.0 # FIXME: zarr v3 does not support FSMap like before: https://github.com/zarr-developers/zarr-python/issues/2706
22 changes: 12 additions & 10 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -101,30 +101,32 @@ docs = [
# Needed for notebooks/HydroShare_integration.ipynb
# See: https://github.com/CSHS-CWRA/RavenPy/pull/326
# "hsclient",
"intake <2.0.0",
"intake-esm",
"intake-xarray",
"intake <2.0",
"intake-esm >=2023.07.07",
"intake-xarray <2.0",
"ipykernel",
"ipyleaflet",
"ipython",
"ipython >=8.5.0",
"ipywidgets",
"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",
"xesmf"
"typing-extensions",
"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",
Expand Down
Loading