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

unpin max glue #2196

Merged
merged 2 commits into from
May 12, 2023
Merged

unpin max glue #2196

merged 2 commits into from
May 12, 2023

Conversation

kecnry
Copy link
Member

@kecnry kecnry commented May 12, 2023

Description

This pull request removes the max-pin on glue but forbids the broken 1.10 version.

Fixes #2183

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)?

* to forbid broken 1.10, but allow versions after
@kecnry kecnry added the no-changelog-entry-needed changelog bot directive label May 12, 2023
@kecnry kecnry added this to the 3.4.1 milestone May 12, 2023
@pllim pllim added the 💤backport-v3.4.x on-merge: backport to v3.4.x label May 12, 2023
@pllim
Copy link
Contributor

pllim commented May 12, 2023

Ah, so it is upstream bug?

@codecov
Copy link

codecov bot commented May 12, 2023

Codecov Report

Patch coverage: 100.00% and project coverage change: -0.11 ⚠️

Comparison is base (c4911b3) 91.78% compared to head (c5cdeef) 91.68%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2196      +/-   ##
==========================================
- Coverage   91.78%   91.68%   -0.11%     
==========================================
  Files         147      147              
  Lines       16262    16269       +7     
==========================================
- Hits        14926    14916      -10     
- Misses       1336     1353      +17     
Impacted Files Coverage Δ
...ctral_extraction/tests/test_spectral_extraction.py 96.26% <100.00%> (-3.74%) ⬇️

... and 4 files with indirect coverage changes

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

@kecnry
Copy link
Member Author

kecnry commented May 12, 2023

Note that this also skips two tests that use remote data that are now failing to fetch the URLs so that tests could run. Do we want to split that out or remove it from here?

EDIT: created #2197 to follow-up and revive the tests.

@kecnry kecnry marked this pull request as ready for review May 12, 2023 13:23
@kecnry kecnry added the trivial Only needs one approval instead of two label May 12, 2023
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.

Green CI is good CI.

@pllim pllim merged commit 9d16ea9 into spacetelescope:main May 12, 2023
@lumberbot-app
Copy link

lumberbot-app bot commented May 12, 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.4.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 9d16ea9a407523183bbbc1f4764b733553b582b1
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #2196: unpin max glue'
  1. Push to a named branch:
git push YOURFORK v3.4.x:auto-backport-of-pr-2196-on-v3.4.x
  1. Create a PR against branch v3.4.x, I would have named this PR:

"Backport PR #2196 on branch v3.4.x (unpin max glue)"

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.

kecnry added a commit to kecnry/jdaviz that referenced this pull request May 12, 2023
@kecnry kecnry mentioned this pull request May 12, 2023
9 tasks
@kecnry kecnry deleted the unpin-glue branch May 12, 2023 14:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-changelog-entry-needed changelog bot directive trivial Only needs one approval instead of two 💤backport-v3.4.x on-merge: backport to v3.4.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unpin maxversion of glue-core
2 participants