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

Fix the bug primitives cannot handle circuits with ndarray parameters (backport #9103) #9149

Merged
merged 3 commits into from
Dec 2, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 17, 2022

This is an automatic backport of pull request #9103 done by Mergify.
Cherry-pick of 599b663 has failed:

On branch mergify/bp/stable/0.22/pr-9103
Your branch is up to date with 'origin/stable/0.22'.

You are currently cherry-picking commit 599b663e6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   releasenotes/notes/fix-primitives-numpy-parameters-1589d997864dfb37.yaml
	modified:   test/python/primitives/test_sampler.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   qiskit/primitives/utils.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 599b663)

# Conflicts:
#	qiskit/primitives/utils.py
@mergify mergify bot requested review from a team, ikkoham and t-imamichi as code owners November 17, 2022 03:25
@mergify mergify bot added the conflicts used by mergify when there are conflicts in a port label Nov 17, 2022
@qiskit-bot
Copy link
Collaborator

Thank you for opening a new pull request.

Before your PR can be merged it will first need to pass continuous integration tests and be reviewed. Sometimes the review process can be slow, so please be patient.

While you're waiting, please feel free to review other open PRs. While only a subset of people are authorized to approve pull requests for merging, everyone is encouraged to review open pull requests. Doing reviews helps reduce the burden on the core team and helps make the project's code better for everyone.

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

@jakelishman
Copy link
Member

@ikkoham: the backport has failed because of merge conflicts - you'll need to fix them before we can merge this into the stable branch. On a quick glance, it looks like this PR depends on another PR that wasn't backported. You can either backport that other PR (if it's safe to do so) and re-apply cherry-picked commit, or you'll need to manually fix the merge conflicts in this PR yourself.

@ikkoham
Copy link
Contributor

ikkoham commented Nov 29, 2022

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Nov 29, 2022

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
error: could not apply 79456f78... fix #9102 (#9103)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 79456f78... fix #9102 (#9103)
Auto-merging qiskit/primitives/utils.py
CONFLICT (content): Merge conflict in qiskit/primitives/utils.py

err-code: AA5E8

@ikkoham
Copy link
Contributor

ikkoham commented Nov 29, 2022

@jakelishman Thank you. I choose backport of another PR.

@ikkoham
Copy link
Contributor

ikkoham commented Nov 29, 2022

@Mergifyio refresh

@mergify
Copy link
Contributor Author

mergify bot commented Nov 29, 2022

refresh

✅ Pull request refreshed

@ikkoham ikkoham added Changelog: Bugfix Include in the "Fixed" section of the changelog automerge labels Nov 30, 2022
@mergify mergify bot merged commit 40eacff into stable/0.22 Dec 2, 2022
@jakelishman jakelishman deleted the mergify/bp/stable/0.22/pr-9103 branch January 16, 2023 15:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changelog: Bugfix Include in the "Fixed" section of the changelog conflicts used by mergify when there are conflicts in a port
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants