Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions docs/source/_templates/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
{% extends "!layout.html" %}

{% block sidebartitle %}
<a href="{{ pathto(master_doc) }}">
{% set doc = root_doc if root_doc is defined else master_doc %}
<a href="{{ pathto(doc) }}">
{{ project }}
{%- set nav_version = version %}
{% if READTHEDOCS and current_version %}
Expand All @@ -15,7 +16,11 @@
<div class="trio-version">{{ nav_version }}</div>
{% endif %}
<br>
<img class="logo" src="{{ pathto('_static/' + logo, 1) }}" />
{% if logo_url is defined %}
<img class="logo" src="{{ logo_url }}" />
{% elif logo is defined %}
<img class="logo" src="{{ pathto('_static/' + logo, 1) }}" />
{% endif %}
</a>

{% include "searchbox.html" %}
Expand Down
3 changes: 0 additions & 3 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python3

Check failure on line 1 in docs/source/conf.py

View workflow job for this annotation

GitHub Actions / ruff

ruff (EXE001)

docs/source/conf.py:1:1: EXE001 Shebang is present but file is not executable
# -*- coding: utf-8 -*-

Check failure on line 2 in docs/source/conf.py

View workflow job for this annotation

GitHub Actions / ruff

ruff (UP009)

docs/source/conf.py:2:1: UP009 UTF-8 encoding declaration is unnecessary help: Remove unnecessary coding comment
#
# Documentation build configuration file, created by
Expand Down Expand Up @@ -101,7 +101,7 @@
# built documents.
#
# The short X.Y version.
import pytest_trio # noqa: E402

Check failure on line 104 in docs/source/conf.py

View workflow job for this annotation

GitHub Actions / ruff

ruff (RUF100)

docs/source/conf.py:104:21: RUF100 Unused `noqa` directive (non-enabled: `E402`) help: Remove unused `noqa` directive

version = pytest_trio.__version__
# The full version, including alpha/beta/rc tags.
Expand Down Expand Up @@ -143,10 +143,7 @@
# We have to set this ourselves, not only because it's useful for local
# testing, but also because if we don't then RTD will throw away our
# html_theme_options.
import sphinx_rtd_theme # noqa: E402

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
Expand Down
1 change: 1 addition & 0 deletions newsfragments/140.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix documentation build error with Sphinx >= 6 by using ``logo_url`` instead of ``logo`` in the HTML template.
Loading