Qiskit / qiskit / 13437314861

89%

main: 88%

Build Type

push

github

Committed by mtreinish

Commit Message

Merge remote-tracking branch 'stable/1.3' into 'stable/1.4'

With the release of Qiskit 1.3.3 the stable/1.3 branch should be
finished changing at this point. Before we prepare a 1.4.0 release we
need to make sure all the backported changes to 1.3 are included in 1.4.
This commit merges the contents of the 1.3 branch into the 1.4 branch.

The only conflicts were mainly on version numbers because the commits in
stable/1.3 including bumping the version strings on new bugfix releases.
The one real conflict was in the preset_passmanagers where some of the
constructor functions were in filter_warnings context managers and in
stable/1.3 the arguments passed to those functions changed.

While not a merge conflict the change to
`test/python/circuit/library/test_mcmt.py` was a necessary because a
test was added in `stable/1.3` that was using functionality marked as
deprecated in `stable/1.4`. The change there catches the warning emitted
to prevent a test failure.

This commit should be merged as a merge commit to preserve the git
history. This will require manual intervention at merge time.

Conflicts:
    Cargo.lock
    Cargo.toml
    docs/conf.py
    qiskit/VERSION.txt
    qiskit/transpiler/preset_passmanagers/builtin_plugins.py

Run Details

291 of 319 new or added lines in 41 files covered. (91.22%)

18 existing lines in 7 files now uncovered.

79257 of 89180 relevant lines covered (88.87%)

358313.22 hits per line