From 9880c82f28af6a39b77c4a8e9ba715a5dde69d2e Mon Sep 17 00:00:00 2001 From: "U-AzureAD\\JUNDOI" Date: Thu, 12 Sep 2024 13:29:47 +0900 Subject: [PATCH 1/5] qiskit 1.0.0rc1 -> 1.3.0b1 --- .github/workflows/docs.yml | 4 ++-- .github/workflows/tests.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 074add47a9..9035a83a15 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -13,7 +13,7 @@ jobs: timeout-minutes: 60 strategy: matrix: - python-version: ['3.8'] + python-version: ['3.9'] steps: - uses: actions/checkout@v4 with: @@ -50,7 +50,7 @@ jobs: needs: [docs] strategy: matrix: - python-version: ['3.8'] + python-version: ['3.9'] steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 52b4a50ab6..db341fb5cf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -97,7 +97,7 @@ jobs: qiskit-extra: [""] include: - python-version: "3.10" - qiskit-extra: "'qiskit>=1.0.0rc1'" + qiskit-extra: "'qiskit>=1.3.0b1'" env: AER_THRUST_BACKEND: OMP From e2150879e16d46d7f439faad6503fecd37c1d6c7 Mon Sep 17 00:00:00 2001 From: "U-AzureAD\\JUNDOI" Date: Thu, 12 Sep 2024 14:27:23 +0900 Subject: [PATCH 2/5] test --- .github/workflows/docs.yml | 2 +- qiskit_aer/noise/passes/local_noise_pass.py | 2 +- requirements-dev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 9035a83a15..3bb442d847 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -74,7 +74,7 @@ jobs: pip install -U -r requirements-dev.txt -c constraints.txt pip install -c constraints.txt git+https://github.com/Qiskit/qiskit pip install -c constraints.txt . - pip install -U "qiskit-ibmq-provider" "z3-solver" "qiskit-ignis" "qiskit-aqua" "pyscf<1.7.4" "matplotlib>=3.3.0" jupyter pylatexenc nbsphinx cvxpy qiskit-sphinx-theme -c constraints.txt + pip install -U "qiskit-ibmq-provider" "z3-solver" "qiskit-ignis" "qiskit-aqua" "pyscf" "matplotlib>=3.3.0" jupyter pylatexenc nbsphinx cvxpy qiskit-sphinx-theme -c constraints.txt sudo apt install -y graphviz pandoc libopenblas-dev pip check shell: bash diff --git a/qiskit_aer/noise/passes/local_noise_pass.py b/qiskit_aer/noise/passes/local_noise_pass.py index 8713ed494d..f7373cff90 100644 --- a/qiskit_aer/noise/passes/local_noise_pass.py +++ b/qiskit_aer/noise/passes/local_noise_pass.py @@ -144,7 +144,7 @@ def run(self, dag: DAGCircuit) -> DAGCircuit: if isinstance(new_op, QuantumCircuit): # If the new op is a quantum circuit, compose its DAG with the new dag # so that it is unrolled rather than added as an opaque instruction - new_dag.compose(circuit_to_dag(new_op), qubits=node.qargs) # never touch clbits + new_dag.compose(circuit_to_dag(new_op), qubits=list(node.qargs)) # never touch clbits else: # Otherwise append the instruction returned by the function new_dag.apply_operation_back(new_op, qargs=node.qargs) # never touch cargs diff --git a/requirements-dev.txt b/requirements-dev.txt index de85d14d8d..6a55c75df2 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -13,7 +13,7 @@ reno>=3.4.0 ddt>=1.2.0,!=1.4.0 matplotlib>=3.3 seaborn>=0.9.0 -qiskit_sphinx_theme~=1.16.0 +qiskit_sphinx_theme sphinx-design>=0.2.0 nbsphinx qiskit_qasm3_import From 122594f5b46a9f9d543bc6392935deff8685e312 Mon Sep 17 00:00:00 2001 From: "U-AzureAD\\JUNDOI" Date: Thu, 12 Sep 2024 14:33:58 +0900 Subject: [PATCH 3/5] test --- qiskit_aer/noise/passes/local_noise_pass.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qiskit_aer/noise/passes/local_noise_pass.py b/qiskit_aer/noise/passes/local_noise_pass.py index f7373cff90..f4ebf2fa7c 100644 --- a/qiskit_aer/noise/passes/local_noise_pass.py +++ b/qiskit_aer/noise/passes/local_noise_pass.py @@ -144,7 +144,9 @@ def run(self, dag: DAGCircuit) -> DAGCircuit: if isinstance(new_op, QuantumCircuit): # If the new op is a quantum circuit, compose its DAG with the new dag # so that it is unrolled rather than added as an opaque instruction - new_dag.compose(circuit_to_dag(new_op), qubits=list(node.qargs)) # never touch clbits + new_dag.compose( + circuit_to_dag(new_op), qubits=list(node.qargs) + ) # never touch clbits else: # Otherwise append the instruction returned by the function new_dag.apply_operation_back(new_op, qargs=node.qargs) # never touch cargs From 9b25e73c5ea72c4f4e85efc88fc542b9cd0c48b0 Mon Sep 17 00:00:00 2001 From: "U-AzureAD\\JUNDOI" Date: Thu, 12 Sep 2024 15:04:13 +0900 Subject: [PATCH 4/5] fix tutorial --- .github/workflows/docs.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 3bb442d847..30154ce1ff 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -74,7 +74,6 @@ jobs: pip install -U -r requirements-dev.txt -c constraints.txt pip install -c constraints.txt git+https://github.com/Qiskit/qiskit pip install -c constraints.txt . - pip install -U "qiskit-ibmq-provider" "z3-solver" "qiskit-ignis" "qiskit-aqua" "pyscf" "matplotlib>=3.3.0" jupyter pylatexenc nbsphinx cvxpy qiskit-sphinx-theme -c constraints.txt sudo apt install -y graphviz pandoc libopenblas-dev pip check shell: bash @@ -82,7 +81,7 @@ jobs: run: | set -e cd qiskit-tutorials - rm -rf tutorials/chemistry tutorials/circuits tutorials/circuits_advanced tutorials/finance tutorials/optimization tutorials/algorithms tutorials/operators tutorials/noise tutorials/machine_learning + rm -rf tutorials/circuits tutorials/circuits_advanced tutorials/algorithms tutorials/operators sphinx-build -b html . _build/html - uses: actions/upload-artifact@v4 with: From f199a8c85efadaeac6729364ff923f26460a4ceb Mon Sep 17 00:00:00 2001 From: "U-AzureAD\\JUNDOI" Date: Thu, 12 Sep 2024 15:24:21 +0900 Subject: [PATCH 5/5] add release note --- releasenotes/notes/fix_tests_0.15-dccf0acb3cf10571.yaml | 7 +++++++ requirements-dev.txt | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/fix_tests_0.15-dccf0acb3cf10571.yaml diff --git a/releasenotes/notes/fix_tests_0.15-dccf0acb3cf10571.yaml b/releasenotes/notes/fix_tests_0.15-dccf0acb3cf10571.yaml new file mode 100644 index 0000000000..6fef6908c9 --- /dev/null +++ b/releasenotes/notes/fix_tests_0.15-dccf0acb3cf10571.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + Fixed tutorial build failure of Python version and unused tutorials. + Upgraded test for Qiskit 1.0.0rc1 to 1.3.0b1 this will need protection rules + for Aer repository. Also fixed noise/passes/local_noise_pass.py needed + conversion from tuple to list diff --git a/requirements-dev.txt b/requirements-dev.txt index 6a55c75df2..de85d14d8d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -13,7 +13,7 @@ reno>=3.4.0 ddt>=1.2.0,!=1.4.0 matplotlib>=3.3 seaborn>=0.9.0 -qiskit_sphinx_theme +qiskit_sphinx_theme~=1.16.0 sphinx-design>=0.2.0 nbsphinx qiskit_qasm3_import