[arrow] 03/12: GH-35404: [Docs] Fix logo url and temporarily pin sphinx to 5.x to (#35405)

[ra...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

raulcd pushed a commit to branch maint-12.0.x
in repository https://gitbox.apache.org/repos/asf/arrow.git

commit 59f546c0c833ff798bbca1e4eafc977626ea2025
Author: Joris Van den Bossche <jo...@gmail.com>
AuthorDate: Thu May 4 08:47:48 2023 +0200

    GH-35404: [Docs] Fix logo url and temporarily pin sphinx to 5.x to  (#35405)
    
    See https://github.com/apache/arrow/issues/35403 about requiring some fixes on our side to support sphinx 6. Until then, let's pin sphinx to <6.
    
    * Closes: #35404
    * Closes: #35406
    
    Authored-by: Joris Van den Bossche <jo...@gmail.com>
    Signed-off-by: Joris Van den Bossche <jo...@gmail.com>
---
 ci/conda_env_sphinx.txt                  | 2 +-
 docs/requirements.txt                    | 2 +-
 docs/source/_templates/docs-sidebar.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/conda_env_sphinx.txt b/ci/conda_env_sphinx.txt
index 1274be50fd..22bb4fda06 100644
--- a/ci/conda_env_sphinx.txt
+++ b/ci/conda_env_sphinx.txt
@@ -22,7 +22,7 @@ ipython
 numpydoc
 pydata-sphinx-theme==0.8
 sphinx-design
-sphinx>=4.2
+sphinx>=4.2,<6
 sphinx-copybutton
 # Requirement for doctest-cython
 pytest-cython
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 26f6cab0b3..d447d0c38b 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -8,5 +8,5 @@ numpydoc
 pydata-sphinx-theme==0.8
 sphinx-design
 sphinx-copybutton
-sphinx>=4.2
+sphinx>=4.2,<6
 pandas
diff --git a/docs/source/_templates/docs-sidebar.html b/docs/source/_templates/docs-sidebar.html
index 64aee59ed4..26d42a82f1 100644
--- a/docs/source/_templates/docs-sidebar.html
+++ b/docs/source/_templates/docs-sidebar.html
@@ -1,6 +1,6 @@
 
 <a class="navbar-brand" href="{{ pathto(master_doc) }}">
-  <img src="{{ pathto('_static/' + logo_url, 1) }}" class="logo" alt="logo">
+  <img src="{{ logo_url|e }}" class="logo" alt="logo">
 </a>
 
 <div id="version-search-wrapper">