diff options
| -rw-r--r-- | .azure-pipelines/docs-steps.yml | 4 | ||||
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Doc/Makefile | 2 | ||||
| -rw-r--r-- | Doc/requirements.txt | 2 | ||||
| -rwxr-xr-x | Mac/BuildScript/build-installer.py | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/.azure-pipelines/docs-steps.yml b/.azure-pipelines/docs-steps.yml index 9636196..eaf4ad0 100644 --- a/.azure-pipelines/docs-steps.yml +++ b/.azure-pipelines/docs-steps.yml @@ -12,7 +12,7 @@ steps: inputs: versionSpec: '>=3.6' -- script: python -m pip install sphinx==2.0.1 blurb python-docs-theme +- script: python -m pip install sphinx==2.2.0 blurb python-docs-theme displayName: 'Install build dependencies' - ${{ if ne(parameters.latex, 'true') }}: @@ -21,7 +21,7 @@ steps: displayName: 'Build documentation' - ${{ if eq(parameters.latex, 'true') }}: - - script: sudo apt-get update && sudo apt-get install -qy --force-yes texlive-full + - script: sudo apt-get update && sudo apt-get install -qy --force-yes texlive-full displayName: 'Install LaTeX' - script: make dist PYTHON=python SPHINXBUILD='python -m sphinx' BLURB='python -m blurb' diff --git a/.travis.yml b/.travis.yml index d4275fd..807a7b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,7 @@ matrix: # Sphinx is pinned so that new versions that introduce new warnings won't suddenly cause build failures. # (Updating the version is fine as long as no warnings are raised by doing so.) # The theme used by the docs is stored separately, so we need to install that as well. - - python -m pip install sphinx==2.0.1 blurb python-docs-theme + - python -m pip install sphinx==2.2.0 blurb python-docs-theme script: - make check suspicious html SPHINXOPTS="-q -W -j4" - name: "Documentation tests" diff --git a/Doc/Makefile b/Doc/Makefile index 86207fe..05361f2 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -143,7 +143,7 @@ clean: venv: $(PYTHON) -m venv $(VENVDIR) $(VENVDIR)/bin/python3 -m pip install -U pip setuptools - $(VENVDIR)/bin/python3 -m pip install -U Sphinx==2.0.1 blurb python-docs-theme + $(VENVDIR)/bin/python3 -m pip install -U Sphinx==2.2.0 blurb python-docs-theme @echo "The venv has been created in the $(VENVDIR) directory" dist: diff --git a/Doc/requirements.txt b/Doc/requirements.txt index e0d7ca8..198446b 100644 --- a/Doc/requirements.txt +++ b/Doc/requirements.txt @@ -1,5 +1,5 @@ # Requirements for docs build on netlify # Pin sphinx to version specified in .travis.yml -sphinx==2.0.1 +sphinx==2.2.0 blurb python-docs-theme diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 0dd5364..3d1381b 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -1068,7 +1068,7 @@ def buildPythonDocs(): runCommand('make clean') # Create virtual environment for docs builds with blurb and sphinx runCommand('make venv') - runCommand('venv/bin/python3 -m pip install -U Sphinx==2.0.1') + runCommand('venv/bin/python3 -m pip install -U Sphinx==2.2.0') runCommand('make html PYTHON=venv/bin/python') os.chdir(curDir) if not os.path.exists(docdir): |