Merge pull request #1954 from EliahKagan/py313-doc

Upgrade sphinx to ~7.1.2

Author: Byron

doc/requirements.txt

@@ -1,8 +1,9 @@
-sphinx==4.3.2
+sphinx>=7.1.2, <7.2 ; python_version>="3.8"
+sphinx==4.3.2 ; python_version<"3.8"
+sphinxcontrib-applehelp>=1.0.2, <=1.0.4 ; python_version<"3.8"
+sphinxcontrib-devhelp==1.0.2 ; python_version<"3.8"
+sphinxcontrib-htmlhelp>=2.0.0, <=2.0.1 ; python_version<"3.8"
+sphinxcontrib-qthelp==1.0.3 ; python_version<"3.8"
+sphinxcontrib-serializinghtml==1.1.5 ; python_version<"3.8"
 sphinx_rtd_theme
-sphinxcontrib-applehelp>=1.0.2, <=1.0.4
-sphinxcontrib-devhelp==1.0.2
-sphinxcontrib-htmlhelp>=2.0.0, <=2.0.1
-sphinxcontrib-qthelp==1.0.3
-sphinxcontrib-serializinghtml==1.1.5
 sphinx-autodoc-typehints

git/index/base.py

@@ -28,6 +28,7 @@
 fromgit.objectsimportBlob, Commit, Object, Submodule, Tree
 fromgit.objects.utilimportSerializable
 fromgit.utilimport (
+Actor,
 LazyMixin,
 LockedFD,
 join_path_native,
@@ -76,7 +77,6 @@
 
 fromgit.refs.referenceimportReference
 fromgit.repoimportRepo
-fromgit.utilimportActor
 
 
 Treeish=Union[Tree, Commit, str, bytes]
@@ -1117,8 +1117,8 @@ def commit(
 message: str,
 parent_commits: Union[List[Commit], None] =None,
 head: bool=True,
-author: Union[None, "Actor"] =None,
-committer: Union[None, "Actor"] =None,
+author: Union[None, Actor] =None,
+committer: Union[None, Actor] =None,
 author_date: Union[datetime.datetime, str, None] =None,
 commit_date: Union[datetime.datetime, str, None] =None,
 skip_hooks: bool=False,

git/objects/tag.py

@@ -14,7 +14,7 @@
 importsys
 
 fromgit.compatimportdefenc
-fromgit.utilimporthex_to_bin
+fromgit.utilimportActor, hex_to_bin
 
 from . importbase
 from .utilimportget_object_type_by_name, parse_actor_and_date
@@ -30,7 +30,6 @@
 
 ifTYPE_CHECKING:
 fromgit.repoimportRepo
-fromgit.utilimportActor
 
 from .blobimportBlob
 from .commitimportCommit
@@ -64,7 +63,7 @@ def __init__(
 binsha: bytes,
 object: Union[None, base.Object] =None,
 tag: Union[None, str] =None,
-tagger: Union[None, "Actor"] =None,
+tagger: Union[None, Actor] =None,
 tagged_date: Union[int, None] =None,
 tagger_tz_offset: Union[int, None] =None,
 message: Union[str, None] =None,