Skip to content

Merge dev_master in preparation for release #253

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
Merged
teutoburg merged 117 commits into from
Jun 30, 2025
Merged

Merge dev_master in preparation for release #253

teutoburg merged 117 commits into from
Jun 30, 2025

Conversation

@teutoburg
Copy link
Contributor

@teutoburg teutoburg commented Jun 30, 2025 •
edited
Loading

Changed

Armazones

  • 📅 removed obsolete version.yaml

ELT

  • 🗂️ header keywords
  • 📅 removed obsolete version.yaml

HAWKI

  • ✏️ SummedExposure ➡️ ExposureIntegration
  • 🔢 floats in YAMLs fixed
  • 📅 removed obsolete version.yaml

LFOA

  • ✏️ SummedExposure ➡️ ExposureIntegration
  • 🔢 floats in YAMLs fixed
  • 📅 removed obsolete version.yaml

METIS

  • ✨Simplified IFU cube readout mode
  • ✨ExposureOutput (default average)
  • ✏️ Quantization ➡️ ADConversion
  • ✏️ SummedExposure ➡️ ExposureIntegration
  • ⚙️ gain values added
  • 📄 filter curves updated
  • 🗂️ header keywords
  • 🔢 floats in YAMLs fixed
  • 📅 removed obsolete version.yaml
  • 🏷️ added ScopeSim version constraints
  • 📓 docs
  • ✅ tests

MICADO

  • ✨ExposureOutput (default sum)
  • ✨ADConversion
  • ✏️ SummedExposure ➡️ ExposureIntegration
  • 📄 filter curves updated
  • 🔢 floats in YAMLs fixed
  • 📅 removed obsolete version.yaml
  • 🏷️ added ScopeSim version constraints
  • ✅ tests

MORFEO

  • 📅 removed obsolete version.yaml

OSIRIS

  • ✏️ SummedExposure ➡️ ExposureIntegration
  • 🔢 floats in YAMLs fixed

Paranal

  • 📅 removed obsolete version.yaml

ViennaLT

  • ✏️ SummedExposure ➡️ ExposureIntegration
  • 🔢 floats in YAMLs fixed

WFC3

  • ✏️ SummedExposure ➡️ ExposureIntegration
  • 🔢 floats in YAMLs fixed

Meta-level changes

  • 📝 added CI strategy summary, updated package structure doc
  • 🛠️ fixed UTC timestamp in publish script
  • 🤖 reworked CI workflows

oczoske and others added 30 commits August 22, 2024 15:34
@oczoske
Rename ADConversion, introduce gain
829130f
@oczoske
rename effect, add gain
5e7f010
@oczoske
Set gains
105c978
@oczoske
New METIS filter curves, with conversion script
d2acc0e
@teutoburg
Replace deprecated dt.utcnow() in publish script
9e346e0
@teutoburg
Use the one that py3.10 also understands...
2d5d14a
@teutoburg
Merge pull request #223 from AstarVienna/fh/utc
8cac0ed 
Replace deprecated `datetime.utcnow()` in publish script
@oczoske
Use ExposureOutput for img_lm
24cec0a
@oczoske
Use average readout in all modes
baf4eac
@astronomyk @teutoburg
Extracted TEL keywords from METIS common keywords so WCU mode doesn't…
d604420 
… crash
@teutoburg
Remove mention of FITS keyword effect in WCU notebook
c72a7b8
@oczoske
multiple test gain values
1fcd147
@astronomyk
Move TEL header keywords in METIS to ELT (#227)
7bb259e 
Thanks for the work in the background @teutoburg
@oczoske
WCU FITS header keywords
9d2bfca
@oczoske
Move to headers/ directory to escape test
a756707
@oczoske
img_lm keywords
ae2a52d
@oczoske
#-strings need !-prefix to be resolved
d6eaa27
@oczoske
Change ID to DESC
b4ca54b
@oczoske
Change ID to DESC
81507ef
@oczoske
WCU FITS header keywords (#228)
e2d3aa2
@oczoske
Merge branch 'dev_master' into oc/subsystem_fits_keywords
13e257d
@oczoske
CFO keywords; INS_MODE
5ff3551
@oczoske
actual CFO keywords
1715f8b
@oczoske
lms keywords (partial); move ins_mode to properties
ca96bdd
@oczoske
add IMG_N; add DPR.TECH
ebf9677
@oczoske
add LSS keywords
fed41ee
@oczoske
Detector keywords
7e54bd0
@oczoske
add chopnod keywords; add detector mode
07281bf
@oczoske
DPR.TECH -> IFU
5893a7c
@oczoske
set grism names; insert LASER keywords
2f228e2
oczoske and others added 19 commits June 27, 2025 13:39
@oczoske @teutoburg
Detector mode to header
709d612
@teutoburg
Add needs_scopesim keyword to MICADO (#249)
205435d
@teutoburg
Bump ScopeSim from 0.9 to 0.10.0b4 because ExposureIntegration
1d34f2f
@teutoburg
Remove redundant constraint
a4d3235
@teutoburg
Fix descriptions of WCU modes, add status
2e759d8
@teutoburg
Update status of LMS mode
7b087fe
@teutoburg
Update dates in metadata
3da25d8
@teutoburg
Rename SummedExposure to ExposureIntegration also in simple IFU mode
70e05eb
@oczoske
Detector mode and gain to img_lm/img_n headers
37358b1
@oczoske
Fixed notebooks
e467f6f
@oczoske
and the big ones
b5fc94c
@teutoburg
Update constraints and status in METIS (#250)
91847c3
@oczoske
Add gain values to IFU headers - very inelegant
546ce1f
@oczoske
fix irdb path
5bfc650
@oczoske
Add BUNIT to detector FITS headers
82fa17b
@oczoske
Fix METIS notebooks (#251)
1e2ca49
@teutoburg
Remove redundant !!float in yamls, fix others
479c3ae 
Since forever, anything that has a decimal point and an explicit plus or minus in the exponent is converted to a float anyway, no need for this ugly tag.
Also, "0." is converted to `0.0` anyway.

While in the process, I standardized on a lowercase "e". Both works fine and we had both before, but why not.
@teutoburg
Remove redundant !!float in yamls, fix others (#252)
3bd7ce8
@teutoburg
Update tests_main_pr.yml
a72f8ca
@teutoburg teutoburg marked this pull request as ready for review June 30, 2025 17:07
@teutoburg
Copy link
Contributor Author

teutoburg commented Jun 30, 2025

Tests are now running against PyPI versions of ScopeSim and ScopeSim_Templates (instead of main from the respective repos), as they should because we want to test here if the versions we're about to release are compatible with those 💪

@teutoburg
Copy link
Contributor Author

teutoburg commented Jun 30, 2025

Although actually both is happening, because the HEAD branch here (dev_master) also matches a "on push" rule (again as it should be for the default branch), and those use the @main versions (re-)installed from source. Doesn't hurt either...

@teutoburg
Copy link
Contributor Author

teutoburg commented Jun 30, 2025

Not sure though why this is saying "This branch is out-of-date with the base branch". That normally pops up when there were commits on the base after the head branch was branched off. The last commit on master was the merge from #222, so the only explanation I have is that maybe the merging of #189 afterwards caused some confusion to git. But I'd like to avoid criss-cross merging here, so I'm leaving the button alone (everyone else please also).

@teutoburg
Copy link
Contributor Author

teutoburg commented Jun 30, 2025 •
edited
Loading

I also now added the badge report files of the most recent run here (which triggers another run of those tests, that still needs tweaking...), as those haven't been updated in forever, and this merge into master seems like the right time to commit those. Which is why I included them in the CI here, they just don't make it into a commit by themselves yet...

@teutoburg teutoburg requested a review from a team June 30, 2025 17:39
hugobuddel
hugobuddel approved these changes Jun 30, 2025
View reviewed changes
Copy link
Collaborator

@hugobuddel hugobuddel left a comment

Choose a reason for hiding this comment

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

Let's go!

@teutoburg teutoburg merged commit 50b6959 into master Jun 30, 2025
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hugobuddel hugobuddel hugobuddel 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.

5 participants

@teutoburg @hugobuddel @oczoske @astronomyk