Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade sphinx to ~7.1.2 #1954

Merged
merged 1 commit into from
Aug 18, 2024
Merged

Upgrade sphinx to ~7.1.2 #1954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions doc/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions git/index/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
from git.objects import Blob, Commit, Object, Submodule, Tree
from git.objects.util import Serializable
from git.util import (
Actor,
LazyMixin,
LockedFD,
join_path_native,
Expand Down Expand Up @@ -76,7 +77,6 @@

from git.refs.reference import Reference
from git.repo import Repo
from git.util import Actor


Treeish = Union[Tree, Commit, str, bytes]
Expand Down Expand Up @@ -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,
Expand Down
5 changes: 2 additions & 3 deletions git/objects/tag.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import sys

from git.compat import defenc
from git.util import hex_to_bin
from git.util import Actor, hex_to_bin

from . import base
from .util import get_object_type_by_name, parse_actor_and_date
Expand All @@ -30,7 +30,6 @@

if TYPE_CHECKING:
from git.repo import Repo
from git.util import Actor

from .blob import Blob
from .commit import Commit
Expand Down Expand Up @@ -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,
Expand Down
Loading