From b3dada9287033e4e81bc68320e01fd57bef02650 Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Tue, 8 Mar 2022 17:24:10 -0800 Subject: [PATCH] Fix: Update requirements.txt, update global-jjb There are known issues with the pinned Sphinx version. It no longer needs to be pinned, and in fact, can be entirely removed because it is a dependency of other requirements (this was implemented similarly on lftools). Issue: RELENG-4151 Signed-off-by: Eric Ball Change-Id: I1e269d846708b5ddd5e29e9e29e6013896a6815f --- docs/conf.py | 6 +++--- global-jjb | 2 +- requirements.txt | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 703a7b8..f3709ea 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -276,7 +276,7 @@ htmlhelp_basename = 'LinuxFoundationReleaseEngineeringPipelinesdoc' # Example configuration for intersphinx: refer to the Python standard library. intersphinx_mapping = { - 'jjb': ('https://docs.openstack.org/infra/jenkins-job-builder/', None), - 'lfdocs': ('http://docs.releng.linuxfoundation.org/en/latest/', None), - 'global-jjb': ('http://global-jjb.releng.linuxfoundation.org/en/latest/', None), + 'jjb': ('https://jenkins-job-builder.readthedocs.io/en/latest/', None), + 'lfdocs': ('https://docs.releng.linuxfoundation.org/en/latest/', None), + 'global-jjb': ('https://global-jjb.releng.linuxfoundation.org/en/latest/', None), } diff --git a/global-jjb b/global-jjb index 53f811d..70b380f 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit 53f811d91411bf26a4acf00a9244c6ea0f4510d5 +Subproject commit 70b380fccde98eaf35cc894795ff6736561ce6ce diff --git a/requirements.txt b/requirements.txt index 3885be6..9ac4dec 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ -reno~=2.11.2 -Sphinx~=2.3.1 -sphinx_bootstrap_theme~=0.7.1 +reno +sphinx_bootstrap_theme sphinxcontrib-programoutput yq -- 2.16.6