From ff1c9ff4b1e14ac9d611b5f282013ca921c620f0 Mon Sep 17 00:00:00 2001 From: Sergiy Markin Date: Tue, 8 Oct 2024 15:21:18 +0000 Subject: [PATCH] Bump up docker Pypi module version Also updated docs generation code caused by deprecated properties in recent version of Sphinx. Change-Id: Ic5ddf021e62be9748097bd5cc72ffc159f95db12 --- doc/requirements.txt | 2 +- doc/source/conf.py | 5 ++--- tools/gate/playbooks/docker-image-build.yaml | 4 +--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index 0ea9ffe6..965350b6 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,7 +1,7 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -docutils<=0.17 +docutils plantuml reno sphinx-rtd-theme diff --git a/doc/source/conf.py b/doc/source/conf.py index c8a89190..47cba8f4 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -97,12 +97,11 @@ todo_include_todos = False # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. # -import sphinx_rtd_theme +# import sphinx_rtd_theme html_logo = '_static/airship.logo.white.svg' html_theme = "sphinx_rtd_theme" -html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] +# html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] html_theme_options = { - 'display_version': False, 'logo_only': True } diff --git a/tools/gate/playbooks/docker-image-build.yaml b/tools/gate/playbooks/docker-image-build.yaml index b1fe9c64..e7e63e97 100644 --- a/tools/gate/playbooks/docker-image-build.yaml +++ b/tools/gate/playbooks/docker-image-build.yaml @@ -52,7 +52,6 @@ block: - pip: name: docker - version: 4.4.4 executable: pip3 become: True @@ -60,7 +59,6 @@ block: - pip: name: tox - version: 3.28.0 executable: pip3 become: True @@ -69,7 +67,7 @@ when: not publish shell: | set -ex - sudo -E -H pip3 install tox==3.28.0 + sudo -E -H pip3 install tox make run_images args: chdir: "{{ zuul.project.src_dir }}"