From ec0c13c26dfa33a9caa21cc6ea3186da08c7e094 Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
Date: Sat, 16 Apr 2022 19:02:38 +0100
Subject: [PATCH] Don't use deprecated `setup.py build_sphinx`

---
 doc/conf.py | 4 ++--
 setup.cfg   | 3 ---
 tox.ini     | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/doc/conf.py b/doc/conf.py
index af84b2f5d90..8da5f4b1617 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -148,9 +148,9 @@ def linkify_issues_in_changelog(app, docname, source):
         # this path trickery is needed because this script can
         # be invoked with different working directories:
         # * running make in docs/
-        # * running python setup.py build_sphinx in the repo root dir
+        # * running tox -e docs in the repo root dir
 
-        with open(changelog_path) as f:
+        with open(changelog_path, encoding="utf-8") as f:
             changelog = f.read()
 
         def linkify(match):
diff --git a/setup.cfg b/setup.cfg
index 598b4e82399..aa8d8409a21 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,9 +9,6 @@ tag_date = true
 release = egg_info -Db ''
 upload = upload --sign --identity=36580288
 
-[build_sphinx]
-warning-is-error = 1
-
 [extract_messages]
 mapping_file = babel.cfg
 output_file = sphinx/locale/sphinx.pot
diff --git a/tox.ini b/tox.ini
index f0afd779b6a..ca540944369 100644
--- a/tox.ini
+++ b/tox.ini
@@ -83,7 +83,7 @@ description =
 extras =
     docs
 commands =
-    python setup.py build_sphinx {posargs}
+    python -m sphinx -M html ./doc ./build/sphinx -W
 
 [testenv:docslint]
 basepython = python3