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

Prepare 0.24.1 #10187

Merged
merged 11 commits into from
Jun 2, 2023
Merged

Prepare 0.24.1 #10187

merged 11 commits into from
Jun 2, 2023

Conversation

@qiskit-bot
Copy link
Collaborator

One or more of the the following people are requested to review this:

@Eric-Arellano
Copy link
Collaborator

Any chance we could wait until tomorrow morning for this? I'm making a docs infrastructure change that will need to be backported to 0.24.1 for it to work, otherwise we need to wait until 0.24.2 or 0.25. (Moving most of the metapackage docs to Terra as part of the metapackage migration).

@jakelishman
Copy link
Member

John: this PR is made to the wrong branch. You'll need to PR the patch-notes fix with a base of stable/0.24 on this remote. Typically you'd probably want to branch the current state of your local stable/0.24 into something like prepare-0.24.1 and then hard-reset the HEAD of your stable/0.24 back to match the Qiskit one. Then you'll need to make a new PR, and make sure to set the PR base to stable/0.24.

Eric: this patch release needs to go out today, and we've still got a couple of other PRs that need pushing through CI. I don't think we'll have the CI resources to add an unplanned PR. If it's infrastructure, we definitely should wait til there's less time constraint - I wouldn't want a small bug to prevent us deploying today. We can do a 0.24.2 soon if necessary.

@mtreinish mtreinish changed the base branch from main to stable/0.24 June 1, 2023 13:25
@kdk kdk added this to the 0.24.1 milestone Jun 1, 2023
@jakelishman
Copy link
Member

I've just tagged #10183 for merge, so that should be winging its way onto this branch shortly.

@jlapeyre
Copy link
Contributor Author

jlapeyre commented Jun 1, 2023

this PR is made to the wrong branch

I see @mtreinish changed the base branch from main to stable/0.24.
I must have inadvertently made the PR to main instead of stable/0.24. I'm not sure I understand the whole comment, if there is something more wrong, please let me know. It seems that @mtreinish changing the base branch obviated the need for a new PR.

Also, I didn't rename the PR branch to note the patch number. Not necessary, but ought to be done anyway... Maybe I was tired

@mtreinish
Copy link
Member

I see @mtreinish changed the base branch from main to stable/0.24.
I must have inadvertently made the PR to main instead of stable/0.24. I'm not sure I understand the whole comment, if there is something more wrong, please let me know. It seems that @mtreinish changing the base branch obviated the need for a new PR.

There shouldn't be anything needed. Jake's comment was made under the assumption you had built the PR branch against main by mistake instead of just pushing the PR targeting main. Just fixing the target branch of the PR fixed the issue.

Copy link
Member

@mtreinish mtreinish left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for doing this

@mtreinish mtreinish enabled auto-merge June 1, 2023 22:03
@mtreinish mtreinish added this pull request to the merge queue Jun 1, 2023
Merged via the queue into Qiskit:stable/0.24 with commit e0c061d Jun 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants