From b04d7e51c4d4949534650878096669ac5a8f6c8f Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Tue, 11 May 2021 13:33:53 -0400 Subject: [PATCH] Remove unnecessary duplicate sphinx installation (#1252) * Remove unnecessary duplicate sphinx installation This commit removes an unnecessary manual sphinx installation in the tutorials CI job. This second install is causing a version to be installed which is incompatible with already installed extensions. By removing it this should hopefully enable pip's dependency solver to resolve everything correctly and not cause incompatible versions from being installed. Fixes #1251 * Increase test job timeout to 60min The unit test jobs have been slowly encroaching on the configured timeout for some jobs over time and we're now at a point where test jobs regularly are hitting the timeout and failing. To avoid failures like this from happening, this commit bumps the timeout for all the unittest jobs to 60min which should give us a healthy margin for test suite growth and random slow CI nodes without making us wait the full 6 hour job limit in gha. --- .github/workflows/docs.yml | 2 +- .github/workflows/tests_linux.yml | 4 ++-- .github/workflows/tests_mac.yml | 4 ++-- .github/workflows/tests_windows.yml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 3335b4be13..11e09b31da 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -71,7 +71,7 @@ jobs: pip install -U -r requirements-dev.txt -c constraints.txt pip install -c constraints.txt git+https://github.com/Qiskit/qiskit-terra 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 sphinx nbsphinx sphinx_rtd_theme cvxpy -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 sphinx_rtd_theme cvxpy -c constraints.txt python setup.py build_ext --inplace sudo apt install -y graphviz pandoc libopenblas-dev pip check diff --git a/.github/workflows/tests_linux.yml b/.github/workflows/tests_linux.yml index 64e356d5d5..7be8f3c7b2 100644 --- a/.github/workflows/tests_linux.yml +++ b/.github/workflows/tests_linux.yml @@ -83,7 +83,7 @@ jobs: tests: runs-on: ${{ matrix.os }} needs: [sdist, lint] - timeout-minutes: 30 + timeout-minutes: 60 strategy: matrix: python-version: [3.6, 3.7, 3.8, 3.9] @@ -127,7 +127,7 @@ jobs: tests-json-input: runs-on: ${{ matrix.os }} needs: [sdist, lint] - timeout-minutes: 45 + timeout-minutes: 60 strategy: matrix: python-version: [3.9] diff --git a/.github/workflows/tests_mac.yml b/.github/workflows/tests_mac.yml index d62ea54bb9..18cff6a9ea 100644 --- a/.github/workflows/tests_mac.yml +++ b/.github/workflows/tests_mac.yml @@ -77,7 +77,7 @@ jobs: tests: runs-on: ${{ matrix.os }} needs: [sdist, lint] - timeout-minutes: 40 + timeout-minutes: 60 strategy: matrix: python-version: [3.6, 3.7, 3.8, 3.9] @@ -130,7 +130,7 @@ jobs: tests-json-input: runs-on: ${{ matrix.os }} needs: [sdist, lint] - timeout-minutes: 45 + timeout-minutes: 60 strategy: matrix: python-version: [3.9] diff --git a/.github/workflows/tests_windows.yml b/.github/workflows/tests_windows.yml index e414d3cb44..8a15921dd7 100644 --- a/.github/workflows/tests_windows.yml +++ b/.github/workflows/tests_windows.yml @@ -83,7 +83,7 @@ jobs: tests: runs-on: ${{ matrix.os }} needs: ["lint"] - timeout-minutes: 30 + timeout-minutes: 60 strategy: matrix: python-version: [3.6, 3.7, 3.8, 3.9] @@ -128,7 +128,7 @@ jobs: tests-json-input: runs-on: ${{ matrix.os }} needs: ["lint"] - timeout-minutes: 45 + timeout-minutes: 60 strategy: matrix: python-version: [3.9]