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)
 
@@ -58,8 +58,8 @@
 html_extra_path = ["manifest.json"]
 html_favicon = "_static/favicon.ico"
 html_theme = "furo"
-html_theme_path = []
-html_theme_options = {
+html_theme_path: list = []
+html_theme_options: dict = {
     "light_logo": "img/libvcs.svg",
     "dark_logo": "img/libvcs.svg",
     "footer_icons": [

libvcs/_internal/run.py

@@ -178,7 +178,7 @@ def run(
     shell: bool = False,
     cwd: Optional[StrOrBytesPath] = None,
     env: Optional[_ENV] = None,
-    universal_newlines: Optional[bool] = None,
+    universal_newlines: bool = False,
     startupinfo: Optional[Any] = None,
     creationflags: int = 0,
     restore_signals: bool = True,
@@ -262,15 +262,15 @@ def progress_cb(output, timestamp):
         umask=umask,
     )
 
-    all_output = []
+    all_output: list[str] = []
     code = None
     line = None
     while code is None:
         code = proc.poll()
 
         # output = console_to_str(proc.stdout.readline())
         # all_output.append(output)
-        if callback and callable(callback):
+        if callback and callable(callback) and proc.stderr is not None:
             line = console_to_str(proc.stderr.read(128))
             if line:
                 callback(output=line, timestamp=datetime.datetime.now())

libvcs/cmd/git.py

@@ -250,7 +250,7 @@ def clone(
         if template is not None:
             local_flags.append(f"--template={template}")
         if separate_git_dir is not None:
-            local_flags.append(f"--separate-git-dir={separate_git_dir}")
+            local_flags.append(f"--separate-git-dir={separate_git_dir!r}")
         if (filter := kwargs.pop("filter", None)) is not None:
             local_flags.append(f"--filter={filter}")
         if depth is not None:
@@ -388,7 +388,7 @@ def fetch(
         local_flags: list[str] = []
 
         if submodule_prefix is not None:
-            local_flags.append(f"--submodule-prefix={submodule_prefix}")
+            local_flags.append(f"--submodule-prefix={submodule_prefix!r}")
         if (filter := kwargs.pop("filter", None)) is not None:
             local_flags.append(f"--filter={filter}")
         if depth is not None:
@@ -561,7 +561,7 @@ def rebase(
         if onto:
             local_flags.extend(["--onto", onto])
         if context:
-            local_flags.extend(["--C", context])
+            local_flags.extend(["--C", str(context)])
 
         if exec:
             local_flags.extend(["--exec", shlex.quote(exec)])
@@ -864,7 +864,7 @@ def pull(
         # Fetch-related arguments
         #
         if submodule_prefix is not None:
-            local_flags.append(f"--submodule-prefix={submodule_prefix}")
+            local_flags.append(f"--submodule-prefix={submodule_prefix!r}")
         if (filter := kwargs.pop("filter", None)) is not None:
             local_flags.append(f"--filter={filter}")
         if depth is not None:
@@ -1007,7 +1007,7 @@ def init(
         if template is not None:
             local_flags.append(f"--template={template}")
         if separate_git_dir is not None:
-            local_flags.append(f"--separate-git-dir={separate_git_dir}")
+            local_flags.append(f"--separate-git-dir={separate_git_dir!r}")
         if object_format is not None:
             local_flags.append(f"--object-format={object_format}")
         if branch is not None:
@@ -1164,7 +1164,7 @@ def reset(
         if refresh is True:
             local_flags.append("--refresh")
         if pathspec_from_file is not None:
-            local_flags.append(f"--pathspec_from_file={pathspec_from_file}")
+            local_flags.append(f"--pathspec_from_file={pathspec_from_file!r}")
 
         # HEAD to commit form
         if soft is True:

libvcs/cmd/svn.py

@@ -257,7 +257,7 @@ def auth(
 
     def blame(
         self,
-        target: pathlib.Path,
+        target: StrOrBytesPath,
         *,
         revision: Union[RevisionLiteral, str] = None,
         verbose: Optional[bool] = None,

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

@@ -53,7 +53,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
@@ -123,6 +123,9 @@ def from_stdout(cls, value: str):
             re.VERBOSE | re.MULTILINE,
         )
         matches = pattern.search(value)
+
+        if matches is None:
+            raise Exception("Could not find match")
         return cls(**matches.groupdict())
 
 
@@ -154,6 +157,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: StrPath, remotes: GitRemotesArgs = None, **kwargs
@@ -226,7 +230,11 @@ def __init__(
                     )
                 elif isinstance(remote_url, dict):
                     self._remotes[remote_name] = GitRemote(
-                        **{**remote_url, "name": remote_name}
+                        **{
+                            "fetch_url": remote_url["fetch_url"],
+                            "push_url": remote_url["push_url"],
+                            "name": remote_name,
+                        }
                     )
                 elif isinstance(remote_url, GitRemote):
                     self._remotes[remote_name] = remote_url
@@ -238,13 +246,15 @@ def __init__(
                 push_url=url,
             )
         super().__init__(url=url, dir=dir, **kwargs)
-        self.url = self.chomp_protocol(
-            (
-                self._remotes.get("origin")
-                if "origin" in self._remotes
-                else next(iter(self._remotes.items()))[1]
-            ).fetch_url
+
+        origin = (
+            self._remotes.get("origin")
+            if "origin" in self._remotes
+            else next(iter(self._remotes.items()))[1]
         )
+        if origin is None:
+            raise Exception("Missing origin")
+        self.url = self.chomp_protocol(origin.fetch_url)
 
     @classmethod
     def from_pip_url(cls, pip_url, **kwargs):
@@ -376,6 +386,8 @@ def update_repo(self, set_remotes: bool = False, *args, **kwargs):
                 show_ref_output,
                 re.MULTILINE,
             )
+            if m is None:
+                raise exc.CommandError("Could not fetch remote names")
             git_remote_name = m.group("git_remote_name")
             git_tag = m.group("git_tag")
         self.log.debug("git_remote_name: %s" % git_remote_name)
@@ -497,15 +509,15 @@ def remotes(self, flat=False) -> Dict:
         remotes = {}
 
         cmd = self.run(["remote"])
-        ret = filter(None, cmd.split("\n"))
+        ret: filter[str] = filter(None, cmd.split("\n"))
 
         for remote_name in ret:
-            remotes[remote_name] = (
-                self.remote(remote_name) if flat else self.remote(remote_name).to_dict()
-            )
+            remote = self.remote(remote_name)
+            if remote is not None:
+                remotes[remote_name] = remote if flat else remote.to_dict()
         return remotes
 
-    def remote(self, name, **kwargs) -> GitRemote:
+    def remote(self, name, **kwargs) -> Optional[GitRemote]:
         """Get the fetch and push URL for a specified remote name.
 
         Parameters

tests/_internal/subprocess/test_SubprocessCommand.py

@@ -132,7 +132,8 @@ 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)
+    kwargs["cwd"] = tmp_path
+    cmd = SubprocessCommand(*args, **kwargs)
     response = cmd.run(**run_kwargs)
 
     assert response.returncode == 0

tests/projects/test_base.py

@@ -43,7 +43,7 @@ def test_convert_pip_url():
 
 
 def test_progress_callback(
-    capsys: pytest.LogCaptureFixture,
+    capsys: pytest.CaptureFixture[str],
     tmp_path: pathlib.Path,
     git_remote_repo: pathlib.Path,
 ):

tests/projects/test_git.py

@@ -311,11 +311,15 @@ def test_remotes(
     expected = lazy_remote_expected(**locals())
     assert len(expected.keys()) > 0
     for expected_remote_name, expected_remote_url in expected.items():
-        assert (
-            expected_remote_name,
-            expected_remote_url,
-            expected_remote_url,
-        ) == git_repo.remote(expected_remote_name).to_tuple()
+        remote = git_repo.remote(expected_remote_name)
+        assert remote is not None
+
+        if remote is not None:
+            assert (
+                expected_remote_name,
+                expected_remote_url,
+                expected_remote_url,
+            ) == remote.to_tuple()
 
 
 @pytest.mark.parametrize(
@@ -424,7 +428,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())
@@ -558,7 +565,10 @@ def test_set_remote(git_repo: GitProject, repo_name: str, new_repo_url: str):
     assert isinstance(
         git_repo.remote(name=repo_name), GitRemote
     ), "remote() returns GitRemote"
-    assert "file:///" in git_repo.remote(name=repo_name).fetch_url, "new value set"
+    remote = git_repo.remote(name=repo_name)
+    assert remote is not None, "Remote should exist"
+    if remote is not None:
+        assert "file:///" in remote.fetch_url, "new value set"
 
     assert "myrepo" in git_repo.remotes(), ".remotes() returns new remote"
 
@@ -570,9 +580,12 @@ def test_set_remote(git_repo: GitProject, repo_name: str, new_repo_url: str):
 
     mynewremote = git_repo.set_remote(name="myrepo", url=new_repo_url, overwrite=True)
 
-    assert (
-        new_repo_url in git_repo.remote(name="myrepo").fetch_url
-    ), "Running remove_set should overwrite previous remote"
+    remote = git_repo.remote(name="myrepo")
+    assert remote is not None
+    if remote is not None:
+        assert (
+            new_repo_url in remote.fetch_url
+        ), "Running remove_set should overwrite previous remote"
 
 
 def test_get_git_version(git_repo: GitProject):

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()