Update Sphinx to ^7.1.0 (#828)

Fixes #815 in a more complete way (hopefully)

Author: chrisrink10

CHANGELOG.md

@@ -43,8 +43,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Other
  * Improve the state of the Python type hints in `basilisp.lang.*` (#797, #784)
- * Pin the `sphinxcontrib-*` dependencies versions to fix Read The Docs builds issue (#815)
-
+ * Update Sphinx and its associated contrib libraries to `^7.1.0` (#815)
 
 ## [v0.1.0b0]
 ### Added

docs/requirements.txt

@@ -1,11 +1,10 @@
-sphinx~=4.4.0
-sphinx-rtd-theme==1.3.0
-# The Read the Docs CI build is facing an issue where it doesn't
-# automatically identify the correct dependencies versions compatible
-# with Sphinx 4.4.0.  As a result, we need to explicitly specify these
-# versions.
-sphinxcontrib-applehelp==1.0.4
-sphinxcontrib-devhelp==1.0.2
-sphinxcontrib-htmlhelp==2.0.1
-sphinxcontrib-qthelp==1.0.3
-sphinxcontrib-serializinghtml==1.1.5
+# Ensure the Sphinx version remains synchronized with pyproject.toml
+# to maintain consistent output during both development and publishing
+# on Read The Docs.
+sphinx>=7.1.0,<8.0.0
+sphinx-rtd-theme>=2.0.0,<3.0.0
+sphinxcontrib-applehelp>=1.0.8,<2.0.0
+sphinxcontrib-devhelp>=1.0.6,<2.0.0
+sphinxcontrib-htmlhelp>=2.0.5,<3.0.0
+sphinxcontrib-qthelp>=1.0.7,<2.0.0
+sphinxcontrib-serializinghtml>=1.1.10,<2.0.0

pyproject.toml

@@ -50,11 +50,11 @@ isort = "*"
 pygments = "*"
 pytest = "^7.0.0"
 pytest-pycharm = "*"
-# Ensure the Sphinx version remains synchronized with
-# docs/requirements.txt to maintain consistent output during both
-# development and publishing on Read The Docs.
-sphinx = "~=4.4.0"
-sphinx-rtd-theme = "1.3.0"
+# Ensure the Sphinx version remains synchronized with docs/requirements.txt
+# to maintain consistent output during both development and publishing on
+# Read The Docs.
+sphinx = "^7.1.0"
+sphinx-rtd-theme = "^2.0.0"
 tox = "*"
 
 [tool.poetry.extras]

src/basilisp/contrib/sphinx/autodoc.py

@@ -5,11 +5,10 @@
 import types
 from typing import Any, Dict, List, Optional, Tuple, cast
 
-from sphinx.ext.autodoc import (  # pylint: disable=no-name-in-module
+from sphinx.ext.autodoc import (
     ClassDocumenter,
     Documenter,
     ObjectMember,
-    ObjectMembers,
     bool_option,
     exclude_members_option,
     identity,
@@ -126,7 +125,7 @@ def get_doc(self) -> Optional[List[List[str]]]:
         assert self.object is not None
         return _get_doc(self.object)
 
-    def get_object_members(self, want_all: bool) -> Tuple[bool, ObjectMembers]:
+    def get_object_members(self, want_all: bool) -> Tuple[bool, List[ObjectMember]]:
         assert self.object is not None
         interns = self.object.interns
 
@@ -145,7 +144,7 @@ def get_object_members(self, want_all: bool) -> Tuple[bool, ObjectMembers]:
         return False, selected
 
     def filter_members(
-        self, members: ObjectMembers, want_all: bool
+        self, members: List[ObjectMember], want_all: bool
     ) -> List[Tuple[str, Any, bool]]:
         filtered = []
         for name, val in members:
@@ -269,9 +268,9 @@ def get_sourcename(self) -> str:
             return f"{file}:docstring of {self.object}"
         return f"docstring of {self.object}"
 
-    def get_object_members(self, want_all: bool) -> Tuple[bool, ObjectMembers]:
+    def get_object_members(self, want_all: bool) -> Tuple[bool, List[ObjectMember]]:
         assert self.object is not None
-        return False, ()
+        return False, []
 
     def add_directive_header(self, sig: str) -> None:
         assert self.object is not None
@@ -364,7 +363,7 @@ def can_document_member(
             and member.meta.val_at(_PROTOCOL_KW) is True
         )
 
-    def get_object_members(self, want_all: bool) -> Tuple[bool, ObjectMembers]:
+    def get_object_members(self, want_all: bool) -> Tuple[bool, List[ObjectMember]]:
         assert self.object is not None
         assert want_all
         ns = self.object.ns
@@ -382,7 +381,7 @@ def get_object_members(self, want_all: bool) -> Tuple[bool, ObjectMembers]:
         )
 
     def filter_members(
-        self, members: ObjectMembers, want_all: bool
+        self, members: List[ObjectMember], want_all: bool
     ) -> List[Tuple[str, Any, bool]]:
         filtered = []
         for name, val in members:
@@ -419,7 +418,7 @@ def can_document_member(
             and issubclass(member.value, IType)
         )
 
-    def get_object_members(self, want_all: bool) -> Tuple[bool, ObjectMembers]:
+    def get_object_members(self, want_all: bool) -> Tuple[bool, List[ObjectMember]]:
         return ClassDocumenter.get_object_members(self, want_all)