Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into noise_from_dict
Browse files Browse the repository at this point in the history
  • Loading branch information
doichanj committed Sep 12, 2024
2 parents 79c8146 + 707dbdf commit 553b3a9
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
python-version: ['3.8']
python-version: ['3.9']
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -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 }}
Expand All @@ -74,15 +74,14 @@ 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
sudo apt install -y graphviz pandoc libopenblas-dev
pip check
shell: bash
- name: Run Tutorials
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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion qiskit_aer/noise/passes/local_noise_pass.py
Original file line number Diff line number Diff line change
Expand Up @@ -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=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
Expand Down
7 changes: 7 additions & 0 deletions releasenotes/notes/fix_tests_0.15-dccf0acb3cf10571.yaml
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 553b3a9

Please sign in to comment.