chore: mypy type corrections

Author: tony

docs/conf.py

@@ -15,7 +15,7 @@
 sys.path.insert(0, str(doc_path / "_ext"))
 
 # package data
-about = {}
+about: dict = {}
 with open(project_root / "libvcs" / "__about__.py") as fp:
     exec(fp.read(), about)
 
@@ -59,7 +59,7 @@
 html_favicon = "_static/favicon.ico"
 html_theme = "furo"
 html_theme_path = []
-html_theme_options = {
+html_theme_options: dict = {
     "light_logo": "img/libvcs.svg",
     "dark_logo": "img/libvcs.svg",
     "footer_icons": [

libvcs/conftest.py

@@ -11,7 +11,7 @@
 from faker import Faker
 
 from libvcs._internal.run import run, which
-from libvcs.projects.git import GitProject, GitRemoteDict
+from libvcs.projects.git import GitProject, GitRemote
 
 skip_if_git_missing = pytest.mark.skipif(
     not which("git"), reason="git is not available"
@@ -322,11 +322,10 @@ def git_repo(projects_path: pathlib.Path, git_remote_repo: pathlib.Path):
         url=f"file://{git_remote_repo}",
         dir=str(projects_path / "git_repo"),
         remotes={
-            "origin": GitRemoteDict(
-                **{
-                    "push_url": f"file://{git_remote_repo}",
-                    "fetch_url": f"file://{git_remote_repo}",
-                }
+            "origin": GitRemote(
+                name="origin",
+                push_url=f"file://{git_remote_repo}",
+                fetch_url=f"file://{git_remote_repo}",
             )
         },
     )

libvcs/projects/git.py

@@ -51,7 +51,7 @@ def to_tuple(self):
 
 GitProjectRemoteDict = Dict[str, GitRemote]
 GitFullRemoteDict = Dict[str, GitRemoteDict]
-GitRemotesArgs = Union[None, GitFullRemoteDict, Dict[str, str]]
+GitRemotesArgs = Union[None, GitFullRemoteDict, GitProjectRemoteDict, Dict[str, str]]
 
 
 @dataclasses.dataclass
@@ -152,6 +152,7 @@ def convert_pip_url(pip_url: str) -> VCSLocation:
 class GitProject(BaseProject):
     bin_name = "git"
     schemes = ("git", "git+http", "git+https", "git+ssh", "git+git", "git+file")
+    _remotes: GitProjectRemoteDict
 
     def __init__(
         self, url: str, dir: str, remotes: GitRemotesArgs = None, *args, **kwargs

tests/_internal/subprocess/test_SubprocessCommand.py

@@ -132,7 +132,7 @@ def test_init_and_check_output(args: list, kwargs: dict, expected_result: Any):
     ids=idfn,
 )
 def test_run(tmp_path: pathlib.Path, args: list, kwargs: dict, run_kwargs: dict):
-    cmd = SubprocessCommand(*args, cwd=tmp_path, **kwargs)
+    cmd = SubprocessCommand(cwd=tmp_path, *args, **kwargs)
     response = cmd.run(**run_kwargs)
 
     assert response.returncode == 0

tests/projects/test_git.py

@@ -424,7 +424,10 @@ def test_remotes_update_repo(
     git_repo: GitProject = constructor(**lazy_constructor_options(**locals()))
     git_repo.obtain()
 
-    git_repo._remotes |= lazy_remote_dict(**locals())
+    git_repo._remotes |= {
+        k: GitRemote(*v) if isinstance(v, dict) else v
+        for k, v in lazy_remote_dict(**locals()).items()
+    }
     git_repo.update_repo(set_remotes=True)
 
     expected = lazy_remote_expected(**locals())

tests/projects/test_svn.py

@@ -7,7 +7,6 @@
 from libvcs._internal.run import which
 from libvcs.conftest import CreateProjectCallbackFixtureProtocol
 from libvcs.projects.svn import SubversionProject
-from libvcs.shortcuts import create_project_from_pip_url
 
 if not which("svn"):
     pytestmark = pytest.mark.skip(reason="svn is not available")
@@ -16,11 +15,9 @@
 def test_repo_svn(tmp_path: pathlib.Path, svn_remote_repo):
     repo_name = "my_svn_project"
 
-    svn_repo = create_project_from_pip_url(
-        **{
-            "pip_url": f"svn+file://{svn_remote_repo}",
-            "dir": tmp_path / repo_name,
-        }
+    svn_repo = SubversionProject(
+        url=f"file://{svn_remote_repo}",
+        dir=str(tmp_path / repo_name),
     )
 
     svn_repo.obtain()