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.

Sign up for GitHub

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

Jump to bottom

Update v1 with main #1065

Merged
merged 35 commits into from
Sep 26, 2024
Merged

Update v1 with main #1065

merged 35 commits into from
Sep 26, 2024

Conversation

savente93
Copy link
Contributor

Simple merge back to resolve merge conflicts.

DirkEilander and others added 30 commits March 6, 2024 10:55
@DirkEilander
fix typo in artifacts root (#828)
202874e
@Tjalling-dejong @savente93
@hboisgon @DirkEilander
Update data catalog (#718)
9f4d3f2 
Co-authored-by: Sam Vente <sam.vente@deltares.nl>
Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
Co-authored-by: Dirk Eilander <dirk.eilander@gmail.com>
Co-authored-by: DirkEilander <15379728+DirkEilander@users.noreply.github.com>
@Tjalling-dejong
Revert "Update data catalog" (#831)
69ad608
@deltamarnix @savente93
Main pin pixi 0.15.2 (#839)
f59f7a5 
Co-authored-by: Sam Vente <savente93@gmail.com>
@roeldegoede
fix mesh_2d_from_rasterdataset for rasterdatasets with multidimension… (
9b7f394 
#843)
@hboisgon
fix get_mesh after xugrid update (#848)
49f3c07
@github-actions @web-flow
Update pixi lock file (#868)
0a1346c 
Co-authored-by: GitHub <noreply@github.com>
@DirkEilander @savente93
make zoom level more robust for crs (#851)
43fcebe 
Co-authored-by: Sam Vente <savente93@gmail.com>
@roeldegoede @DirkEilander
bugfix in clip_bbox for clipping on a bbox outside of rasterdataset (#…
8a446b0 
…860)

Co-authored-by: Dirk Eilander <dirk.eilander@gmail.com>
Co-authored-by: DirkEilander <15379728+DirkEilander@users.noreply.github.com>
@DirkEilander @hboisgon
Improved flw.d8_from_dem method (#305)
d8120b7 
Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
@DirkEilander @hboisgon @Jaapel
fix renaming issue (#883)
9cc9eb4 
Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
Co-authored-by: Jaap Langemeijer <33715902+Jaapel@users.noreply.github.com>
@DirkEilander
fix error message for 0D geometry variable in GeoDataset (#885)
5dabbc3
@aweerts
add EOBS v29.0e deltares_data.yml (#892)
7079e9b
@DirkEilander @Tjalling-dejong @savente93
Catalogs refactor (#849)
07537c7 
Co-authored-by: Tjalling-dejong <tjalling.dejong@deltares.nl>
Co-authored-by: Sam Vente <savente93@proton.me>
Co-authored-by: Tjalling-dejong <93266159+Tjalling-dejong@users.noreply.github.com>
Co-authored-by: Sam Vente <savente93@gmail.com>
@Tjalling-dejong
Revert "Catalogs refactor" (#909)
563949b
@github-actions @web-flow
Update pixi lock file (#914)
f1fad0e 
Co-authored-by: GitHub <noreply@github.com>
@deltamarnix
Update pixi to 0.21.1 (#919)
4b4012d
@savente93 @Tjalling-dejong
Refactor Catalogs (#921)
39cc2c5 
Co-authored-by: Tjalling-dejong <93266159+Tjalling-dejong@users.noreply.github.com>
Co-authored-by: Tjalling-dejong <tjalling.dejong@deltares.nl>
@Tjalling-dejong
Updated .gitattributes for working with yaml files on Windows (#930)
7cfa04a
@DirkEilander
bugfix in hydrograph_1d method (#933)
23f7c0a
@Tjalling-dejong
added .yml to gitattributes (#935)
ad2548e
@savente93
Release/v0.10.0 (#997)
85eb26a
@savente93
bump version to dev (#998)
da2061d
@Huite
Update pyproject.toml: consistent double quotes (#1002)
14cba64
@Jaapel
restrict numpy to version 1 (#1003)
5eb0cc3
@Tjalling-dejong
unpinned xarray and updated code for new versions of xarray and geopa…
cd6d2b8 
…ndas (#1020)
@github-actions @web-flow
Update pixi lock file (#1022)
3bcc76c 
Co-authored-by: GitHub <noreply@github.com>
@savente93 @Jaapel
Release flow (#1019)
4a3d6a5 
Co-authored-by: Jaap Langemeijer <33715902+Jaapel@users.noreply.github.com>
@shartgring
Bugfix when using pyet method to calculate PET (#918)
a707d44
@savente93
Merge branch 'main' into update-v1-with-main
54240b4
Jaapel
Jaapel suggested changes Sep 26, 2024
View reviewed changes
pixi.toml Outdated Show resolved Hide resolved
pyproject.toml Outdated Show resolved Hide resolved
@savente93 savente93 merged commit 2d7ab9a into v1 Sep 26, 2024
8 checks passed
@savente93 savente93 deleted the update-v1-with-main branch September 26, 2024 12:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Jaapel Jaapel Jaapel approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@savente93 @Jaapel @DirkEilander @Tjalling-dejong @deltamarnix @roeldegoede @hboisgon @aweerts @Huite @shartgring