diff --git a/.github/workflows/cron-staging.yml b/.github/workflows/cron-staging.yml index e2352377bf..602c5738cc 100644 --- a/.github/workflows/cron-staging.yml +++ b/.github/workflows/cron-staging.yml @@ -45,7 +45,6 @@ jobs: if: runner.os == 'macOS' env: TEST_TIMEOUT: 120 - OMP_NUM_THREADS: 1 docs: if: github.repository_owner == 'Qiskit-Extensions' name: docs diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 40ac08176b..df3978d7cf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,7 +58,6 @@ jobs: if: runner.os == 'macOS' env: TEST_TIMEOUT: 120 - OMP_NUM_THREADS: 1 - name: Clean up stestr cache run: stestr history remove all diff --git a/tox.ini b/tox.ini index 1392db4a83..47eadc6cef 100644 --- a/tox.ini +++ b/tox.ini @@ -10,13 +10,13 @@ setenv = VIRTUAL_ENV={envdir} QISKIT_SUPPRESS_PACKAGING_WARNINGS=Y QISKIT_TEST_CAPTURE_STREAMS=1 + OMP_NUM_THREADS={env:OMP_NUM_THREADS:1} + QISKIT_PARALLEL={env:QISKIT_PARALLEL:FALSE} + RAYON_NUM_THREADS={env:RAYON_NUM_THREADS:1} deps = -r{toxinidir}/requirements-dev.txt -r{toxinidir}/requirements-extras.txt passenv = - OMP_NUM_THREADS - QISKIT_PARALLEL - RAYON_NUM_THREADS QISKIT_IBM_* TEST_TIMEOUT QE_USE_TESTTOOLS @@ -35,21 +35,10 @@ commands = [testenv:qiskit-main] usedevelop = True install_command = pip install -U {opts} {packages} -setenv = - VIRTUAL_ENV={envdir} - QISKIT_SUPPRESS_PACKAGING_WARNINGS=Y - QISKIT_TEST_CAPTURE_STREAMS=1 deps = git+https://github.com/Qiskit/qiskit -r{toxinidir}/requirements-dev.txt -r{toxinidir}/requirements-extras.txt -passenv = - OMP_NUM_THREADS - QISKIT_PARALLEL - RAYON_NUM_THREADS - QISKIT_IBM_* - TEST_TIMEOUT - QE_USE_TESTTOOLS commands = stestr run {posargs}