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

Merge back #1005

Merged
merged 31 commits into from
Jun 19, 2024
Merged

Merge back #1005

merged 31 commits into from
Jun 19, 2024

Conversation

Tjalling-dejong
Copy link
Contributor

Issue addressed

Fixes #

Explanation

Explain how you addressed the bug/feature request, what choices you made and why.

General Checklist

  • Updated tests or added new tests
  • Branch is up to date with main
  • Tests & pre-commit hooks pass
  • Updated documentation
  • Updated changelog.rst

Data/Catalog checklist

  • data/catalogs/predefined_catalogs.yml has not been modified.
  • None of the old data_catalog.yml files have been chagned
  • data/chagnelog.rst has been updated
  • new file uses LF line endings (done automatically if you used update_versions.py)
  • New file has been tested locally
  • Tests have been added using the new file in the test suite

Additional Notes (optional)

Add any additional notes or information that may be helpful.

DirkEilander and others added 28 commits March 6, 2024 10:55
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>
Co-authored-by: Sam Vente <savente93@gmail.com>
Co-authored-by: GitHub <noreply@github.com>
Co-authored-by: Sam Vente <savente93@gmail.com>
…860)

Co-authored-by: Dirk Eilander <dirk.eilander@gmail.com>
Co-authored-by: DirkEilander <15379728+DirkEilander@users.noreply.github.com>
Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
Co-authored-by: hboisgon <45457510+hboisgon@users.noreply.github.com>
Co-authored-by: Jaap Langemeijer <33715902+Jaapel@users.noreply.github.com>
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>
Co-authored-by: GitHub <noreply@github.com>
Co-authored-by: Tjalling-dejong <93266159+Tjalling-dejong@users.noreply.github.com>
Co-authored-by: Tjalling-dejong <tjalling.dejong@deltares.nl>
@Tjalling-dejong Tjalling-dejong marked this pull request as ready for review June 19, 2024 11:12
Copy link
Contributor

@savente93 savente93 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We shouldn't include changes from docs/api.rst otherwise looks alright

docs/api.rst Outdated
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes in this file should not be included, as we have a new structure in v1

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I missed that, thanks! I removed it.

Copy link
Contributor

@savente93 savente93 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be good now!

@Tjalling-dejong Tjalling-dejong merged commit 0184864 into v1 Jun 19, 2024
8 checks passed
@Tjalling-dejong Tjalling-dejong deleted the merge-back branch June 19, 2024 14:33
@Tjalling-dejong Tjalling-dejong restored the merge-back branch June 19, 2024 14:33
@Tjalling-dejong Tjalling-dejong deleted the merge-back branch June 19, 2024 14:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants