Resolved conflicts with upstream - #18
Open
Yashvi-Sharma wants to merge 103 commits into
Open
Conversation
Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v6...v7) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
* Bump astar-utils from 0.5.3 to 0.6.0 Bumps [astar-utils](https://github.com/AstarVienna/astar-utils) from 0.5.3 to 0.6.0. - [Release notes](https://github.com/AstarVienna/astar-utils/releases) - [Commits](AstarVienna/astar-utils@v0.5.3...v0.6.0) --- updated-dependencies: - dependency-name: astar-utils dependency-version: 0.6.0 dependency-type: direct:production update-type: version-update:semver-minor ... 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>
Security alerts: - mistune 3.2.1 -> 3.3.3 - soupsieve 2.7 -> 2.8.4 Others: - astropy-iers-data 0.2026.6.15.15.33.16 -> 0.2026.7.6.1.1.20 - beautifulsoup4 4.13.3 -> 4.15.0 - lxml 6.1.0 -> 6.1.1 - matplotlib 3.10.8 -> 3.10.9 - packaging 25.0 -> 26.2 - pillow 12.2.0 -> 12.3.0 - tqdm 4.67.3 -> 4.68.4 - typing-extensions 4.14.0-> 4.16.0
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 6 to 7. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@v6...v7) --- updated-dependencies: - dependency-name: actions/setup-python dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
All of those had warnings raised for two minor versions, explicitly stating the version of full removal (v0.12 in this case).
- raise `ValueError` when `xlim_mm` is None (`footprint` could be improved) - remove `kwargs` from `.rectify()`, make all args explicit - raise `KeyError` when `xi_min` or `xi_max` are neither in args nor header - some typing and formatting along the way
- Extract actual array operation (useful for JAX in the future) - Make actual apply_to easier to read (will be called by Effect mixins) - Slightly refactor toaster's shortcut from AstarVienna#973
Leftovers from AstarVienna#1002
Basically: ArrayLike for input (which _might_ be an array, but could also be e.g. a list) and NDArray for output (which we know will be an array).
Bumps [tqdm](https://github.com/tqdm/tqdm) from 4.68.4 to 4.70.0. - [Release notes](https://github.com/tqdm/tqdm/releases) - [Commits](tqdm/tqdm@v4.68.4...v4.70.0) --- updated-dependencies: - dependency-name: tqdm dependency-version: 4.70.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [tornado](https://github.com/tornadoweb/tornado) from 6.5.7 to 6.5.8. - [Changelog](https://github.com/tornadoweb/tornado/blob/master/docs/releases.rst) - [Commits](tornadoweb/tornado@v6.5.7...v6.5.8) --- updated-dependencies: - dependency-name: tornado dependency-version: 6.5.8 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps the dev-dependencies group with 4 updates in the / directory: [jupytext](https://github.com/jupytext/jupytext), [pytest](https://github.com/pytest-dev/pytest), [sphinx-book-theme](https://github.com/executablebooks/sphinx-book-theme) and [sphinxcontrib-mermaid](https://github.com/mgaitan/sphinxcontrib-mermaid). Updates `jupytext` from 1.19.3 to 1.19.5 - [Release notes](https://github.com/jupytext/jupytext/releases) - [Changelog](https://github.com/jupytext/jupytext/blob/main/CHANGELOG.md) - [Commits](jupytext/jupytext@v1.19.3...v1.19.5) Updates `pytest` from 9.0.3 to 9.1.1 - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](pytest-dev/pytest@9.0.3...9.1.1) Updates `sphinx-book-theme` from 1.1.4 to 1.4.0 - [Release notes](https://github.com/executablebooks/sphinx-book-theme/releases) - [Changelog](https://github.com/executablebooks/sphinx-book-theme/blob/main/CHANGELOG.md) - [Commits](executablebooks/sphinx-book-theme@v1.1.4...v1.4.0) Updates `sphinxcontrib-mermaid` from 2.0.2 to 2.1.0 - [Changelog](https://github.com/mgaitan/sphinxcontrib-mermaid/blob/master/CHANGELOG.md) - [Commits](mgaitan/sphinxcontrib-mermaid@2.0.2...2.1.0) --- updated-dependencies: - dependency-name: jupytext dependency-version: 1.19.5 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: dev-dependencies - dependency-name: pytest dependency-version: 9.1.1 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-dependencies - dependency-name: sphinx-book-theme 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.1.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: dev-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
…velop # Conflicts: # .github/workflows/bump_on_dependency.yml # scopesim/effects/illumination.py # scopesim/effects/spectral_trace_list.py # scopesim/effects/spectral_trace_list_utils.py # scopesim/optics/optical_train.py # scopesim/tests/tests_effects/test_SpectralTraceListUtils.py
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.
Main conflicts were in optical_train and spectral_trace_list_utils (to make post-disperser background work).