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

don't reset redshift when adding results from plugins #1915

Merged
merged 2 commits into from
Dec 16, 2022

Conversation

kecnry
Copy link
Member

@kecnry kecnry commented Dec 12, 2022

Description

This pull request avoids resetting the redshift to zero everytime results from a plugin are added back to the app/viewer. Note that adding new data not from a plugin will reset the app-wide redshift to the value (defaulting to zero) in that spectrum - we may want to reconsider this behavior in the future.

Fixes #1692

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.
  • After merge, any internal documentations need updating (e.g., JIRA, Innerspace)?

@kecnry kecnry added this to the 3.1.2 milestone Dec 12, 2022
@kecnry kecnry force-pushed the plugin-results-retain-redshift branch from 9da34ae to 715dace Compare December 12, 2022 19:25
@kecnry

This comment was marked as resolved.

@kecnry kecnry marked this pull request as ready for review December 12, 2022 19:34
@kecnry kecnry force-pushed the plugin-results-retain-redshift branch from 5cde4be to 021ee00 Compare December 12, 2022 20:05
@codecov
Copy link

codecov bot commented Dec 12, 2022

Codecov Report

❗ No coverage uploaded for pull request base (main@a8336af). Click here to learn what that means.
Patch coverage: 50.00% of modified lines in pull request are covered.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1915   +/-   ##
=======================================
  Coverage        ?   88.52%           
=======================================
  Files           ?       95           
  Lines           ?    10617           
  Branches        ?        0           
=======================================
  Hits            ?     9399           
  Misses          ?     1218           
  Partials        ?        0           
Impacted Files Coverage Δ
...z/configs/default/plugins/line_lists/line_lists.py 74.67% <50.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

Copy link
Contributor

@javerbukh javerbukh left a comment

Choose a reason for hiding this comment

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

Works for me!

@pllim pllim added bug Something isn't working specviz 💤backport-v3.1.x on-merge: backport to v3.1.x labels Dec 16, 2022
@kecnry kecnry force-pushed the plugin-results-retain-redshift branch from 3c3762b to c2b1881 Compare December 16, 2022 15:09
@kecnry kecnry requested a review from pllim December 16, 2022 15:29
Copy link
Contributor

@pllim pllim left a comment

Choose a reason for hiding this comment

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

LGTM now. Thanks for adding the test!

@pllim pllim merged commit b7c8853 into spacetelescope:main Dec 16, 2022
@lumberbot-app
Copy link

lumberbot-app bot commented Dec 16, 2022

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout v3.1.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 b7c88539e5e938407b601d4c4d49e551e71c27f6
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am "Backport PR #1915: don't reset redshift when adding results from plugins"
  1. Push to a named branch:
git push YOURFORK v3.1.x:auto-backport-of-pr-1915-on-v3.1.x
  1. Create a PR against branch v3.1.x, I would have named this PR:

"Backport PR #1915 on branch v3.1.x (don't reset redshift when adding results from plugins)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

@pllim
Copy link
Contributor

pllim commented Dec 16, 2022

Hmm @kecnry do you want to manually backport this or should we change milestone and move the change log?

@kecnry
Copy link
Member Author

kecnry commented Dec 16, 2022

I'll backport

kecnry added a commit to kecnry/jdaviz that referenced this pull request Dec 16, 2022
…ults from plugins

don't reset redshift when adding results from plugins
@kecnry kecnry deleted the plugin-results-retain-redshift branch December 16, 2022 16:02
kecnry added a commit that referenced this pull request Dec 16, 2022
Backport PR #1915: don't reset redshift when adding results from plugins
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working Ready for final review specviz 💤backport-v3.1.x on-merge: backport to v3.1.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

adding data resets redshifts to zero
3 participants