[Stable] 0.4.2 backports #685
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
armv7l is CMAKE_SYSTEM_PROCESSOR for at least the Raspberry Pi 3A and 4 that I have at hand to verify with (cherry picked from commit 16fc8ca)
(cherry picked from commit a5acd45)
* Add support for parameterized qobj * Add Parameterized Qobj tests Co-authored-by: Donny Greenberg <[email protected]> (cherry picked from commit 870d163)
* Add loading of "diagonal" qobj instruction as diagonal "unitary" * Add tests for diagonal gate (cherry picked from commit 81ef953)
mtreinish
added
the
Changelog: Bugfix
mtreinish
force-pushed
the
0.4.2-backports
branch
from
787a38b to
d904ff9
Compare
|
This should be merged as either rebase and merge or with a merge commit so we preserve the commits for the git history |
(cherry picked from commit fc5e71a)
* Add backwards compatibility for terra < 0.13 * Exclude broken cmake releases Co-authored-by: Matthew Treinish <[email protected]> (cherry picked from commit 17c3b10)
* Bump macos version in travis Currently we run macOS CI on macOS 10.12 which was released ~4 yrs ago. Terra added a new binary requirement retworkx which builds it's wheels against macOS 10.13. This means that pip can't find the wheels for macOS in CI because 10.13 is too new. This commit bumps the macOS/xcode version we use in the travis jobs to one slightly newer using macOS 10.13 (which is currently the default travis env). This should unblock CI because we don't need to install retworkx from source. (cherry picked from commit 542c071)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This PR is the backport of all the fixes on master that need to be included in 0.4.2. Most of the commits on master at this point are fixes that need to be included in the bug fix release. So instead of opening individual PRs for each of the commits that needs to be backported (per https://qiskit.org/documentation/contributing_to_qiskit.html#stable-branch-policy ) one PR is done here instead and a merge commit will be used to preserve the history.
Details and comments
Backported from #651, #660, #485, and #683