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.

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

Update glue pin #2527

Merged
merged 1 commit into from
Oct 23, 2023
Merged

Update glue pin #2527

merged 1 commit into from
Oct 23, 2023

Conversation

rosteen
Copy link
Collaborator

@rosteen rosteen commented Oct 23, 2023

Glue 1.14.0 fixes the green subset layer bug.

@rosteen rosteen added bug Something isn't working trivial Only needs one approval instead of two labels Oct 23, 2023
@rosteen rosteen added this to the 3.7.1 milestone Oct 23, 2023
pllim
pllim approved these changes Oct 23, 2023
View reviewed changes
Copy link
Contributor

@pllim pllim left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Yes!!!!

xref glue-viz/glue#2425

@pllim pllim added the no-changelog-entry-needed changelog bot directive label Oct 23, 2023
@pllim pllim enabled auto-merge October 23, 2023 18:35
@pllim pllim merged commit f44e6e4 into spacetelescope:main Oct 23, 2023
18 of 20 checks passed
@pllim pllim added the 💤 backport-v3.7.x on-merge: backport to v3.7.x label Oct 23, 2023
@pllim
Copy link
Contributor

pllim commented Oct 23, 2023

@meeseeksdev backport to v3.7.x

@lumberbot-app
Copy link

lumberbot-app bot commented Oct 23, 2023

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.7.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 f44e6e44ec6b1970fefe8544f6b3a5ec77418286
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #2527: Update glue pin'
  1. Push to a named branch:
git push YOURFORK v3.7.x:auto-backport-of-pr-2527-on-v3.7.x
  1. Create a PR against branch v3.7.x, I would have named this PR:

"Backport PR #2527 on branch v3.7.x (Update glue pin)"

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 Oct 23, 2023

@rosteen , looks like you need to do a manual backport if you really want to backport this. Though traditionally we do not bump minversion in bug fix releases.

@rosteen
Copy link
Collaborator Author

rosteen commented Oct 25, 2023

@pllim we discussed this before you joined tag-up, The consensus was to include this in 3.7.1, since it seems a little silly to make the release 3.8 just because of a pin bump to fix a nasty bug. Any strenuous objections?

@pllim
Copy link
Contributor

pllim commented Oct 25, 2023

@rosteen , then you have to do a manual backport because the bot failed.

@pllim
Copy link
Contributor

pllim commented Oct 25, 2023

Since this is technically a bug maybe a change log was needed after all? 🤷

rosteen pushed a commit to rosteen/jdaviz that referenced this pull request Oct 25, 2023
@pllim @rosteen
Merge pull request spacetelescope#2527 from rosteen/update-glue-pin
734bb7d 
Update glue pin

(cherry picked from commit f44e6e4)
@rosteen
Copy link
Collaborator Author

rosteen commented Oct 25, 2023

Yeah I'll add a changelog entry when I backport/do the bugfix release.

rosteen pushed a commit to rosteen/jdaviz that referenced this pull request Oct 25, 2023
@pllim @rosteen
Merge pull request spacetelescope#2527 from rosteen/update-glue-pin
06e7312 
Update glue pin

(cherry picked from commit f44e6e4)
rosteen added a commit that referenced this pull request Oct 25, 2023
@rosteen @pllim
Manual backport of pr 2527 on v3.7.x (#2532)
3ab16bb 
* Merge pull request #2527 from rosteen/update-glue-pin

Update glue pin

(cherry picked from commit f44e6e4)

* Add changelog entry

---------

Co-authored-by: P. L. Lim <2090236+pllim@users.noreply.github.com>
@pllim
Copy link
Contributor

pllim commented Oct 25, 2023

Sounds good. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pllim pllim pllim approved these changes

@javerbukh javerbukh Awaiting requested review from javerbukh javerbukh is a code owner

@kecnry kecnry Awaiting requested review from kecnry kecnry is a code owner

@bmorris3 bmorris3 Awaiting requested review from bmorris3 bmorris3 is a code owner

@haticekaratay haticekaratay Awaiting requested review from haticekaratay haticekaratay is a code owner

@cshanahan1 cshanahan1 Awaiting requested review from cshanahan1 cshanahan1 is a code owner

Assignees
No one assigned
Labels
bug Something isn't working no-changelog-entry-needed changelog bot directive trivial Only needs one approval instead of two 💤 backport-v3.7.x on-merge: backport to v3.7.x
Projects
None yet
Milestone
3.7.1
Development

Successfully merging this pull request may close these issues.
2 participants
@rosteen @pllim