Skip to content

Many mentions to QASM should be changed to OpenQASM 2 (backport #9351)#10919

Merged
jakelishman merged 1 commit into
stable/0.25from
mergify/bp/stable/0.25/pr-9351
Sep 29, 2023
Merged

Many mentions to QASM should be changed to OpenQASM 2 (backport #9351)#10919
jakelishman merged 1 commit into
stable/0.25from
mergify/bp/stable/0.25/pr-9351

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Sep 29, 2023

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

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

You are currently cherry-picking commit c6c9267a6.
  (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/algorithms/optimizers/spsa.py
	modified:   qiskit/assembler/assemble_circuits.py
	modified:   qiskit/circuit/controlflow/for_loop.py
	modified:   qiskit/circuit/quantumcircuit.py
	modified:   qiskit/compiler/assembler.py
	modified:   qiskit/converters/ast_to_dag.py
	modified:   qiskit/providers/basicaer/qasm_simulator.py
	modified:   qiskit/providers/fake_provider/fake_qasm_backend.py
	modified:   qiskit/providers/fake_provider/fake_qasm_simulator.py
	modified:   qiskit/providers/models/backendconfiguration.py
	modified:   qiskit/qasm/node/__init__.py
	modified:   qiskit/qasm/node/binaryoperator.py
	modified:   qiskit/qasm/node/unaryoperator.py
	modified:   qiskit/qasm/qasm.py
	modified:   qiskit/qasm3/__init__.py
	modified:   qiskit/qasm3/exporter.py
	modified:   qiskit/qasm3/printer.py
	modified:   qiskit/qobj/common.py
	modified:   qiskit/qobj/qasm_qobj.py
	modified:   qiskit/result/result.py
	modified:   qiskit/tools/jupyter/library.py
	modified:   test/python/qasm3/test_export.py
	modified:   test/python/transpiler/test_mappers.py

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

@mergify mergify Bot requested review from a team, ElePT, jyu00 and woodsp-ibm as code owners September 29, 2023 18:49
@mergify mergify Bot added the conflicts used by mergify when there are conflicts in a port label Sep 29, 2023
@qiskit-bot
Copy link
Copy Markdown
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:

  • @ElePT
  • @Qiskit/terra-core
  • @woodsp-ibm

@github-actions github-actions Bot added the documentation Something is not clear or an error documentation label Sep 29, 2023
@github-actions github-actions Bot added this to the 0.25.2 milestone Sep 29, 2023
@github-actions github-actions Bot added the Changelog: None Do not include in the GitHub Release changelog. label Sep 29, 2023
* Many mentions to QASM should be changed to OpenQASM2

* adjust tests

* another round

* suggestion in https://github.com/Qiskit/qiskit-terra/pull/9351/files#r1068676297

* https://github.com/Qiskit/qiskit-terra/pull/9351/files#r1068704441

* Normalise spacing of OpenQASM [23]

---------

(cherry picked from commit c6c9267)
Co-authored-by: Jake Lishman <jake.lishman@ibm.com>
@jakelishman jakelishman force-pushed the mergify/bp/stable/0.25/pr-9351 branch from d98d866 to 6547f61 Compare September 29, 2023 20:44
@jakelishman jakelishman removed the conflicts used by mergify when there are conflicts in a port label Sep 29, 2023
@coveralls
Copy link
Copy Markdown

Pull Request Test Coverage Report for Build 6356953384

  • 16 of 18 (88.89%) changed or added relevant lines in 10 files are covered.
  • 298 unchanged lines in 4 files lost coverage.
  • Overall coverage decreased (-0.02%) to 87.231%

Changes Missing Coverage Covered Lines Changed/Added Lines %
qiskit/circuit/quantumcircuit.py 0 1 0.0%
qiskit/qasm/qasm.py 0 1 0.0%
Files with Coverage Reduction New Missed Lines %
crates/qasm2/src/expr.rs 1 93.76%
crates/qasm2/src/lex.rs 6 90.4%
crates/qasm2/src/parse.rs 24 96.2%
qiskit/visualization/circuit/matplotlib.py 267 50.0%
Totals Coverage Status
Change from base Build 6356007382: -0.02%
Covered Lines: 74114
Relevant Lines: 84963

💛 - Coveralls

@jakelishman jakelishman added this pull request to the merge queue Sep 29, 2023
Merged via the queue into stable/0.25 with commit 21ab6b4 Sep 29, 2023
@mergify mergify Bot deleted the mergify/bp/stable/0.25/pr-9351 branch September 29, 2023 23:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Changelog: None Do not include in the GitHub Release changelog. documentation Something is not clear or an error documentation

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants