Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 26, 2024

This is an automatic backport of pull request #11877 done by Mergify.
Cherry-pick of 65ab965 has failed:

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

You are currently cherry-picking commit 65ab96508.
  (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-control-flow-convert-to-target-ae838418a7ad2a20.yaml
	modified:   test/python/providers/test_fake_backends.py

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

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/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

)

This commit fixes an issue in the convert_to_target() function where it
wasn't looking for control flow instructions in the proper location.
Typically the control flow instructions are put in the
supported_instructions field of the BackendConfiguration, but the
convert_to_target() function was ignoring this field. This commit
updates the function to check supported_instructions for the control
flow instructions. It doesn't more broadly look at
the supported_instructions field, because on other backends this field
is used to list the supported pulse instructions which might have name
conflicts with other instructions and cause issues building a target.

Fixes #11872

(cherry picked from commit 65ab965)

# Conflicts:
#	qiskit/providers/backend_compat.py
@mergify mergify bot requested a review from jyu00 as a code owner February 26, 2024 10:29
@mergify mergify bot added the conflicts used by mergify when there are conflicts in a port label Feb 26, 2024
@mergify mergify bot requested a review from a team as a code owner February 26, 2024 10:29
@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:

  • @Qiskit/terra-core

@github-actions github-actions bot added the Changelog: Bugfix Include in the "Fixed" section of the changelog label Feb 26, 2024
@github-actions github-actions bot added this to the 1.0.2 milestone Feb 26, 2024
@mtreinish mtreinish modified the milestones: 1.0.2, 0.46.1 Feb 26, 2024
@jakelishman
Copy link
Member

I'm just going to close this as a backport PR: I think we need a specific PR targetted at 0.46 (and to verify that it's a problem on 0.46 at all) because every part of this function and the testing infrastructure changed between 0.46 and 1.0.

@mergify mergify bot deleted the mergify/bp/stable/0.46/pr-11877 branch February 28, 2024 13:39
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