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

Backport PR 2862 onto v3.10.x (Prevent repeatedly updating previews in specviz2d spectral extraction) #2864

Merged
merged 2 commits into from
May 9, 2024

Conversation

pllim
Copy link
Contributor

@pllim pllim commented May 8, 2024

Description

This pull request is to manually backport #2862 onto v3.10.x

The diff don't match exactly. I think @kecnry should review.

Change log entry

  • Is a change log needed? If yes, is it added to CHANGES.rst? If you want to avoid merge conflicts,
    list the proposed change log here for review and add to CHANGES.rst before merge. If no, maintainer
    should add a no-changelog-entry-needed label.

Checklist for package maintainer(s)

This checklist is meant to remind the package maintainer(s) who will review this pull request of some common things to look for. This list is not exhaustive.

  • Are two approvals required? Branch protection rule does not check for the second approval. If a second approval is not necessary, please apply the trivial label.
  • Do the proposed changes actually accomplish desired goals? Also manually run the affected example notebooks, if necessary.
  • Do the proposed changes follow the STScI Style Guides?
  • Are tests added/updated as required? If so, do they follow the STScI Style Guides?
  • Are docs added/updated as required? If so, do they follow the STScI Style Guides?
  • Did the CI pass? If not, are the failures related?
  • Is a milestone set? Set this to bugfix milestone if this is a bug fix and needs to be released ASAP; otherwise, set this to the next major release milestone. Bugfix milestone also needs an accompanying backport label.
  • After merge, any internal documentations need updating (e.g., JIRA, Innerspace)?

…spacetelescope#2862)

* prevent repeatedly updating previews

* changelog

* revert small change when no active step is set

* remove outdated comment

(cherry picked from commit 3418464)
@pllim pllim added bug Something isn't working trivial Only needs one approval instead of two skip-changelog-checks changelog bot directive labels May 8, 2024
@pllim pllim added this to the 3.10.1 milestone May 8, 2024
@github-actions github-actions bot added plugin Label for plugins common to multiple configurations specviz2d labels May 8, 2024
@pllim
Copy link
Contributor Author

pllim commented May 8, 2024

F821 undefined name 'skip_if_not_tray_instance'

Does something else need to get backported first?

Copy link

codecov bot commented May 8, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.91%. Comparing base (bf4c599) to head (6bef1dd).
Report is 1 commits behind head on v3.10.x.

Additional details and impacted files
@@             Coverage Diff             @@
##           v3.10.x    #2864      +/-   ##
===========================================
- Coverage    88.93%   88.91%   -0.03%     
===========================================
  Files          111      111              
  Lines        17165    17163       -2     
===========================================
- Hits         15266    15260       -6     
- Misses        1899     1903       +4     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@kecnry
Copy link
Member

kecnry commented May 8, 2024

F821 undefined name 'skip_if_not_tray_instance'

Probably just need the import

@pllim
Copy link
Contributor Author

pllim commented May 8, 2024

Re: #2864 (comment)

I ended up removing it because that code isn't part of the diff I am backporting.

@pllim
Copy link
Contributor Author

pllim commented May 9, 2024

@rosteen has agreed to review this when he gets the chance.

Copy link
Collaborator

@rosteen rosteen left a comment

Choose a reason for hiding this comment

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

I tested to make sure it behaves the same as on main, looks good.

@rosteen rosteen merged commit 7b5de14 into spacetelescope:v3.10.x May 9, 2024
15 of 16 checks passed
@pllim pllim deleted the backport-pr2862-onto-v3.10.x branch May 9, 2024 17:36
@pllim
Copy link
Contributor Author

pllim commented May 9, 2024

Thanks for the review!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working plugin Label for plugins common to multiple configurations skip-changelog-checks changelog bot directive specviz2d trivial Only needs one approval instead of two
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants