From 525e257b74a3bea4eae471ca34073ae3de4ca1c7 Mon Sep 17 00:00:00 2001
From: Sergiy Markin <smarkin@mirantis.com>
Date: Tue, 8 Oct 2024 16:56:15 +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: I7674fa83e4aef32b50ac1d8a25564449d59f6b8b
---
 .readthedocs.yaml                            | 8 +++++---
 doc/source/conf.py                           | 3 +--
 tools/zuul/playbooks/docker-image-build.yaml | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 65481f84..05b89471 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -17,11 +17,13 @@ sphinx:
 formats:
   - pdf
 
+build:
+  os: "ubuntu-22.04"
+  tools:
+    python: "3.10"
+
 # Optionally set the version of Python and requirements required to build your docs
 python:
-  version: 3.8
   install:
     - requirements: doc/requirements.txt
-    - requirements: requirements.txt
-    - requirements: requirements-direct.txt
     - requirements: requirements-frozen.txt
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 819f4622..e64e8019 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -85,9 +85,8 @@ 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_theme = "sphinx_rtd_theme"
-html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
diff --git a/tools/zuul/playbooks/docker-image-build.yaml b/tools/zuul/playbooks/docker-image-build.yaml
index 89508e7c..61d7c411 100644
--- a/tools/zuul/playbooks/docker-image-build.yaml
+++ b/tools/zuul/playbooks/docker-image-build.yaml
@@ -39,7 +39,6 @@
       block:
         - pip:
             name: docker
-            version: 4.4.4
             executable: pip3
       become: True
 
@@ -78,6 +77,7 @@
             username: "{{ airship_promenade_quay_creds.username }}"
             password: "{{ airship_promenade_quay_creds.password }}"
             registry_url: "https://quay.io/api/v1/"
+            api_version: "1.43"
 
         - make:
             chdir: "{{ zuul.project.src_dir }}"