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 a bug of missing pulse library entry in PulseQobj parsing (backport #11397) #11573

Merged
merged 2 commits into from
Jan 17, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 16, 2024

This is an automatic backport of pull request #11397 done by Mergify.
Cherry-pick of a9e9e95 has failed:

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

You are currently cherry-picking commit a9e9e95f2.
  (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:
	modified:   qiskit/qobj/converters/pulse_instruction.py
	new file:   releasenotes/notes/fix-missing-pulse-lib-c370f5b9393d0df6.yaml
	modified:   test/python/pulse/test_calibration_entries.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   qiskit/pulse/calibration_entries.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

* Fix missing pulse lib bug

* Update releasenotes/notes/fix-missing-pulse-lib-c370f5b9393d0df6.yaml

Co-authored-by: Will Shanks <[email protected]>

* Add user warning

---------

Co-authored-by: Will Shanks <[email protected]>
(cherry picked from commit a9e9e95)

# Conflicts:
#	qiskit/pulse/calibration_entries.py
@mergify mergify bot requested review from eggerdj, wshanks and a team as code owners January 16, 2024 17:50
@mergify mergify bot added the conflicts used by mergify when there are conflicts in a port label Jan 16, 2024
@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
  • @nkanazawa1989

@github-actions github-actions bot added Changelog: Bugfix Include in the "Fixed" section of the changelog mod: pulse Related to the Pulse module labels Jan 16, 2024
@github-actions github-actions bot added this to the 0.45.2 milestone Jan 16, 2024
@ElePT ElePT enabled auto-merge January 17, 2024 09:49
@coveralls
Copy link

Pull Request Test Coverage Report for Build 7553685984

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.03%) to 86.953%

Totals Coverage Status
Change from base Build 7533371088: 0.03%
Covered Lines: 74256
Relevant Lines: 85398

💛 - Coveralls

@1ucian0 1ucian0 removed the conflicts used by mergify when there are conflicts in a port label Jan 17, 2024
@ElePT ElePT added this pull request to the merge queue Jan 17, 2024
Merged via the queue into stable/0.45 with commit 92d589f Jan 17, 2024
14 checks passed
@mergify mergify bot deleted the mergify/bp/stable/0.45/pr-11397 branch January 17, 2024 12:32
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 mod: pulse Related to the Pulse module
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants