From c57673a6e408f67b1ed53caf4ea5350e7a6744d3 Mon Sep 17 00:00:00 2001 From: Takashi Imamichi Date: Fri, 16 Feb 2024 13:01:02 +0900 Subject: [PATCH 1/2] pin qiskit<1.0 --- requirements.txt | 2 +- tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index c75637158..a8dbbc257 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -qiskit>=0.44 +qiskit>=0.44,<1 qiskit-algorithms>=0.2.0 scipy>=1.9.0 numpy>=1.17 diff --git a/tox.ini b/tox.ini index ca4cbc508..83a36125b 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ setenv = LANGUAGE=en_US LC_ALL=en_US.utf-8 ARGS="-V" -deps = git+https://github.com/Qiskit/qiskit.git +deps = qiskit<1 -r{toxinidir}/requirements.txt -r{toxinidir}/requirements-dev.txt cplex From b6ecb602be50459bf817115174e734a2b46a5aeb Mon Sep 17 00:00:00 2001 From: Takashi Imamichi Date: Fri, 16 Feb 2024 13:19:32 +0900 Subject: [PATCH 2/2] tweak github actions --- .github/actions/install-main-dependencies/action.yml | 2 +- .github/workflows/main.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/install-main-dependencies/action.yml b/.github/actions/install-main-dependencies/action.yml index 07566120f..913f1cc6d 100644 --- a/.github/actions/install-main-dependencies/action.yml +++ b/.github/actions/install-main-dependencies/action.yml @@ -81,7 +81,7 @@ runs: source "$CONDA/etc/profile.d/conda.sh" conda activate scsenv fi - pip install -U qiskit + pip install -U 'qiskit<1' fi shell: bash - name: Install stable Aer diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 20ee1053c..f71aa786f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -67,7 +67,7 @@ jobs: os: ${{ matrix.os }} - name: Install Dependencies run: | - pip install jupyter qiskit[visualization] + pip install jupyter 'qiskit[visualization]<1' sudo apt-get -y install pandoc graphviz sudo apt-get -y install python3-enchant sudo apt-get -y install hunspell-en-us @@ -245,7 +245,7 @@ jobs: os: ${{ matrix.os }} - name: Install Dependencies run: | - pip install jupyter qiskit[visualization] + pip install jupyter 'qiskit[visualization]<1' sudo apt-get install -y pandoc graphviz shell: bash - name: Run Qiskit Optimization Tutorials