diff --git a/.github/workflows/neko.yml b/.github/workflows/neko.yml index 5e1f3dbd42..180c23768b 100644 --- a/.github/workflows/neko.yml +++ b/.github/workflows/neko.yml @@ -5,7 +5,8 @@ on: branches: ['main', 'stable/*'] concurrency: group: ${{ github.repository }}-${{ github.ref }}-${{ github.head_ref }}-${{ github.workflow }} - cancel-in-progress: true + # Only cancel in PR mode. In push mode, don't cancel so we don't see spurious test "failures". + cancel-in-progress: ${{ github.event_name == 'pull_request' }} jobs: neko: name: Qiskit Neko Integration Tests @@ -16,4 +17,5 @@ jobs: test_selection: backend repo_install_command: | pip install conan - pip install . + pip uninstall -y qiskit qiskit-terra qiskit-aer + pip install -c constraints.txt . diff --git a/requirements-dev.txt b/requirements-dev.txt index 6de7eefe03..1dd45fcbab 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,7 +3,7 @@ cmake!=3.17.1,!=3.17.0 conan<2.0.0 scikit-build>=0.11.0 asv -cvxpy>=1.0.0,<1.1.15;platform_system != 'Windows' and python_version < '3.11' +cvxpy pylint black[jupyter]~=24.1 clang-format~=15.0.7