Resolved conflicts with upstream - #18

Open

Yashvi-Sharma wants to merge 103 commits into

mainfrom

Commits on May 27, 2026

Reduce `OpticalTrain.write_header()` to the bare minimum
teutoburg
committed
8f22ef3

Commits on Jun 22, 2026

Bump actions/checkout from 6 to 7
dependabot[bot]
authored
1c9fc50

Commits on Jul 7, 2026

PSF interpolation method and parameters
oczoske
committed
f678161
Interpolation parameters for PSF cube
oczoske
committed
2686075
Fix test (unmark one xpass); add default parameters
oczoske
committed
c252e25
Last resort default for interp_order
oczoske
committed
01be691
Bump astar-utils from 0.5.3 to 0.6.0 (#951)

dependabot[bot]
and
teutoburg
authored
94379f7
Bumping version from 0.11.5a3 to 0.11.5a4
astarvienna-bot[bot]
committed
50e0360
Bump actions/checkout from 6 to 7 (#947)
teutoburg
authored
2327dfd
Bumping version from 0.11.5a4 to 0.11.5a5
astarvienna-bot[bot]
committed
7e06c27

Commits on Jul 8, 2026

Just a typo in doc string
oczoske
authored
2cdee39
Reduce `OpticalTrain.write_header()` to the bare minimum (#935)
teutoburg
authored
64eb522
More discipline on coordinate order
oczoske
committed
b190dfd

Commits on Jul 11, 2026

Bump various dependencies
teutoburg
committed
0cc472b

Commits on Jul 13, 2026

PSF interpolation order (#950)
oczoske
authored
e790c94
Bump various dependencies (#954)
teutoburg
authored
51d7681
Bumping version from 0.11.5a5 to 0.11.5a6
astarvienna-bot[bot]
committed
7a851ab

Commits on Jul 20, 2026

Commits on Jul 22, 2026

Remove reflectance factor from integrating sphere background
oczoske
committed
c46844b

Commits on Jul 23, 2026

Remove reflectance factor from integrating sphere background (#962)
oczoske
authored
fbabb54

Commits on Jul 24, 2026

Fully remove deprecated functionality
teutoburg
committed
d180ec5
Don't test deprecated functionality
teutoburg
committed
4bbb0f3
Fix scalar Quantity pattern matching
teutoburg
committed
b3a0aca

Commits on Jul 25, 2026

Fix scalar Quantity pattern matching (#964)
teutoburg
authored
070069a
Merge branch 'main' into fh/rm-deprecations-v0.12
teutoburg
authored
f48b6d8

Commits on Jul 27, 2026

Use optimal inverse transform for rectification (#961)
oczoske
authored
66081e6

Commits on Aug 3, 2026

Bump actions/setup-python from 6 to 7 (#960)
teutoburg
authored
5cc1019
Bumping version from 0.12.0b0.dev0 to 0.12.0b1
astarvienna-bot[bot]
committed
e26e340

Commits on Aug 4, 2026

Record row number in aplist
oczoske
committed
8c3dc6b
MosaicConvertToTable effect
oczoske
committed
1015cab

Commits on Aug 6, 2026

More tests for mosaic_trace_list
oczoske
committed
7e4a468
more tests
oczoske
committed
51f17d4
more tests
oczoske
committed
08b2358
Combine to a single effect MosaicOutputFormat
oczoske
committed
18e03f7

Commits on Aug 7, 2026

Implement review suggestions
oczoske
committed
ec803e3
remove obsolete code and abstract method
oczoske
committed
e039e25

Commits on Aug 10, 2026

MOSAIC mIFU: tabular output (#968)
oczoske
authored
aaf7af8
Drop support for Python 3.10 and 3.11
teutoburg
committed
7d5d4f7
Bump JupyterLab from 4.5.7 to 4.6.3
teutoburg
committed
7b358d0
Only test supported versions
teutoburg
committed
cbdfea0
Bump Ubuntu and Python in RTD config
teutoburg
committed
d74a446

Commits on Aug 11, 2026

Commits on Aug 12, 2026

Add prepare-release workflow from elsewhere
teutoburg
authored
cfd0a7e
Add prepare-release workflow from elsewhere (#971)
teutoburg
authored
608adfa
apply review comments
oczoske
committed
4e60fec
one more
oczoske
committed
9684627

Commits on Aug 13, 2026

AtmoLibraryTERCurve works with parameters other than pwv
oczoske
committed
2d73d5e

Commits on Aug 14, 2026

Skip PSF convolution for exactly-uniform fields

astronomyk
and
claude
committed
cc19b8f
Skip PSF convolution for exactly-uniform fields (#973)
astronomyk
authored
ec8ed7f

Commits on Aug 17, 2026

Registry entry for MICADO calibration transmission
oczoske
committed
d3bbb28

Commits on Aug 18, 2026

relH as float
oczoske
committed
b5172c8

Commits on Aug 20, 2026

Bump matplotlib and skycalc-ipy
teutoburg
committed
93f32cb

Commits on Aug 21, 2026

Delete docs/to-do-list.txt
teutoburg
authored
65181d4
Remove obsolete logic to deal with unversioned versions
teutoburg
committed
5cfb8c7

Commits on Aug 22, 2026

Remove obsolete logic to deal with unversioned versions (#979)
teutoburg
authored
fb34065

Commits on Aug 23, 2026

Fix flux loss, aliasing, and placement errors in image-plane resampling and overlay (#958)
teutoburg
authored
08bcd3b

Commits on Aug 24, 2026

Commits on Aug 25, 2026

More useful error when download fails (#990)
teutoburg
authored
45034ce

Commits on Aug 29, 2026

Improve handling of spectral trace mapping and rectification
teutoburg
committed
32469ad
Skip empty FOVs
teutoburg
committed
088a87b

Commits on Aug 30, 2026

Skip empty FOVs (#1001)
teutoburg
authored
593b9cc
Improve handling of spectral trace mapping and rectification (#999)
teutoburg
authored
4563f30
Refactor `PSF.apply_to()`
teutoburg
committed
45a77f6
Refactor `PSF.apply_to()` (#1002)
teutoburg
authored
40f31d5
Cleanup PSF
teutoburg
committed
3289860
Cleanup PSF (#1003)
teutoburg
authored
568c14e
Use correct NumPy type hints
teutoburg
committed
68e748b

Commits on Aug 31, 2026

Use correct NumPy type hints (#1005)
teutoburg
authored
ce14dad

Commits on Sep 1, 2026

Amend tests for N band laser
oczoske
committed
a16aa59
Remove stray print statements
oczoske
committed
1e4c727
Bump tqdm from 4.68.4 to 4.70.0
dependabot[bot]
authored
a9091fb
Bump tornado from 6.5.7 to 6.5.8
dependabot[bot]
authored
b7e4013

Commits on Sep 2, 2026

Commits on Sep 3, 2026

Commits on Sep 4, 2026

Merge branch 'main' of github.com:AstarVienna/ScopeSim into yashvi/develop
Yashvi-Sharma
committed
b807efd