!squash more Remove unused tuples dicts

Author: tony

libvcs/projects/git.py

@@ -18,8 +18,7 @@
 import logging
 import pathlib
 import re
-import typing
-from typing import Any, Dict, NamedTuple, Optional, TypedDict, Union
+from typing import Any, Dict, Optional, Union
 from urllib import parse as urlparse
 
 from libvcs._internal.types import StrOrBytesPath, StrPath
@@ -34,22 +33,6 @@
 logger = logging.getLogger(__name__)
 
 
-class GitRemoteDict(TypedDict):
-    """For use when hydrating GitProject via dict, and exporting as dict."""
-
-    name: Optional[str]
-    fetch_url: str
-    push_url: str
-
-
-class GitRemoteTuple(NamedTuple):
-    """For use when exporting GitRemote as tuple."""
-
-    name: Optional[str]
-    fetch_url: str
-    push_url: str
-
-
 @dataclasses.dataclass
 class GitRemote:
     """Structure containing git working copy information."""
@@ -58,31 +41,9 @@ class GitRemote:
     fetch_url: str
     push_url: str
 
-    def to_tuple(self) -> GitRemoteTuple:
-        return GitRemoteTuple(*dataclasses.astuple(self))
-
 
 GitProjectRemoteDict = Dict[str, GitRemote]
-GitFullRemoteDict = Dict[str, GitRemoteDict]
-GitRemotesArgs = Union[None, GitFullRemoteDict, GitProjectRemoteDict, Dict[str, str]]
-
-
-class GitStatusDict(TypedDict):
-    branch_oid: Optional[str]
-    branch_head: Optional[str]
-    branch_upstream: Optional[str]
-    branch_ab: Optional[str]
-    branch_ahead: Optional[str]
-    branch_behind: Optional[str]
-
-
-class GitStatusTuple(typing.NamedTuple):
-    branch_oid: Optional[str]
-    branch_head: Optional[str]
-    branch_upstream: Optional[str]
-    branch_ab: Optional[str]
-    branch_ahead: Optional[str]
-    branch_behind: Optional[str]
+GitRemotesArgs = Union[None, GitProjectRemoteDict, Dict[str, str]]
 
 
 @dataclasses.dataclass
@@ -94,9 +55,6 @@ class GitStatus:
     branch_ahead: Optional[str] = None
     branch_behind: Optional[str] = None
 
-    def to_tuple(self) -> GitStatusTuple:
-        return GitStatusTuple(*dataclasses.astuple(self))
-
     @classmethod
     def from_stdout(cls, value: str) -> "GitStatus":
         """Returns ``git status -sb --porcelain=2`` extracted to a dict

tests/projects/test_git.py

@@ -14,7 +14,6 @@
 from libvcs._internal.shortcuts import create_project
 from libvcs.conftest import CreateProjectCallbackFixtureProtocol
 from libvcs.projects.git import (
-    GitFullRemoteDict,
     GitProject,
     GitRemote,
     GitStatus,
@@ -28,7 +27,6 @@
 ProjectTestFactory = Callable[..., GitProject]
 ProjectTestFactoryLazyKwargs = Callable[..., dict]
 ProjectTestFactoryRemoteLazyExpected = Callable[..., Dict[str, GitRemote]]
-ProjectTestFactoryRemoteDictLazyExpected = Callable[..., GitFullRemoteDict]
 
 
 @pytest.mark.parametrize(
@@ -372,11 +370,9 @@ def test_remotes(
         assert remote is not None
 
         if remote is not None:
-            assert (
-                expected_remote_name,
-                expected_remote_dict.fetch_url,
-                expected_remote_dict.push_url,
-            ) == remote.to_tuple()
+            assert expected_remote_name == remote.name
+            assert expected_remote_dict.fetch_url == remote.fetch_url
+            assert expected_remote_dict.push_url == remote.push_url
 
 
 @pytest.mark.parametrize(
@@ -472,7 +468,7 @@ def test_remotes_update_repo(
     git_remote_repo: pathlib.Path,
     constructor: ProjectTestFactory,
     lazy_constructor_options: ProjectTestFactoryLazyKwargs,
-    lazy_remote_dict: ProjectTestFactoryRemoteDictLazyExpected,
+    lazy_remote_dict: ProjectTestFactoryRemoteLazyExpected,
     lazy_remote_expected: ProjectTestFactoryRemoteLazyExpected,
     create_git_remote_repo: CreateProjectCallbackFixtureProtocol,
 ) -> None: