Skip to content

Conversation

@Zeitsperre
Copy link
Member

@Zeitsperre Zeitsperre commented Jul 24, 2025

Pull Request Checklist:

  • This PR addresses an already opened issue (for bug fixes / features)
    • This PR fixes #xyz
  • (If applicable) Documentation has been added / updated (for bug fixes / features).
  • (If applicable) Tests have been added.
  • CHANGELOG.rst has been updated (with summary of main changes).
    • Link to issue (:issue:number) and pull request (:pull:number) has been added.

What kind of change does this PR introduce?

  • Updates the notebooks and re-runs all of them to ensure they are working with latest libraries
  • Adds a few missing testing data files to the pooch registry
  • Unpin scipy version (related dependency issues addressed)
  • Adjusts a few triggers and allowed connections for CI workflows

Does this PR introduce a breaking change?

Yes. Testing data was added to the registry.txt so a new version of RavenPy is needed on PAVICS.

Other information:

We don't currently run the notebooks here in CI, as a few of them take far too long to compute. Perhaps we need to add a build for this regardless.

Changes here required for: Ouranosinc/PAVICS-e2e-workflow-tests#150

@Zeitsperre Zeitsperre requested review from huard and tlvu July 24, 2025 17:06
@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

@coveralls
Copy link

coveralls commented Jul 24, 2025

Coverage Status

coverage: 80.73% (-0.02%) from 80.752%
when pulling 6990cc3 on fix-notebooks
into b4c77c2 on master.

@Zeitsperre Zeitsperre self-assigned this Jul 24, 2025
Zeitsperre added a commit to Ouranosinc/PAVICS-e2e-workflow-tests that referenced this pull request Aug 1, 2025
# Overview

This PR fixes Ouranosinc/pavics-sdi#358 by
adding `intake-esgf` to the docker conda recipe. It also updates a
handful of core dependencies.

> [!NOTE]
> The `esgf-dap.ipynb` notebook was not included in the Jenkins buildlog
but was independently tested in a secondary build and was passing.

## Changes

- Jupyter env changes:
  - Added `intake-esgf`
    - Ouranosinc/pavics-sdi#358
  - Updated `ravenpy` and other core libraries
    - CSHS-CWRA/RavenPy#524
  - Relevant changes (alphabetical order):
```diff
>   - globus-sdk=3.61.0=pyhd8ed1ab_0
>   - intake-esgf=2025.6.6=pyhd8ed1ab_0

<   - ravenpy=0.18.1=pyhd8ed1ab_0
>   - ravenpy=0.19.0=pyhd8ed1ab_0

<   - xclim=0.56.0=pyhd8ed1ab_0
>   - xclim=0.57.0=pyhd8ed1ab_0

<   - xscen=0.12.1=pyhd8ed1ab_0
>   - xscen=0.12.3=pyhd8ed1ab_0

<   - xsdba=0.4.0=pyhd8ed1ab_0
>   - xsdba=0.5.0=pyhd8ed1ab_0
```

## Testing Checklist

- [x] Deployed as "alpha" image in production for bokeh visualization
performance regression testing.
- [x] Manually tested notebook
https://github.com/Ouranosinc/PAVICS-landing/blob/master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-5Visualization.ipynb
for bokeh visualization performance.
- [x] Committed the Jenkins build log to this Pull Request:
https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/blob/807da3100f5964f18855f84cd6c30f26516fcd77/docker/saved_buildout/jenkins-buildlogs-default.txt

## Related Issue / Discussion

- Matching notebook fixes:
  - pavics-sdi:
    - Ouranosinc/pavics-sdi#358
    - Ouranosinc/pavics-sdi#359
      - These need to be merged together
        - This was performed 
- PAVICS-landing: Ouranosinc/PAVICS-landing#111
  - RavenPy: CSHS-CWRA/RavenPy#524

- Deployment to PAVICS:
bird-house/birdhouse-deploy#567


- Previous release:
#147

## Additional Information

Full diff of the conda env export:

release-py311-250423...807da31

Full new conda env export:

https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/blob/807da3100f5964f18855f84cd6c30f26516fcd77/docker/saved_buildout/conda-env-export.yml

DockerHub build log:

https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/blob/807da3100f5964f18855f84cd6c30f26516fcd77/docker/saved_buildout/docker-buildlogs.txt
@Zeitsperre Zeitsperre merged commit f67d09a into master Aug 1, 2025
18 checks passed
@Zeitsperre Zeitsperre deleted the fix-notebooks branch August 1, 2025 17:01
Zeitsperre added a commit to bird-house/birdhouse-deploy that referenced this pull request Aug 1, 2025
## Overview

This PR updates the Jupyter image to the latest update tag
(`py311-250423-update250730`). New features include the addition of ESGF
intake catalogues and adapting to the new changes put forward in `Raven`
and `RavenPy` concerning testdata versioning.

## Changes

**The version in this PR has not yet been bumped**

- Updates the Jupyter environment for PAVICS to
`py311-250423-update250730`
  - New dependency: 
    - `intake-esgf`
  - Updated dependencies:
    - `ravenpy` (v0.19.0) (significant breaking changes)
    - `xclim` (v0.57.0)
    - `xsdba` (v0.12.3)
    - `xscen` (v0.5.0)

## Related Issue / Discussion

Ouranosinc/PAVICS-e2e-workflow-tests#150

## Additional Information

- Matching notebook fixes:
  - Pavics-sdi: Ouranosinc/pavics-sdi#358
- PAVICS-landing: Ouranosinc/PAVICS-landing#111
  - RavenPy: CSHS-CWRA/RavenPy#524
  - Raven: 
    - **This was updated in #564** 

## CI Operations

birdhouse_daccs_configs_branch: master
birdhouse_skip_ci: false
@tlvu
Copy link
Collaborator

tlvu commented Aug 1, 2025

This PR was merged to master but the new default branch of RavenPy is now main so @Zeitsperre also updated main to contain this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants