Merging upstream main#12
Merged
Yashvi-Sharma merged 168 commits intoJun 25, 2026
Merged
Conversation
Bumps the dev-dependencies group with 1 update: [numpydoc](https://github.com/numpy/numpydoc). Updates `numpydoc` from 1.9.0 to 1.10.0 - [Release notes](https://github.com/numpy/numpydoc/releases) - [Changelog](https://github.com/numpy/numpydoc/blob/main/RELEASE.rst) - [Commits](numpy/numpydoc@v1.9.0...v1.10.0) --- updated-dependencies: - dependency-name: numpydoc dependency-version: 1.10.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [ipykernel](https://github.com/ipython/ipykernel) from 6.31.0 to 7.1.0. - [Release notes](https://github.com/ipython/ipykernel/releases) - [Changelog](https://github.com/ipython/ipykernel/blob/main/CHANGELOG.md) - [Commits](ipython/ipykernel@v6.31.0...v7.1.0) --- updated-dependencies: - dependency-name: ipykernel dependency-version: 7.1.0 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [nbconvert](https://github.com/jupyter/nbconvert) from 7.16.4 to 7.17.0. - [Release notes](https://github.com/jupyter/nbconvert/releases) - [Changelog](https://github.com/jupyter/nbconvert/blob/main/CHANGELOG.md) - [Commits](jupyter/nbconvert@v7.16.4...v7.17.0) --- updated-dependencies: - dependency-name: nbconvert dependency-version: 7.17.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [pillow](https://github.com/python-pillow/Pillow) from 12.1.0 to 12.1.1. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](python-pillow/Pillow@12.1.0...12.1.1) --- updated-dependencies: - dependency-name: pillow dependency-version: 12.1.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
Should solve the recent CI fails seen with 3.14.
…ote blocks Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* Bump the dev-dependencies group with 3 updates Bumps the dev-dependencies group with 3 updates: [jupytext](https://github.com/mwouts/jupytext), [myst-nb](https://github.com/executablebooks/myst-nb) and [sphinxcontrib-mermaid](https://github.com/mgaitan/sphinxcontrib-mermaid). Updates `jupytext` from 1.19.1 to 1.19.3 - [Release notes](https://github.com/mwouts/jupytext/releases) - [Changelog](https://github.com/mwouts/jupytext/blob/main/CHANGELOG.md) - [Commits](jupytext/jupytext@v1.19.1...v1.19.3) Updates `myst-nb` from 1.3.0 to 1.4.0 - [Release notes](https://github.com/executablebooks/myst-nb/releases) - [Changelog](https://github.com/executablebooks/MyST-NB/blob/main/CHANGELOG.md) - [Commits](executablebooks/MyST-NB@v1.3.0...v1.4.0) Updates `sphinxcontrib-mermaid` from 2.0.1 to 2.0.2 - [Changelog](https://github.com/mgaitan/sphinxcontrib-mermaid/blob/master/CHANGELOG.md) - [Commits](mgaitan/sphinxcontrib-mermaid@2.0.1...2.0.2) --- updated-dependencies: - dependency-name: jupytext dependency-version: 1.19.3 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-dependencies - dependency-name: myst-nb dependency-version: 1.4.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-dependencies - dependency-name: sphinxcontrib-mermaid dependency-version: 2.0.2 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-dependencies ... Signed-off-by: dependabot[bot] <support@github.com> * Fix dependabot's mess --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: teutoburg <ghost@instruct.at>
* Switch from httpx to httpxyz * Fix lock file
- ipykernel: 7.2.0 -> 7.3.0 - bleach: 6.1.0 -> 6.4.0 - idna: 3.15 -> 3.18 - jupyter-client: 8.8.0 -> 8.9.1 - jupyter-server: 2.18.0 -> 2.20.0 - tornado: 6.5.5 -> 6.5.7 added as indirect dependency: nest-asyncio2 (from ipykernel)
Yashvi-Sharma
commented
Jun 25, 2026
Yashvi-Sharma
left a comment
Yashvi-Sharma
left a comment
Collaborator
Author
There was a problem hiding this comment.
Upstream additions can merge directly, no conflicts.
Yashvi-Sharma
merged commit 1ebfb8c
into
CaltechOpticalObservatories:main
1 of 22 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Looks like mostly version updates by bots, bug fixes, minor refactoring of some effects.
Offsets added to SpectralTrace for shifted slits.
System transmission plotting.
New effects: