From b2bb9e8036fc16ad197d34eac48494c1a3e05aff Mon Sep 17 00:00:00 2001 From: Andrea Aime Date: Tue, 31 May 2022 10:36:12 +0200 Subject: [PATCH] [GEOT-7154] Sphinx build failure with extlinks (new warnings in Sphinx build) (#3910) * [GEOT-7154] Sphinx build failure with extlinks (new warnings in Sphinx build) * Align python setup with GeoServer workflows * Trying to peg Sphinx to 4.5 --- .github/workflows/linux_jdk11.yml | 6 ++++-- .github/workflows/linux_jdk8.yml | 6 ++++-- docs/common.py | 14 +++++++------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/workflows/linux_jdk11.yml b/.github/workflows/linux_jdk11.yml index dca299ff188..4d032cca92c 100644 --- a/.github/workflows/linux_jdk11.yml +++ b/.github/workflows/linux_jdk11.yml @@ -22,11 +22,13 @@ jobs: key: gt-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | gt-maven- - - uses: actions/setup-python@v1 + - uses: actions/setup-python@v2 + with: + python-version: '3.x' - uses: BSFishy/pip-action@v1 with: packages: | - sphinx + sphinx==4.5.0 requests - name: Disable checksum offloading # See: https://github.com/actions/virtual-environments/issues/1187#issuecomment-686735760 diff --git a/.github/workflows/linux_jdk8.yml b/.github/workflows/linux_jdk8.yml index 51e06480d2e..aa057f886a5 100644 --- a/.github/workflows/linux_jdk8.yml +++ b/.github/workflows/linux_jdk8.yml @@ -22,11 +22,13 @@ jobs: key: gt-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | gt-maven- - - uses: actions/setup-python@v1 + - uses: actions/setup-python@v2 + with: + python-version: '3.x' - uses: BSFishy/pip-action@v1 with: packages: | - sphinx + sphinx==4.5.0 requests - name: Disable checksum offloading # See: https://github.com/actions/virtual-environments/issues/1187#issuecomment-686735760 diff --git a/docs/common.py b/docs/common.py index 771f86f0367..1092fc12472 100644 --- a/docs/common.py +++ b/docs/common.py @@ -27,13 +27,13 @@ extensions = ['sphinx.ext.todo','sphinx.ext.extlinks'] extlinks = { - 'wiki': ('https://github.com/geotools/geotools/wiki/%s',''), - 'website': ('https://geotools.org/%s',''), - 'geoserver': ('https://docs.geoserver.org/latest/en/user/%s',''), - 'developer': ('https://docs.geotools.org/latest/developer/%s',''), - 'user': ('https://docs.geotools.org/maintenance/userguide/%s',''), - 'api': ('https://docs.geotools.org/maintenance/javadocs',''), - 'geot': ('https://osgeo-org.atlassian.net/browse/GEOT-%s','GEOT-') + 'wiki': ('https://github.com/geotools/geotools/wiki/%s', None), + 'website': ('https://geotools.org/%s', None), + 'geoserver': ('https://docs.geoserver.org/latest/en/user/%s', None), + 'developer': ('https://docs.geotools.org/latest/developer/%s', None), + 'user': ('https://docs.geotools.org/latest/userguide/%s', None), + 'api': ('https://docs.geotools.org/latest/javadocs/%s', None), + 'geot': ('https://osgeo-org.atlassian.net/browse/GEOT-%s','GEOT-%s') } # Add any paths that contain templates here, relative to this directory.