Fix mypy issues in primer

Author: DanielNoord

pylint/testutils/_primer/package_to_lint.py

@@ -7,7 +7,8 @@
 import logging
 from pathlib import Path
 
-import git
+from git.cmd import Git
+from git.repo import Repo
 
 PRIMER_DIRECTORY_PATH = Path("tests") / ".pylint_primer_tests"
 
@@ -92,22 +93,22 @@ def lazy_clone(self) -> str:  # pragma: no cover
                 "depth": 1,
             }
             logging.info("Directory does not exists, cloning: %s", options)
-            repo = git.Repo.clone_from(**options)
-            return repo.head.object.hexsha
+            repo = Repo.clone_from(
+                url=self.url, to_path=self.clone_directory, branch=self.branch, depth=1
+            )
+            return str(repo.head.object.hexsha)
 
-        remote_sha1_commit = (
-            git.cmd.Git().ls_remote(self.url, self.branch).split("\t")[0]
-        )
-        local_sha1_commit = git.Repo(self.clone_directory).head.object.hexsha
+        remote_sha1_commit = Git().ls_remote(self.url, self.branch).split("\t")[0]
+        local_sha1_commit = Repo(self.clone_directory).head.object.hexsha
         if remote_sha1_commit != local_sha1_commit:
             logging.info(
                 "Remote sha is '%s' while local sha is '%s': pulling new commits",
                 remote_sha1_commit,
                 local_sha1_commit,
             )
-            repo = git.Repo(self.clone_directory)
+            repo = Repo(self.clone_directory)
             origin = repo.remotes.origin
             origin.pull()
         else:
             logging.info("Repository already up to date.")
-        return remote_sha1_commit
+        return str(remote_sha1_commit)

pylint/testutils/_primer/primer_prepare_command.py

@@ -3,7 +3,8 @@
 # Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 from __future__ import annotations
 
-import git
+from git.cmd import Git
+from git.repo import Repo
 
 from pylint.testutils._primer.primer_command import PrimerCommand
 
@@ -18,13 +19,13 @@ def run(self) -> None:
                 commit_string += local_commit + "_"
         elif self.config.check:
             for package, data in self.packages.items():
-                local_commit = git.Repo(data.clone_directory).head.object.hexsha
+                local_commit = Repo(data.clone_directory).head.object.hexsha
                 print(f"Found '{package}' at commit '{local_commit}'.")
                 commit_string += local_commit + "_"
         elif self.config.make_commit_string:
             for package, data in self.packages.items():
                 remote_sha1_commit = (
-                    git.cmd.Git().ls_remote(data.url, data.branch).split("\t")[0]
+                    Git().ls_remote(data.url, data.branch).split("\t")[0]
                 )
                 print(f"'{package}' remote is at commit '{remote_sha1_commit}'.")
                 commit_string += remote_sha1_commit + "_"