Update docs build configuration (#924)

* Use Python 3.11
* Use Sphinx 5 (and update extlinks configuration)
* Use Python 3 intersphinx mapping
* Install Babel from the build directory

Refs https://github.com/python-babel/babel/issues/920

diff --git a/.readthedocs.yml b/.readthedocs.yml
index a4a09ac652d5474ceb6ba460716882c0f9911ade..cc83f360b5eea5791b5c79fb059332e54582aeee 100644 (file)
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -3,10 +3,17 @@
 version: 2
 
 build:
-  os: ubuntu-20.04
+  os: ubuntu-22.04
   tools:
-    python: "3.9"
-
+    python: "3.11"
+  jobs:
+    pre_build:
+      # Replace any Babel version something may have pulled in
+      # with the copy we're working on.  We'll also need to build
+      # the data files at that point, or date formatting _within_
+      # Sphinx will fail.
+      - pip install -e .
+      - make import-cldr
 sphinx:
    configuration: docs/conf.py
 

diff --git a/docs/conf.py b/docs/conf.py
index 24c6ce2178dba8bad9e03042c6bc29dbe6e0a2a0..c0e23894b72a686b94add0e234b7f65002702945 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -251,10 +251,10 @@ texinfo_documents = [
 #texinfo_show_urls = 'footnote'
 
 intersphinx_mapping = {
-    'https://docs.python.org/2/': None,
+    'https://docs.python.org/3/': None,
 }
 
 extlinks = {
-    'gh': ('https://github.com/python-babel/babel/issues/%s', '#'),
-    'trac': ('http://babel.edgewall.org/ticket/%s', 'ticket #'),
+    'gh': ('https://github.com/python-babel/babel/issues/%s', '#%s'),
+    'trac': ('http://babel.edgewall.org/ticket/%s', 'ticket #%s'),
 }

diff --git a/docs/requirements.txt b/docs/requirements.txt
index aaedb2115dbe085d8eee01f53da757da7bd0e08a..c133306c70ffb973f6e31d61a56ba347c32a85e1 100644 (file)
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1 +1 @@
-Sphinx~=4.4.0
+Sphinx~=5.3.0