Skip to content

Commit 140236c

Browse files
jsignelljsignell
committed
Merge branch 'main' into quarto
2 parents 0325a73 + 704ee44 commit 140236c

File tree

6 files changed

+262
-527
lines changed

6 files changed

+262
-527
lines changed

‎CHANGELOG.md‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# Changelog
2+
3+
## [Unreleased]
4+
5+
## [2025.08.14-v2] - 2025-09-19
6+
7+
### Changed
8+
9+
- Pin to `pystac==1.14.1` [#48](https://github.com/NASA-IMPACT/pangeo-notebook-veda-image/pull/48)
10+
11+
## [2025.08.14-v1] - 2025-09-10
12+
13+
### Added
14+
15+
- Add `virtualizarr>=2.0.0` [#45](https://github.com/NASA-IMPACT/pangeo-notebook-veda-image/pull/45)
16+
- Add `icechunk` [#45](https://github.com/NASA-IMPACT/pangeo-notebook-veda-image/pull/45)
17+
18+
### Changed
19+
20+
- Base docker image updated to pangeo/pangeo-notebook:2025.08.14 [#38](https://github.com/NASA-IMPACT/pangeo-notebook-veda-image/pull/38) [#45](https://github.com/NASA-IMPACT/pangeo-notebook-veda-image/pull/45)
21+
- Use `conda` instead of `mamba` to update environment [#44](https://github.com/NASA-IMPACT/pangeo-notebook-veda-image/pull/44)
22+
- Pin to `geoviews-core==1.14.1` [#45](https://github.com/NASA-IMPACT/pangeo-notebook-veda-image/pull/45)
23+
24+
### Removed
25+
26+
- Remove `libgdal-arrow-parquet==3.10.3`, `libgdal-netcdf==3.10.3` since they are now included in base pangeo-notebook image [#45](https://github.com/NASA-IMPACT/pangeo-notebook-veda-image/pull/45)
27+
28+
## [2025.06.02-v1] - 2025-07-31
29+
30+
### Added
31+
32+
- Add `libgdal-arrow-parquet==3.10.3`, `libgdal-netcdf==3.10.3` [#41](https://github.com/NASA-IMPACT/pangeo-notebook-veda-image/pull/41)
33+
34+
### Changed
35+
36+
- Base docker image updated to pangeo/pangeo-notebook:2025.06.02 [#38](https://github.com/NASA-IMPACT/pangeo-notebook-veda-image/pull/38)
37+
38+
## [2024.11.11-v1] - 2025-01-24
39+
40+
### Changed
41+
42+
- Base docker image updated to pangeo/pangeo-notebook:2024.11.11 [#31](https://github.com/NASA-IMPACT/pangeo-notebook-veda-image/pull/31)
43+
44+
45+
## [2024.08.18-v1] - 2024-09-10
46+
47+
### Changed
48+
49+
- Base docker image updated to pangeo/pangeo-notebook:2024.08.18 [#28]( https://github.com/NASA-IMPACT/pangeo-notebook-veda-image/pull/28)
50+
- Don't allow defaults channel - only conda-forge [#25](https://github.com/NASA-IMPACT/pangeo-notebook-veda-image/pull/25)
51+
52+
## [2024.06.02-v1] - 2024-09-06
53+
54+
Initial release
55+
56+
[Unreleased]: <https://github.com/NASA-IMPACT/pangeo-notebook-veda-image/compare/2025.08.14-v2..main>
57+
[2025.08.14-v1]: <https://github.com/NASA-IMPACT/pangeo-notebook-veda-image/compare/2025.08.14-v1..2025.08.14-v2>
58+
[2025.08.14-v1]: <https://github.com/NASA-IMPACT/pangeo-notebook-veda-image/compare/2025.06.02-v1..2025.08.14-v1>
59+
[2025.06.02-v1]: <https://github.com/NASA-IMPACT/pangeo-notebook-veda-image/compare/2024.11.11-v1..2025.06.02-v1>
60+
[2024.11.11-v1]: <https://github.com/NASA-IMPACT/pangeo-notebook-veda-image/compare/2024.08.18-v1..2024.11.11-v1>
61+
[2024.08.18-v1]: <https://github.com/NASA-IMPACT/pangeo-notebook-veda-image/compare/2024.06.02-v1..2024.08.18-v1>
62+
[2024.06.02-v1]: <https://github.com/NASA-IMPACT/pangeo-notebook-veda-image/tree/2024.06.02-v1>

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM pangeo/pangeo-notebook:2025.06.02
1+
FROM pangeo/pangeo-notebook:2025.08.14
22

33
LABEL org.opencontainers.image.source="https://github.com/nasa-impact/pangeo-notebook-veda-image"
44

@@ -11,7 +11,7 @@ USER ${NB_USER}
1111

1212
ADD environment.yml environment.yml
1313

14-
RUN mamba env update --prefix /srv/conda/envs/notebook --file environment.yml
14+
RUN conda env update --prefix /srv/conda/envs/notebook --file environment.yml
1515

1616
COPY --chown=${NB_USER}:${NB_USER} image-tests /srv/repo/image-tests
1717
COPY --chown=${NB_USER}:${NB_USER} scripts /srv/repo/scripts

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ docker build -t pangeo-notebook-veda .
1717
docker run -v ./image-tests:/srv/repo/image-tests -e REGENERATE_OUTPUTS=true pangeo-notebook-veda bash /srv/repo/scripts/run_tests.sh
1818
```
1919

20-
### Regenrating the output of the test notebooks
20+
### Regenerating the output of the test notebooks
2121

2222
To regenerate the output of the test notebooks, we can use the same command we used in the previous section to generate the output of the notebooks while adding new tests:
2323

‎docs/usage-on-veda-jupyterhubs.md‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,21 +80,31 @@ Note the full image URI will be `public.ecr.aws/nasa-veda/pangeo-notebook-veda-i
8080

8181
1. If you haven't already [clone DS's fork](https://github.com/developmentseed/infrastructure/) of [2i2c's insfrastructure repo](https://github.com/2i2c-org/infrastructure)
8282

83-
2. Before updating the image in the infrastructure repo, create a tag in the pangeo-notebook-veda-image repository. The tag should be of the form `YYYY.MM.DD-vX`, where:
83+
2. In the pangeo-notebook-veda-image repository, create a release branch with the name `release/YYYY.MM.DD-vX`, where `YYYY.MM.DD-vX` is the next tag. The tag should be of the form `YYYY.MM.DD-vX`, where:
8484
- `YYYY.MM.DD` should match the tag of the pangeo-notebook base image
8585
- `vX` is the version number, starting with `v1` and incrementing for subsequent versions on the same date
8686

8787
For example: `2024.06.02-v1`
8888

89-
To create and push the tag:
89+
3. Update the CHANGELOG.
90+
- Create a new header below `## [Unreleased]` with the new version.
91+
- Remove any unused header sections.
92+
- Update the links at the bottom of the page for the new header.
93+
94+
4. Commit your changes, push your branch to Github, and request a review.
95+
96+
5. Once approved, merge the PR.
97+
98+
6. Create and push the tag using the same tag name as the release branch. For example:
99+
90100
```bash
91101
git tag 2024.06.02-v1
92102
git push origin 2024.06.02-v1
93103
```
94104

95-
3. Once the tag is pushed, GH actions will automatically run the image building pipeline. You can watch this in the [GH actions tab](https://github.com/NASA-IMPACT/pangeo-notebook-veda-image/actions). Once the image is build and pushed to ECR, we can update the singleuser image in the infrastructure repo.
105+
7. Once the tag is pushed, GH actions will automatically run the image building pipeline. You can watch this in the [GH actions tab](https://github.com/NASA-IMPACT/pangeo-notebook-veda-image/actions). Once the image is build and pushed to ECR, we can update the singleuser image in the infrastructure repo.
96106

97-
4. In `config/clusters/nasa-veda/common.values.yaml`, update the profile choice corresponding to the Pangeo image in the `singleuser` image block and open a PR to [2i2c's insfrastructure repo](https://github.com/2i2c-org/infrastructure). Use the new image URI with the tag we just created. For example: `public.ecr.aws/nasa-veda/pangeo-notebook-veda-image:2024.06.02-v1`.
107+
8. In `config/clusters/nasa-veda/common.values.yaml`, update the profile choice corresponding to the Pangeo image in the `singleuser` image block and open a PR to [2i2c's insfrastructure repo](https://github.com/2i2c-org/infrastructure). Use the new image URI with the tag we just created. For example: `public.ecr.aws/nasa-veda/pangeo-notebook-veda-image:2024.06.02-v1`.
98108

99109
It's recommended to update the staging hub's image first. Once that's verified to work, update the production hub's image.
100110

‎environment.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,14 @@ dependencies:
77
- code-server>=3.2
88
- jupyter-vscode-proxy
99
- openssh
10-
# Remove once Pangeo has upstream. Pinned to match pangeo-notebook image
11-
- libgdal-arrow-parquet==3.10.3
1210
- pre_commit
11+
# Remove once Pangeo has upstream.
12+
- virtualizarr>=2.0.0
13+
- icechunk
14+
# Working around https://github.com/holoviz/geoviews/pull/794
15+
- geoviews-core==1.14.1
16+
# Working around https://github.com/stac-utils/pystac/issues/1575
17+
- pystac==1.14.1
1318
- pip
1419
- pip:
1520
- git+https://github.com/MAAP-Project/stac_ipyleaflet.git@0.3.6

0 commit comments

Comments
 (0)