From 1437348aef63a747fc119c1cce6f296204ef78c9 Mon Sep 17 00:00:00 2001 From: aaime Date: Mon, 30 May 2022 18:21:09 +0200 Subject: [PATCH 1/3] [GEOT-7154] Sphinx build failure with extlinks (new warnings in Sphinx build) --- docs/common.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/common.py b/docs/common.py index 12f6b709e0b..48785371092 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/latest/userguide/%s',''), - 'api': ('https://docs.geotools.org/latest/javadocs/%s',''), - '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. From bc526f79a829c3c3ba70c837fb5fdeab262f69ff Mon Sep 17 00:00:00 2001 From: aaime Date: Tue, 31 May 2022 09:32:54 +0200 Subject: [PATCH 2/3] Align python setup with GeoServer workflows --- .github/workflows/linux_jdk11.yml | 4 +++- .github/workflows/linux_jdk17.yml | 4 +++- .github/workflows/linux_jdk8.yml | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux_jdk11.yml b/.github/workflows/linux_jdk11.yml index 188721aaed6..3d54d3bd8e2 100644 --- a/.github/workflows/linux_jdk11.yml +++ b/.github/workflows/linux_jdk11.yml @@ -26,7 +26,9 @@ 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: | diff --git a/.github/workflows/linux_jdk17.yml b/.github/workflows/linux_jdk17.yml index dbf7dcf0ef8..ace8011e4e9 100644 --- a/.github/workflows/linux_jdk17.yml +++ b/.github/workflows/linux_jdk17.yml @@ -26,7 +26,9 @@ 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: | diff --git a/.github/workflows/linux_jdk8.yml b/.github/workflows/linux_jdk8.yml index 64426fa08f1..aa6ff3f956c 100644 --- a/.github/workflows/linux_jdk8.yml +++ b/.github/workflows/linux_jdk8.yml @@ -26,7 +26,9 @@ 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: | From 63e583de5bd784af37e7061f95a48bc4c0d0fc17 Mon Sep 17 00:00:00 2001 From: aaime Date: Tue, 31 May 2022 09:52:07 +0200 Subject: [PATCH 3/3] Trying to peg Sphinx to 4.5 --- .github/workflows/linux_jdk11.yml | 2 +- .github/workflows/linux_jdk17.yml | 2 +- .github/workflows/linux_jdk8.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux_jdk11.yml b/.github/workflows/linux_jdk11.yml index 3d54d3bd8e2..f6658ed915f 100644 --- a/.github/workflows/linux_jdk11.yml +++ b/.github/workflows/linux_jdk11.yml @@ -32,7 +32,7 @@ jobs: - 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_jdk17.yml b/.github/workflows/linux_jdk17.yml index ace8011e4e9..ec85a29b3fb 100644 --- a/.github/workflows/linux_jdk17.yml +++ b/.github/workflows/linux_jdk17.yml @@ -32,7 +32,7 @@ jobs: - 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 aa6ff3f956c..fd320aaec28 100644 --- a/.github/workflows/linux_jdk8.yml +++ b/.github/workflows/linux_jdk8.yml @@ -32,7 +32,7 @@ jobs: - 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