Skip to content

Commit 8cdb6af

Browse files
committed
environment updates
1 parent 1f70bff commit 8cdb6af

File tree

8 files changed

+1017
-104
lines changed

8 files changed

+1017
-104
lines changed

.binder/book_linux-64_conda_spec.txt

Lines changed: 398 additions & 0 deletions
Large diffs are not rendered by default.

.binder/default_linux-64_conda_spec.txt

Lines changed: 347 additions & 0 deletions
Large diffs are not rendered by default.

.binder/environment.yml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,34 @@ channels:
33
- conda-forge
44
- nodefaults
55
dependencies:
6-
- jupyter-book >=1,<2
76
- codespell >=2.4.1,<3
8-
- cf_xarray >=0.10.0,<0.11
7+
- jupyter-book >=1,<2
8+
- nb-clean >=4.0.1,<5
9+
- papermill >=2.5.0,<3
10+
- pre-commit >=4.2.0,<5
11+
- aiohttp >=3.11.13,<4
12+
- distributed <2024.12.0
13+
- cf_xarray >=0.10.4,<0.11
914
- contextily >=1.6.2,<2
15+
- flox >=0.10.1,<0.11
1016
- geopandas >=1.0.1,<2
17+
- geoviews-core >=1.14.0,<2
1118
- hvplot >=0.11.2,<0.12
19+
- ipykernel >=6.29.5,<7
1220
- jupyterlab >=4.3.5,<5
21+
- jupyterlab-myst >=2.4.2,<3
1322
- matplotlib-base >=3.10.0,<4
1423
- numpy >=2.2.3,<3
1524
- pandas >=2.2.3,<3
1625
- planetary-computer >=1.0.0,<2
26+
- pyarrow >=19.0.1,<20
1727
- pystac >=1.12.1,<2
1828
- pystac-client >=0.8.6,<0.9
1929
- requests >=2.32.3,<3
30+
- rich >=13.9.4,<14
2031
- rioxarray >=0.18.2,<0.19
2132
- scipy >=1.15.2,<2
2233
- stackstac >=0.5.1,<0.6
23-
- xarray >=2025.1.2,<2026
34+
- xarray >=2025.3.0,<2026
35+
- xvec >=0.3.1,<0.4
2436
- zarr <3
25-
- jupyterlab-myst >=2.4.2,<3

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ package.json
1010
utils/get_links.py
1111

1212
#Data
13-
sentinel1/data/raster_data/*
14-
itslive/data/raster_data/*
15-
#itslive/data/raster_data/single_glacier_itslive.zarr/*
13+
**/data/raster_data/*
1614

1715
#Extra nbs
1816
sentinel1/subste_nbs

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ repos:
1212
rev: 1.9.1 # Check latest version
1313
hooks:
1414
- id: nbqa-flake8
15-
args: ["--max-line-length=88","--ignore=E402"] #ignore module import not at top of file
15+
args: ["--max-line-length=120","--ignore=E402"] #ignore module import not at top of file
1616
files: "\\.ipynb$"
1717
- id: nbqa-black
1818
args: ["--line-length=120"]

book/_config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ execute:
1616
execute_notebooks: cache #'auto'
1717
allow_errors: true
1818
timeout: 1500
19+
exclude_patterns:
20+
# Can't control execution order in jb build, so be sure to download from zenodo first
21+
- 'download_zenodo*'
1922

2023

2124
# Define the name of the latex output file for PDF builds

pixi.lock

Lines changed: 237 additions & 87 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pixi.toml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@ sentinel1 = "jupyter lab --LabApp.default_url='/lab/tree/book/sentinel1/nbs/1_re
1414

1515
[dependencies]
1616
aiohttp = ">=3.11.13,<4"
17-
distributed = ">=2025.2.0,<2026"
18-
cf_xarray = ">=0.10.0,<0.11"
17+
# https://github.com/dask/dask/issues/11853
18+
distributed = "<2024.12.0"
19+
cf_xarray = ">=0.10.4,<0.11"
1920
contextily = ">=1.6.2,<2"
21+
flox = ">=0.10.1,<0.11"
2022
geopandas = ">=1.0.1,<2"
2123
geoviews-core = ">=1.14.0,<2"
2224
hvplot = ">=0.11.2,<0.12"
25+
ipykernel = ">=6.29.5,<7"
2326
jupyterlab = ">=4.3.5,<5"
2427
jupyterlab-myst = ">=2.4.2,<3"
2528
matplotlib-base = ">=3.10.0,<4"
@@ -34,22 +37,25 @@ rich = ">=13.9.4,<14"
3437
rioxarray = ">=0.18.2,<0.19"
3538
scipy = ">=1.15.2,<2"
3639
stackstac = ">=0.5.1,<0.6"
37-
xarray = ">=2025.1.2,<2026"
40+
xarray = ">=2025.3.0,<2026"
3841
xvec = ">=0.3.1,<0.4"
3942
zarr = "<3"
40-
nb-clean = ">=4.0.1,<5"
41-
papermill = ">=2.5.0,<3"
42-
ipykernel = ">=6.29.5,<7"
4343

4444
[feature.book.dependencies]
45-
jupyter-book = ">=1,<2"
4645
codespell = ">=2.4.1,<3"
46+
jupyter-book = ">=1,<2"
47+
nb-clean = ">=4.0.1,<5"
48+
papermill = ">=2.5.0,<3"
49+
pre-commit = ">=4.2.0,<5"
4750

4851
[feature.book.tasks]
4952
build = "jupyter-book build book"
5053
check-links = "jupyter-book build book --builder linkcheck"
54+
precommit = "pre-commit run --all"
5155
# Unfortunately not an easy way to check .ipynb files currently
5256
# https://github.com/codespell-project/codespell/issues/2138
53-
spellcheck = "codespell --skip='pixi.lock,paper.bib,_build,*.ipynb'"
54-
spellcheck-nb = "jupyter nbconvert book/endmatter/*.ipynb book/s1_nbs/*.ipynb book/itslive_nbs/*.ipynb --NbConvertApp.use_output_suffix=False --NbConvertApp.export_format=notebook --FilesWriter.build_directory=/tmp/book --ClearOutputPreprocessor.enabled=True ; codespell /tmp/book"
57+
spellcheck = "codespell --skip='.tif.xml,pixi.lock,paper.bib,_build,*.ipynb'"
58+
spellcheck-nb = "jupyter nbconvert book/**/nbs/*.ipynb --NbConvertApp.use_output_suffix=False --NbConvertApp.export_format=notebook --FilesWriter.build_directory=/tmp/book --ClearOutputPreprocessor.enabled=True ; codespell /tmp/book"
59+
# NOTE: these are platform specific, just doing linux-64 for BinderHub
5560
export-conda-env = "pixi project export conda-environment -p linux-64 .binder/environment.yml"
61+
export-conda-explicit = "pixi project export conda-explicit-spec -p linux-64 .binder"

0 commit comments

Comments
 (0)