Skip to content

Commit

Permalink
Remove unnecessary duplicate sphinx installation (#1252)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
mtreinish committed May 11, 2021
1 parent f157608 commit b04d7e5
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests_mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down

0 comments on commit b04d7e5

Please sign in to comment.