Fix instruction inheritance issues #1908
Merged
+4
−3
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
* fix BasicAer sampling bug (#1624) * fix BasicAer sampling bug * changelog * remove legacysimulator from test_compile Conflicts: CHANGELOG.rst test/python/tools/test_compiler.py The changelog conflicts were inevitable as the stable branch doesn't have the same history as master. As for the test conflict it was a difference in the simulator (python vs c++) used, this backport switches to use the python like on master. (cherry picked from commit 5f7b2e7) * Try pinning isort version * Use constraints from last working version of lint * Add requirements constraints too
* Bump version and prepare for 0.7.1 release To prepare for the 0.7.1 bugfix release we need to increase the version number and update the changelog. This commit takes care of that so we can tag the release and build it.
…uantumRegisters and ClassicalRegisters
Woody1193
requested review from
1ucian0,
ajavadia,
atilag,
delapuente,
diego-plan9,
ewinston,
jaygambetta,
kdk,
mtreinish,
nonhermitian and
taalexander
as code owners
mtreinish
previously requested changes
Mar 8, 2019
ajavadia
approved these changes
Mar 10, 2019
lia-approves
pushed a commit
to edasgupta/qiskit-terra
that referenced
this pull request
Jul 30, 2019
* fix BasicAer sampling bug (Qiskit#1624) (Qiskit#1859) * fix BasicAer sampling bug (Qiskit#1624) * fix BasicAer sampling bug * changelog * remove legacysimulator from test_compile Conflicts: CHANGELOG.rst test/python/tools/test_compiler.py The changelog conflicts were inevitable as the stable branch doesn't have the same history as master. As for the test conflict it was a difference in the simulator (python vs c++) used, this backport switches to use the python like on master. (cherry picked from commit 5f7b2e7) * Try pinning isort version * Use constraints from last working version of lint * Add requirements constraints too * Bump version and prepare for 0.7.1 release (Qiskit#1886) * Bump version and prepare for 0.7.1 release To prepare for the 0.7.1 bugfix release we need to increase the version number and update the changelog. This commit takes care of that so we can tag the release and build it. * Addressed issue with instruction.py which prohibited inheritance of QuantumRegisters and ClassicalRegisters * Updated changelog * Fixed typo * Reverted changes from merge with Stable * Fixed changelog
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.
Fixes #1892
Summary
Modified the way in which type-checking is done in instruction.py to allow QuantumRegister and ClassicalRegister to be inherited from.
Details and comments
This PR is a repeat as I mistakenly attempted to merge with stable.
Type-equality checking is brittle and should be avoided except in the case where inheritance is to be disregarded for a class. That appears to be the case for neither QuantumRegister nor ClassicalRegister.