diff --git a/.azure/lint-linux.yml b/.azure/lint-linux.yml index a538b4a9b489..0bba15e64ed0 100644 --- a/.azure/lint-linux.yml +++ b/.azure/lint-linux.yml @@ -21,10 +21,11 @@ jobs: python -m pip install --upgrade pip setuptools wheel virtualenv virtualenv test-job source test-job/bin/activate - pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt - pip install -U -c constraints.txt -e . - pip install -U "qiskit-aer" -c constraints.txt - pip install -e . + pip install -U \ + -c constraints.txt \ + -r requirements.txt \ + -r requirements-dev.txt \ + -e . displayName: 'Install dependencies' env: SETUPTOOLS_ENABLE_FEATURES: "legacy-editable" diff --git a/.azure/test-linux.yml b/.azure/test-linux.yml index 60f71c049657..1c7711b1dcd1 100644 --- a/.azure/test-linux.yml +++ b/.azure/test-linux.yml @@ -60,19 +60,25 @@ jobs: # Use stable Rust, rather than MSRV, to spot-check that stable builds properly. rustup override set stable source test-job/bin/activate - pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt # Install setuptools-rust for building sdist pip install -U -c constraints.txt setuptools-rust python setup.py sdist - pip install -U -c constraints.txt dist/qiskit-terra*.tar.gz + pip install -U \ + -c constraints.txt \ + -r requirements.txt \ + -r requirements-dev.txt \ + dist/qiskit-terra*.tar.gz displayName: "Install Terra from sdist" - ${{ if eq(parameters.installFromSdist, false) }}: - bash: | set -e source test-job/bin/activate - pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt - pip install -U -c constraints.txt -e . + pip install -U \ + -c constraints.txt \ + -r requirements.txt \ + -r requirements-dev.txt \ + -e . displayName: "Install Terra directly" env: SETUPTOOLS_ENABLE_FEATURES: "legacy-editable" @@ -80,7 +86,11 @@ jobs: - bash: | set -e source test-job/bin/activate - pip install -U "cplex;python_version < '3.11'" "qiskit-aer" "z3-solver" -c constraints.txt + pip install -U \ + -c constraints.txt \ + "cplex;python_version < '3.11'" \ + "qiskit-aer" \ + "z3-solver" mkdir -p /tmp/terra-tests cp -r test /tmp/terra-tests/. cp .stestr.conf /tmp/terra-tests/. @@ -162,8 +172,10 @@ jobs: - bash: | set -e virtualenv image_tests - image_tests/bin/pip install -U -r requirements.txt -c constraints.txt - image_tests/bin/pip install -U -c constraints.txt -e ".[visualization]" + image_tests/bin/pip install -U \ + -c constraints.txt \ + -r requirements.txt \ + -e ".[visualization]" sudo apt-get update sudo apt-get install -y graphviz pandoc image_tests/bin/pip check diff --git a/.azure/test-macos.yml b/.azure/test-macos.yml index 208bb020080d..c1eafa412041 100644 --- a/.azure/test-macos.yml +++ b/.azure/test-macos.yml @@ -34,8 +34,11 @@ jobs: python -m pip install --upgrade pip setuptools wheel virtualenv virtualenv test-job source test-job/bin/activate - pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt - pip install -U -c constraints.txt -e . + pip install -U \ + -c constraints.txt \ + -r requirements.txt \ + -r requirements-dev.txt \ + -e . pip check displayName: 'Install dependencies' env: diff --git a/.azure/test-windows.yml b/.azure/test-windows.yml index 4d8a10f6bef3..7d4eb0d734ae 100644 --- a/.azure/test-windows.yml +++ b/.azure/test-windows.yml @@ -33,9 +33,12 @@ jobs: python -m pip install --upgrade pip setuptools wheel virtualenv virtualenv test-job source test-job/Scripts/activate - pip install -r requirements.txt -r requirements-dev.txt -c constraints.txt - pip install -c constraints.txt -e . - pip install "z3-solver" -c constraints.txt + pip install -U \ + -c constraints.txt \ + -r requirements.txt \ + -r requirements-dev.txt \ + "z3-solver" \ + -e . pip check displayName: 'Install dependencies' env: diff --git a/.azure/tutorials-linux.yml b/.azure/tutorials-linux.yml index 3ae28279a370..179fec883a3e 100644 --- a/.azure/tutorials-linux.yml +++ b/.azure/tutorials-linux.yml @@ -22,9 +22,20 @@ jobs: set -e git clone https://github.com/Qiskit/qiskit-tutorials --depth=1 python -m pip install --upgrade pip - pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt - pip install -c constraints.txt -e . - pip install "qiskit-ibmq-provider" "qiskit-aer" "z3-solver" "networkx" "matplotlib>=3.3.0" sphinx nbsphinx sphinx_rtd_theme cvxpy -c constraints.txt + pip install -U \ + -c constraints.txt \ + -r requirements.txt \ + -r requirements-dev.txt \ + "qiskit-ibmq-provider" \ + "qiskit-aer" \ + "z3-solver" \ + "networkx" \ + "matplotlib>=3.3.0" \ + sphinx \ + nbsphinx \ + sphinx_rtd_theme \ + cvxpy \ + -e . sudo apt-get update sudo apt-get install -y graphviz pandoc pip check diff --git a/releasenotes/notes/fix-qasm-reset-e3c6ffb1cd81d44e.yaml b/releasenotes/notes/fix-qasm-reset-e3c6ffb1cd81d44e.yaml new file mode 100644 index 000000000000..b541c28b2b38 --- /dev/null +++ b/releasenotes/notes/fix-qasm-reset-e3c6ffb1cd81d44e.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - | + Fixed :meth:`~.QuantumCircuit.qasm` so that it appends ``;`` after ``reset`` instruction. diff --git a/test/python/circuit/test_circuit_qasm.py b/test/python/circuit/test_circuit_qasm.py index 8924bd1f4051..f0b069c74892 100644 --- a/test/python/circuit/test_circuit_qasm.py +++ b/test/python/circuit/test_circuit_qasm.py @@ -616,6 +616,18 @@ def test_circuit_qasm_with_permutations(self): permutation__2_1_0_ q[0],q[1],q[2];\n""" self.assertEqual(qc.qasm(), expected_qasm) + def test_circuit_qasm_with_reset(self): + """Test circuit qasm() method with Reset.""" + qc = QuantumCircuit(2) + qc.reset([0, 1]) + + expected_qasm = """OPENQASM 2.0; +include "qelib1.inc"; +qreg q[2]; +reset q[0]; +reset q[1];\n""" + self.assertEqual(qc.qasm(), expected_qasm) + if __name__ == "__main__": unittest.main()