From 7a51d47abeece1b35c6190ad5cf6ac3bf6f1dcae Mon Sep 17 00:00:00 2001
From: Diego Ramirez <dr01191115@gmail.com>
Date: Tue, 6 Jul 2021 12:31:34 -0500
Subject: [PATCH 01/22] Complete type annotations: `pip/_internal/models`

Convert type commentaries into proper annotations.
---
 src/pip/_internal/models/candidate.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/pip/_internal/models/candidate.py b/src/pip/_internal/models/candidate.py
index 3b91704a21c..c673d8d05bd 100644
--- a/src/pip/_internal/models/candidate.py
+++ b/src/pip/_internal/models/candidate.py
@@ -10,8 +10,7 @@ class InstallationCandidate(KeyBasedCompareMixin):
 
     __slots__ = ["name", "version", "link"]
 
-    def __init__(self, name, version, link):
-        # type: (str, str, Link) -> None
+    def __init__(self, name: str, version: str, link: Link) -> None:
         self.name = name
         self.version = parse_version(version)
         self.link = link
@@ -21,14 +20,12 @@ def __init__(self, name, version, link):
             defining_class=InstallationCandidate
         )
 
-    def __repr__(self):
-        # type: () -> str
+    def __repr__(self) -> str:
         return "<InstallationCandidate({!r}, {!r}, {!r})>".format(
             self.name, self.version, self.link,
         )
 
-    def __str__(self):
-        # type: () -> str
+    def __str__(self) -> str:
         return '{!r} candidate (version {} at {})'.format(
             self.name, self.version, self.link,
         )

From 70e72f67043b7cd93737415469d5a6f113e509f5 Mon Sep 17 00:00:00 2001
From: Diego Ramirez <dr01191115@gmail.com>
Date: Tue, 6 Jul 2021 12:59:49 -0500
Subject: [PATCH 02/22] Convert commentaries into annotations

Fix them on "direct_url.py".
---
 src/pip/_internal/models/direct_url.py | 83 +++++++++++---------------
 1 file changed, 35 insertions(+), 48 deletions(-)

diff --git a/src/pip/_internal/models/direct_url.py b/src/pip/_internal/models/direct_url.py
index 345dbaf109a..15d9cd52231 100644
--- a/src/pip/_internal/models/direct_url.py
+++ b/src/pip/_internal/models/direct_url.py
@@ -22,8 +22,9 @@ class DirectUrlValidationError(Exception):
     pass
 
 
-def _get(d, expected_type, key, default=None):
-    # type: (Dict[str, Any], Type[T], str, Optional[T]) -> Optional[T]
+def _get(
+    d: Dict[str, str], expected_type: Type[T], key: str, default: Optional[T] = None
+) -> Optional[T]:
     """Get value from dictionary and verify expected type."""
     if key not in d:
         return default
@@ -37,16 +38,16 @@ def _get(d, expected_type, key, default=None):
     return value
 
 
-def _get_required(d, expected_type, key, default=None):
-    # type: (Dict[str, Any], Type[T], str, Optional[T]) -> T
+def _get_required(
+    d: Dict[str, Any], expected_type: Type[T], key: str, default: Optional[T] = None
+) -> T:
     value = _get(d, expected_type, key, default)
     if value is None:
         raise DirectUrlValidationError(f"{key} must have a value")
     return value
 
 
-def _exactly_one_of(infos):
-    # type: (Iterable[Optional[InfoType]]) -> InfoType
+def _exactly_one_of(infos: Iterable[Optional[InfoType]]) -> InfoType:
     infos = [info for info in infos if info is not None]
     if not infos:
         raise DirectUrlValidationError(
@@ -60,8 +61,7 @@ def _exactly_one_of(infos):
     return infos[0]
 
 
-def _filter_none(**kwargs):
-    # type: (Any) -> Dict[str, Any]
+def _filter_none(**kwargs: Any) -> Dict[str, Any]:
     """Make dict excluding None values."""
     return {k: v for k, v in kwargs.items() if v is not None}
 
@@ -71,12 +71,12 @@ class VcsInfo:
 
     def __init__(
         self,
-        vcs,  # type: str
-        commit_id,  # type: str
-        requested_revision=None,  # type: Optional[str]
-        resolved_revision=None,  # type: Optional[str]
-        resolved_revision_type=None,  # type: Optional[str]
-    ):
+        vcs: str,
+        commit_id: str,
+        requested_revision: Optional[str] = None,
+        resolved_revision: Optional[str] = None,
+        resolved_revision_type: Optional[str] = None,
+    ) -> None:
         self.vcs = vcs
         self.requested_revision = requested_revision
         self.commit_id = commit_id
@@ -84,8 +84,7 @@ def __init__(
         self.resolved_revision_type = resolved_revision_type
 
     @classmethod
-    def _from_dict(cls, d):
-        # type: (Optional[Dict[str, Any]]) -> Optional[VcsInfo]
+    def _from_dict(cls, d: Optional[Dict[str, Any]]) -> Optional["VcsInfo"]:
         if d is None:
             return None
         return cls(
@@ -96,8 +95,7 @@ def _from_dict(cls, d):
             resolved_revision_type=_get(d, str, "resolved_revision_type"),
         )
 
-    def _to_dict(self):
-        # type: () -> Dict[str, Any]
+    def _to_dict(self) -> Dict[str, Any]:
         return _filter_none(
             vcs=self.vcs,
             requested_revision=self.requested_revision,
@@ -112,19 +110,17 @@ class ArchiveInfo:
 
     def __init__(
         self,
-        hash=None,  # type: Optional[str]
-    ):
+        hash: Optional[str] = None,
+    ) -> None:
         self.hash = hash
 
     @classmethod
-    def _from_dict(cls, d):
-        # type: (Optional[Dict[str, Any]]) -> Optional[ArchiveInfo]
+    def _from_dict(cls, d: Optional[Dict[str, Any]]) -> Optional["ArchiveInfo"]:
         if d is None:
             return None
         return cls(hash=_get(d, str, "hash"))
 
-    def _to_dict(self):
-        # type: () -> Dict[str, Any]
+    def _to_dict(self) -> Dict[str, Any]:
         return _filter_none(hash=self.hash)
 
 
@@ -133,21 +129,19 @@ class DirInfo:
 
     def __init__(
         self,
-        editable=False,  # type: bool
-    ):
+        editable: bool = False,
+    ) -> None:
         self.editable = editable
 
     @classmethod
-    def _from_dict(cls, d):
-        # type: (Optional[Dict[str, Any]]) -> Optional[DirInfo]
+    def _from_dict(cls, d: Optional[Dict[str, Any]]) -> Optional["DirInfo"]:
         if d is None:
             return None
         return cls(
             editable=_get_required(d, bool, "editable", default=False)
         )
 
-    def _to_dict(self):
-        # type: () -> Dict[str, Any]
+    def _to_dict(self) -> Dict[str, Any]:
         return _filter_none(editable=self.editable or None)
 
 
@@ -158,16 +152,15 @@ class DirectUrl:
 
     def __init__(
         self,
-        url,  # type: str
-        info,  # type: InfoType
-        subdirectory=None,  # type: Optional[str]
-    ):
+        url: str,
+        info: InfoType,
+        subdirectory: Optional[str] = None,
+    ) -> None:
         self.url = url
         self.info = info
         self.subdirectory = subdirectory
 
-    def _remove_auth_from_netloc(self, netloc):
-        # type: (str) -> str
+    def _remove_auth_from_netloc(self, netloc: str) -> str:
         if "@" not in netloc:
             return netloc
         user_pass, netloc_no_user_pass = netloc.split("@", 1)
@@ -182,8 +175,7 @@ def _remove_auth_from_netloc(self, netloc):
         return netloc_no_user_pass
 
     @property
-    def redacted_url(self):
-        # type: () -> str
+    def redacted_url(self) -> str:
         """url with user:password part removed unless it is formed with
         environment variables as specified in PEP 610, or it is ``git``
         in the case of a git URL.
@@ -195,13 +187,11 @@ def redacted_url(self):
         )
         return surl
 
-    def validate(self):
-        # type: () -> None
+    def validate(self) -> None:
         self.from_dict(self.to_dict())
 
     @classmethod
-    def from_dict(cls, d):
-        # type: (Dict[str, Any]) -> DirectUrl
+    def from_dict(cls, d: Dict[str, Any]) -> "DirectUrl":
         return DirectUrl(
             url=_get_required(d, str, "url"),
             subdirectory=_get(d, str, "subdirectory"),
@@ -214,8 +204,7 @@ def from_dict(cls, d):
             ),
         )
 
-    def to_dict(self):
-        # type: () -> Dict[str, Any]
+    def to_dict(self) -> Dict[str, Any]:
         res = _filter_none(
             url=self.redacted_url,
             subdirectory=self.subdirectory,
@@ -224,10 +213,8 @@ def to_dict(self):
         return res
 
     @classmethod
-    def from_json(cls, s):
-        # type: (str) -> DirectUrl
+    def from_json(cls, s: str) -> DirectUrl:
         return cls.from_dict(json.loads(s))
 
-    def to_json(self):
-        # type: () -> str
+    def to_json(self) -> str:
         return json.dumps(self.to_dict(), sort_keys=True)

From bd6d16e98f09b8f119fe6606efb6f2f3446dbc90 Mon Sep 17 00:00:00 2001
From: Diego Ramirez <dr01191115@gmail.com>
Date: Tue, 6 Jul 2021 13:01:08 -0500
Subject: [PATCH 03/22] Create 10138.trivial.rst

The news entry for my pull request.
---
 news/10138.trivial.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 news/10138.trivial.rst

diff --git a/news/10138.trivial.rst b/news/10138.trivial.rst
new file mode 100644
index 00000000000..524867fd07d
--- /dev/null
+++ b/news/10138.trivial.rst
@@ -0,0 +1 @@
+Convert type commentaries to annotations on ``pip/_internal/models``.

From 51132af4deb6abbe3082079b287293c5e5bb620d Mon Sep 17 00:00:00 2001
From: Diego Ramirez <dr01191115@gmail.com>
Date: Tue, 6 Jul 2021 13:09:01 -0500
Subject: [PATCH 04/22] Fix forward references

Convert some annotations into strings.
---
 src/pip/_internal/models/direct_url.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pip/_internal/models/direct_url.py b/src/pip/_internal/models/direct_url.py
index 15d9cd52231..6ffdc4eccad 100644
--- a/src/pip/_internal/models/direct_url.py
+++ b/src/pip/_internal/models/direct_url.py
@@ -47,7 +47,7 @@ def _get_required(
     return value
 
 
-def _exactly_one_of(infos: Iterable[Optional[InfoType]]) -> InfoType:
+def _exactly_one_of(infos: Iterable[Optional["InfoType"]]) -> "InfoType":
     infos = [info for info in infos if info is not None]
     if not infos:
         raise DirectUrlValidationError(
@@ -213,7 +213,7 @@ def to_dict(self) -> Dict[str, Any]:
         return res
 
     @classmethod
-    def from_json(cls, s: str) -> DirectUrl:
+    def from_json(cls, s: str) -> "DirectUrl":
         return cls.from_dict(json.loads(s))
 
     def to_json(self) -> str:

From 1d3736798c919a6594a778a47a1fbbeb3fa61f99 Mon Sep 17 00:00:00 2001
From: Diego Ramirez <dr01191115@gmail.com>
Date: Tue, 6 Jul 2021 13:17:07 -0500
Subject: [PATCH 05/22] Convert commentaries into annotations

Fix them on "format_control.py".
---
 src/pip/_internal/models/format_control.py | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/pip/_internal/models/format_control.py b/src/pip/_internal/models/format_control.py
index cf262af2918..cdbf227f886 100644
--- a/src/pip/_internal/models/format_control.py
+++ b/src/pip/_internal/models/format_control.py
@@ -11,8 +11,9 @@ class FormatControl:
 
     __slots__ = ["no_binary", "only_binary"]
 
-    def __init__(self, no_binary=None, only_binary=None):
-        # type: (Optional[Set[str]], Optional[Set[str]]) -> None
+    def __init__(
+        self, no_binary: Optional[Set[str] = None, only_binary: Optional[Set[str]] = None
+                                  ) -> None:
         if no_binary is None:
             no_binary = set()
         if only_binary is None:
@@ -21,8 +22,7 @@ def __init__(self, no_binary=None, only_binary=None):
         self.no_binary = no_binary
         self.only_binary = only_binary
 
-    def __eq__(self, other):
-        # type: (object) -> bool
+    def __eq__(self, other: object) -> bool:
         if not isinstance(other, self.__class__):
             return NotImplemented
 
@@ -34,8 +34,7 @@ def __eq__(self, other):
             for k in self.__slots__
         )
 
-    def __repr__(self):
-        # type: () -> str
+    def __repr__(self) -> str:
         return "{}({}, {})".format(
             self.__class__.__name__,
             self.no_binary,
@@ -43,8 +42,7 @@ def __repr__(self):
         )
 
     @staticmethod
-    def handle_mutual_excludes(value, target, other):
-        # type: (str, Set[str], Set[str]) -> None
+    def handle_mutual_excludes(value: str, target: Set[str], other: Set[str]) -> None:
         if value.startswith('-'):
             raise CommandError(
                 "--no-binary / --only-binary option requires 1 argument."
@@ -66,8 +64,7 @@ def handle_mutual_excludes(value, target, other):
             other.discard(name)
             target.add(name)
 
-    def get_allowed_formats(self, canonical_name):
-        # type: (str) -> FrozenSet[str]
+    def get_allowed_formats(self, canonical_name: str) -> FrozenSet[str]:
         result = {"binary", "source"}
         if canonical_name in self.only_binary:
             result.discard('source')
@@ -79,8 +76,7 @@ def get_allowed_formats(self, canonical_name):
             result.discard('binary')
         return frozenset(result)
 
-    def disallow_binaries(self):
-        # type: () -> None
+    def disallow_binaries(self) -> None:
         self.handle_mutual_excludes(
             ':all:', self.no_binary, self.only_binary,
         )

From f21af9963394e7e10a28be025c488f9b2ade6a8c Mon Sep 17 00:00:00 2001
From: Diego Ramirez <dr01191115@gmail.com>
Date: Tue, 6 Jul 2021 13:18:56 -0500
Subject: [PATCH 06/22] Convert commentaries to annotations on `index.py`

---
 src/pip/_internal/models/index.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pip/_internal/models/index.py b/src/pip/_internal/models/index.py
index b148abb4250..1874a5b60de 100644
--- a/src/pip/_internal/models/index.py
+++ b/src/pip/_internal/models/index.py
@@ -8,8 +8,7 @@ class PackageIndex:
     __slots__ = ['url', 'netloc', 'simple_url', 'pypi_url',
                  'file_storage_domain']
 
-    def __init__(self, url, file_storage_domain):
-        # type: (str, str) -> None
+    def __init__(self, url: str, file_storage_domain: str) -> None:
         super().__init__()
         self.url = url
         self.netloc = urllib.parse.urlsplit(url).netloc
@@ -21,8 +20,7 @@ def __init__(self, url, file_storage_domain):
         # block such packages themselves
         self.file_storage_domain = file_storage_domain
 
-    def _url_for_path(self, path):
-        # type: (str) -> str
+    def _url_for_path(self, path: str) -> str:
         return urllib.parse.urljoin(self.url, path)
 
 

From 071048696886a9d56cfdce0795a731e3d3ad5ec4 Mon Sep 17 00:00:00 2001
From: Diego Ramirez <dr01191115@gmail.com>
Date: Tue, 6 Jul 2021 13:20:39 -0500
Subject: [PATCH 07/22] Fix an annotation syntax error

Add a missing bracket.
---
 src/pip/_internal/models/format_control.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/models/format_control.py b/src/pip/_internal/models/format_control.py
index cdbf227f886..ffa1d1179d6 100644
--- a/src/pip/_internal/models/format_control.py
+++ b/src/pip/_internal/models/format_control.py
@@ -12,7 +12,7 @@ class FormatControl:
     __slots__ = ["no_binary", "only_binary"]
 
     def __init__(
-        self, no_binary: Optional[Set[str] = None, only_binary: Optional[Set[str]] = None
+        self, no_binary: Optional[Set[str]] = None, only_binary: Optional[Set[str]] = None
                                   ) -> None:
         if no_binary is None:
             no_binary = set()

From b38584ca9ad7f8186f0f97c28b119e5f6def8666 Mon Sep 17 00:00:00 2001
From: Diego Ramirez <dr01191115@gmail.com>
Date: Tue, 6 Jul 2021 13:24:31 -0500
Subject: [PATCH 08/22] Fix a line lenght

The line was too long (90 > 88 characters).
---
 src/pip/_internal/models/format_control.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pip/_internal/models/format_control.py b/src/pip/_internal/models/format_control.py
index ffa1d1179d6..010c3620d4a 100644
--- a/src/pip/_internal/models/format_control.py
+++ b/src/pip/_internal/models/format_control.py
@@ -12,8 +12,10 @@ class FormatControl:
     __slots__ = ["no_binary", "only_binary"]
 
     def __init__(
-        self, no_binary: Optional[Set[str]] = None, only_binary: Optional[Set[str]] = None
-                                  ) -> None:
+        self,
+        no_binary: Optional[Set[str]] = None,
+        only_binary: Optional[Set[str]] = None
+    ) -> None:
         if no_binary is None:
             no_binary = set()
         if only_binary is None:

From adee2bcc1cc6087431c1d1ac88c032986d3675af Mon Sep 17 00:00:00 2001
From: Diego Ramirez <dr01191115@gmail.com>
Date: Tue, 6 Jul 2021 13:33:11 -0500
Subject: [PATCH 09/22] Convert commentaries into annotations

Fix them on "link.py".
---
 src/pip/_internal/models/link.py | 85 +++++++++++---------------------
 1 file changed, 30 insertions(+), 55 deletions(-)

diff --git a/src/pip/_internal/models/link.py b/src/pip/_internal/models/link.py
index ebee3839598..78b8e244b11 100644
--- a/src/pip/_internal/models/link.py
+++ b/src/pip/_internal/models/link.py
@@ -33,13 +33,12 @@ class Link(KeyBasedCompareMixin):
 
     def __init__(
         self,
-        url,                   # type: str
-        comes_from=None,       # type: Optional[Union[str, HTMLPage]]
-        requires_python=None,  # type: Optional[str]
-        yanked_reason=None,    # type: Optional[str]
-        cache_link_parsing=True,  # type: bool
-    ):
-        # type: (...) -> None
+        url: str,
+        comes_from: Optional[Union[HTMLPage]] = None,
+        requires_python: Optional[str] = None,
+        yanked_reason: Optional[str] = None,
+        cache_link_parsing: bool = True,
+    ) -> None:
         """
         :param url: url of the resource pointed to (href of the link)
         :param comes_from: instance of HTMLPage where the link was found,
@@ -78,8 +77,7 @@ def __init__(
 
         self.cache_link_parsing = cache_link_parsing
 
-    def __str__(self):
-        # type: () -> str
+    def __str__(self) -> str:
         if self.requires_python:
             rp = f' (requires-python:{self.requires_python})'
         else:
@@ -90,18 +88,15 @@ def __str__(self):
         else:
             return redact_auth_from_url(str(self._url))
 
-    def __repr__(self):
-        # type: () -> str
+    def __repr__(self) -> str:
         return f'<Link {self}>'
 
     @property
-    def url(self):
-        # type: () -> str
+    def url(self) -> str:
         return self._url
 
     @property
-    def filename(self):
-        # type: () -> str
+    def filename(self) -> str:
         path = self.path.rstrip('/')
         name = posixpath.basename(path)
         if not name:
@@ -115,48 +110,40 @@ def filename(self):
         return name
 
     @property
-    def file_path(self):
-        # type: () -> str
+    def file_path(self) -> str:
         return url_to_path(self.url)
 
     @property
-    def scheme(self):
-        # type: () -> str
+    def scheme(self) -> str:
         return self._parsed_url.scheme
 
     @property
-    def netloc(self):
-        # type: () -> str
+    def netloc(self) -> str:
         """
         This can contain auth information.
         """
         return self._parsed_url.netloc
 
     @property
-    def path(self):
-        # type: () -> str
+    def path(self) -> str:
         return urllib.parse.unquote(self._parsed_url.path)
 
-    def splitext(self):
-        # type: () -> Tuple[str, str]
+    def splitext(self) -> Tuple[str, str]:
         return splitext(posixpath.basename(self.path.rstrip('/')))
 
     @property
-    def ext(self):
-        # type: () -> str
+    def ext(self) -> str:
         return self.splitext()[1]
 
     @property
-    def url_without_fragment(self):
-        # type: () -> str
+    def url_without_fragment(self) -> str:
         scheme, netloc, path, query, fragment = self._parsed_url
         return urllib.parse.urlunsplit((scheme, netloc, path, query, ''))
 
     _egg_fragment_re = re.compile(r'[#&]egg=([^&]*)')
 
     @property
-    def egg_fragment(self):
-        # type: () -> Optional[str]
+    def egg_fragment(self) -> Optional[str]:
         match = self._egg_fragment_re.search(self._url)
         if not match:
             return None
@@ -165,8 +152,7 @@ def egg_fragment(self):
     _subdirectory_fragment_re = re.compile(r'[#&]subdirectory=([^&]*)')
 
     @property
-    def subdirectory_fragment(self):
-        # type: () -> Optional[str]
+    def subdirectory_fragment(self) -> Optional[str]:
         match = self._subdirectory_fragment_re.search(self._url)
         if not match:
             return None
@@ -177,59 +163,49 @@ def subdirectory_fragment(self):
     )
 
     @property
-    def hash(self):
-        # type: () -> Optional[str]
+    def hash(self) -> Optional[str]:
         match = self._hash_re.search(self._url)
         if match:
             return match.group(2)
         return None
 
     @property
-    def hash_name(self):
-        # type: () -> Optional[str]
+    def hash_name(self) -> Optional[str]:
         match = self._hash_re.search(self._url)
         if match:
             return match.group(1)
         return None
 
     @property
-    def show_url(self):
-        # type: () -> str
+    def show_url(self) -> str:
         return posixpath.basename(self._url.split('#', 1)[0].split('?', 1)[0])
 
     @property
-    def is_file(self):
-        # type: () -> bool
+    def is_file(self) -> bool:
         return self.scheme == 'file'
 
-    def is_existing_dir(self):
-        # type: () -> bool
+    def is_existing_dir(self) -> bool:
         return self.is_file and os.path.isdir(self.file_path)
 
     @property
-    def is_wheel(self):
-        # type: () -> bool
+    def is_wheel(self) -> bool:
         return self.ext == WHEEL_EXTENSION
 
     @property
-    def is_vcs(self):
-        # type: () -> bool
+    def is_vcs(self) -> bool:
         from pip._internal.vcs import vcs
 
         return self.scheme in vcs.all_schemes
 
     @property
-    def is_yanked(self):
-        # type: () -> bool
+    def is_yanked(self) -> bool:
         return self.yanked_reason is not None
 
     @property
-    def has_hash(self):
-        # type: () -> bool
+    def has_hash(self) -> bool:
         return self.hash_name is not None
 
-    def is_hash_allowed(self, hashes):
-        # type: (Optional[Hashes]) -> bool
+    def is_hash_allowed(self, hashes: Optional[Hashes]) -> bool:
         """
         Return True if the link has a hash and it is allowed.
         """
@@ -243,6 +219,5 @@ def is_hash_allowed(self, hashes):
 
 
 # TODO: Relax this comparison logic to ignore, for example, fragments.
-def links_equivalent(link1, link2):
-    # type: (Link, Link) -> bool
+def links_equivalent(link1: Link, link2: Link) -> bool:
     return link1 == link2

From 462b67d82062381634660978285f19790f6a4385 Mon Sep 17 00:00:00 2001
From: Diego Ramirez <dr01191115@gmail.com>
Date: Tue, 6 Jul 2021 13:37:16 -0500
Subject: [PATCH 10/22] Convert commentaries into annotations

Fix them on "scheme.py".

Translate the original type hint commentary and add the return value (as "None").
---
 src/pip/_internal/models/scheme.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pip/_internal/models/scheme.py b/src/pip/_internal/models/scheme.py
index 697cd19b478..9a8dafba307 100644
--- a/src/pip/_internal/models/scheme.py
+++ b/src/pip/_internal/models/scheme.py
@@ -18,12 +18,12 @@ class Scheme:
 
     def __init__(
         self,
-        platlib,  # type: str
-        purelib,  # type: str
-        headers,  # type: str
-        scripts,  # type: str
-        data,  # type: str
-    ):
+        platlib: str,
+        purelib: str,
+        headers: str,
+        scripts: str,
+        data: str,
+    ) -> None:
         self.platlib = platlib
         self.purelib = purelib
         self.headers = headers

From 7e539698f58cb9929108767c4b20d30cfc0e3243 Mon Sep 17 00:00:00 2001
From: Diego Ramirez <dr01191115@gmail.com>
Date: Thu, 8 Jul 2021 14:12:48 -0500
Subject: [PATCH 11/22] Fix an annotation

The mypy test suggested to change this annotation:

    comes_from: Optional[Union[HTMLPage]] = None,

with this one:

    comes_from: Optional[HTMLPage] = None,
---
 src/pip/_internal/models/link.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/models/link.py b/src/pip/_internal/models/link.py
index 78b8e244b11..06d420b66b6 100644
--- a/src/pip/_internal/models/link.py
+++ b/src/pip/_internal/models/link.py
@@ -34,7 +34,7 @@ class Link(KeyBasedCompareMixin):
     def __init__(
         self,
         url: str,
-        comes_from: Optional[Union[HTMLPage]] = None,
+        comes_from: Optional[HTMLPage] = None,
         requires_python: Optional[str] = None,
         yanked_reason: Optional[str] = None,
         cache_link_parsing: bool = True,

From c54d539a68b5da2bfe91a309006b5e05848edb1d Mon Sep 17 00:00:00 2001
From: Diego Ramirez <dr01191115@gmail.com>
Date: Thu, 8 Jul 2021 14:21:58 -0500
Subject: [PATCH 12/22] Revert an unecessary annotation fix

It was not necessary (and it was incorrect). The required fix has not been defined yet.
---
 src/pip/_internal/models/link.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/models/link.py b/src/pip/_internal/models/link.py
index 06d420b66b6..78b8e244b11 100644
--- a/src/pip/_internal/models/link.py
+++ b/src/pip/_internal/models/link.py
@@ -34,7 +34,7 @@ class Link(KeyBasedCompareMixin):
     def __init__(
         self,
         url: str,
-        comes_from: Optional[HTMLPage] = None,
+        comes_from: Optional[Union[HTMLPage]] = None,
         requires_python: Optional[str] = None,
         yanked_reason: Optional[str] = None,
         cache_link_parsing: bool = True,

From 4bb4be8c9a73ab4e6be893c889304a033caf13e1 Mon Sep 17 00:00:00 2001
From: Diego Ramirez <dr01191115@gmail.com>
Date: Thu, 8 Jul 2021 21:59:43 -0500
Subject: [PATCH 13/22] Fix an annotation mistake

The argument "comes_from" can be "str" or "HTMLPage".
---
 src/pip/_internal/models/link.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/models/link.py b/src/pip/_internal/models/link.py
index 78b8e244b11..6db5675ac7a 100644
--- a/src/pip/_internal/models/link.py
+++ b/src/pip/_internal/models/link.py
@@ -34,7 +34,7 @@ class Link(KeyBasedCompareMixin):
     def __init__(
         self,
         url: str,
-        comes_from: Optional[Union[HTMLPage]] = None,
+        comes_from: Optional[Union[str, HTMLPage]] = None,
         requires_python: Optional[str] = None,
         yanked_reason: Optional[str] = None,
         cache_link_parsing: bool = True,

From 87d91bcdddb061840c9e1948aa80f6e7b3742df4 Mon Sep 17 00:00:00 2001
From: Diego Ramirez <dr01191115@gmail.com>
Date: Fri, 9 Jul 2021 13:04:02 -0500
Subject: [PATCH 14/22] Fix an annotation

Convert a failing annotation into a string.
---
 src/pip/_internal/models/link.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/models/link.py b/src/pip/_internal/models/link.py
index 6db5675ac7a..411cfb62489 100644
--- a/src/pip/_internal/models/link.py
+++ b/src/pip/_internal/models/link.py
@@ -34,7 +34,7 @@ class Link(KeyBasedCompareMixin):
     def __init__(
         self,
         url: str,
-        comes_from: Optional[Union[str, HTMLPage]] = None,
+        comes_from: Optional[Union[str, "HTMLPage"]] = None,
         requires_python: Optional[str] = None,
         yanked_reason: Optional[str] = None,
         cache_link_parsing: bool = True,

From f624f74491c7b564fc81b27e5d6194d3d7fae32d Mon Sep 17 00:00:00 2001
From: Diego Ramirez <dr01191115@gmail.com>
Date: Fri, 9 Jul 2021 13:05:48 -0500
Subject: [PATCH 15/22] Fix an annotation mistake

---
 src/pip/_internal/models/direct_url.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/models/direct_url.py b/src/pip/_internal/models/direct_url.py
index 6ffdc4eccad..3f9b6993e3b 100644
--- a/src/pip/_internal/models/direct_url.py
+++ b/src/pip/_internal/models/direct_url.py
@@ -23,7 +23,7 @@ class DirectUrlValidationError(Exception):
 
 
 def _get(
-    d: Dict[str, str], expected_type: Type[T], key: str, default: Optional[T] = None
+    d: Dict[str, Any], expected_type: Type[T], key: str, default: Optional[T] = None
 ) -> Optional[T]:
     """Get value from dictionary and verify expected type."""
     if key not in d:

From 2017d5e2d7ebe5f1762f74c5c3c4bc7a58f810de Mon Sep 17 00:00:00 2001
From: Diego Ramirez <dr01191115@gmail.com>
Date: Fri, 9 Jul 2021 13:54:47 -0500
Subject: [PATCH 16/22] Convert type commentaries into annotations

Fix them on search_scope.py
---
 src/pip/_internal/models/search_scope.py | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/pip/_internal/models/search_scope.py b/src/pip/_internal/models/search_scope.py
index a3f0a5c0f87..2e4a08c1c52 100644
--- a/src/pip/_internal/models/search_scope.py
+++ b/src/pip/_internal/models/search_scope.py
@@ -25,10 +25,9 @@ class SearchScope:
     @classmethod
     def create(
         cls,
-        find_links,  # type: List[str]
-        index_urls,  # type: List[str]
-    ):
-        # type: (...) -> SearchScope
+        find_links: List[str],
+        index_urls: List[str],
+    ) -> "SearchScope":
         """
         Create a SearchScope object after normalizing the `find_links`.
         """
@@ -65,15 +64,13 @@ def create(
 
     def __init__(
         self,
-        find_links,  # type: List[str]
-        index_urls,  # type: List[str]
-    ):
-        # type: (...) -> None
+        find_links: List[str],
+        index_urls: List[str],
+    ) -> None:
         self.find_links = find_links
         self.index_urls = index_urls
 
-    def get_formatted_locations(self):
-        # type: () -> str
+    def get_formatted_locations(self) -> str:
         lines = []
         redacted_index_urls = []
         if self.index_urls and self.index_urls != [PyPI.simple_url]:
@@ -106,16 +103,14 @@ def get_formatted_locations(self):
             )
         return '\n'.join(lines)
 
-    def get_index_urls_locations(self, project_name):
-        # type: (str) -> List[str]
+    def get_index_urls_locations(self, project_name: str) -> List[str]:
         """Returns the locations found via self.index_urls
 
         Checks the url_name on the main (first in the list) index and
         use this url_name to produce all locations
         """
 
-        def mkurl_pypi_url(url):
-            # type: (str) -> str
+        def mkurl_pypi_url(url: str) -> str:
             loc = posixpath.join(
                 url,
                 urllib.parse.quote(canonicalize_name(project_name)))

From 61fbec2bf5a772435b2bc35f7e0eb71bfad5ba9f Mon Sep 17 00:00:00 2001
From: Diego Ramirez <dr01191115@gmail.com>
Date: Fri, 9 Jul 2021 13:56:57 -0500
Subject: [PATCH 17/22] Convert commentaries into annotations

Fix them on selection_prefs.py
---
 src/pip/_internal/models/selection_prefs.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pip/_internal/models/selection_prefs.py b/src/pip/_internal/models/selection_prefs.py
index edc1cf79955..1fd79cba91a 100644
--- a/src/pip/_internal/models/selection_prefs.py
+++ b/src/pip/_internal/models/selection_prefs.py
@@ -18,11 +18,11 @@ class SelectionPreferences:
     # people when reading the code.
     def __init__(
         self,
-        allow_yanked,  # type: bool
-        allow_all_prereleases=False,  # type: bool
-        format_control=None,          # type: Optional[FormatControl]
-        prefer_binary=False,          # type: bool
-        ignore_requires_python=None,  # type: Optional[bool]
+        allow_yanked: bool,
+        allow_all_prereleases: bool = False,
+        format_control: Optional[FormatControl] = None,
+        prefer_binary: bool = False,
+        ignore_requires_python: Optional[bool] = None,
     ):
         # type: (...) -> None
         """Create a SelectionPreferences object.

From 4528a12850246ca43b506744c4e2b70fc567fa71 Mon Sep 17 00:00:00 2001
From: Diego Ramirez <dr01191115@gmail.com>
Date: Fri, 9 Jul 2021 13:59:56 -0500
Subject: [PATCH 18/22] Convert commentaries into annotations

Fix them on target_python.py
---
 src/pip/_internal/models/target_python.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/pip/_internal/models/target_python.py b/src/pip/_internal/models/target_python.py
index b91e349f566..d976681a4da 100644
--- a/src/pip/_internal/models/target_python.py
+++ b/src/pip/_internal/models/target_python.py
@@ -26,12 +26,11 @@ class TargetPython:
 
     def __init__(
         self,
-        platforms=None,  # type: Optional[List[str]]
-        py_version_info=None,  # type: Optional[Tuple[int, ...]]
-        abis=None,  # type: Optional[List[str]]
-        implementation=None,  # type: Optional[str]
-    ):
-        # type: (...) -> None
+        platforms: Optional[List[str]] = None,
+        py_version_info: Optional[Tuple[int, ...]] = None,
+        abis: Optional[List[str]] = None,
+        implementation: Optional[str] = None,
+    ) > None:
         """
         :param platforms: A list of strings or None. If None, searches for
             packages that are supported by the current system. Otherwise, will
@@ -65,8 +64,7 @@ def __init__(
         # This is used to cache the return value of get_tags().
         self._valid_tags = None  # type: Optional[List[Tag]]
 
-    def format_given(self):
-        # type: () -> str
+    def format_given(self) -> str:
         """
         Format the given, non-None attributes for display.
         """
@@ -87,8 +85,7 @@ def format_given(self):
             if value is not None
         )
 
-    def get_tags(self):
-        # type: () -> List[Tag]
+    def get_tags(self) -> List[Tag]:
         """
         Return the supported PEP 425 tags to check wheel candidates against.
 

From 1f240227266cbb73f5a47bc5b819a2c7580f201c Mon Sep 17 00:00:00 2001
From: Diego Ramirez <dr01191115@gmail.com>
Date: Fri, 9 Jul 2021 14:03:17 -0500
Subject: [PATCH 19/22] Fix an annotation mistake

On "target_python.py", I annotated a return value incorrectly.
---
 src/pip/_internal/models/target_python.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/models/target_python.py b/src/pip/_internal/models/target_python.py
index d976681a4da..ac69e152bd7 100644
--- a/src/pip/_internal/models/target_python.py
+++ b/src/pip/_internal/models/target_python.py
@@ -30,7 +30,7 @@ def __init__(
         py_version_info: Optional[Tuple[int, ...]] = None,
         abis: Optional[List[str]] = None,
         implementation: Optional[str] = None,
-    ) > None:
+    ) -> None:
         """
         :param platforms: A list of strings or None. If None, searches for
             packages that are supported by the current system. Otherwise, will

From 14335d1b8006d3a259886fc0556c8412c96da707 Mon Sep 17 00:00:00 2001
From: Diego Ramirez <dr01191115@gmail.com>
Date: Fri, 9 Jul 2021 14:07:32 -0500
Subject: [PATCH 20/22] Convert commentaries into annotations

Fix them on wheel.py
---
 src/pip/_internal/models/wheel.py | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/pip/_internal/models/wheel.py b/src/pip/_internal/models/wheel.py
index 827ebca91c6..8fbacf6190a 100644
--- a/src/pip/_internal/models/wheel.py
+++ b/src/pip/_internal/models/wheel.py
@@ -19,8 +19,7 @@ class Wheel:
         re.VERBOSE
     )
 
-    def __init__(self, filename):
-        # type: (str) -> None
+    def __init__(self, filename: str) -> None:
         """
         :raises InvalidWheelFilename: when the filename is invalid for a wheel
         """
@@ -45,13 +44,11 @@ def __init__(self, filename):
             for y in self.abis for z in self.plats
         }
 
-    def get_formatted_file_tags(self):
-        # type: () -> List[str]
+    def get_formatted_file_tags(self) -> List[str]:
         """Return the wheel's tags as a sorted list of strings."""
         return sorted(str(tag) for tag in self.file_tags)
 
-    def support_index_min(self, tags):
-        # type: (List[Tag]) -> int
+    def support_index_min(self, tags: List[Tag]) -> int:
         """Return the lowest index that one of the wheel's file_tag combinations
         achieves in the given list of supported tags.
 
@@ -66,8 +63,7 @@ def support_index_min(self, tags):
         """
         return min(tags.index(tag) for tag in self.file_tags if tag in tags)
 
-    def find_most_preferred_tag(self, tags, tag_to_priority):
-        # type: (List[Tag], Dict[Tag, int]) -> int
+    def find_most_preferred_tag(self, tags: List[Tag], tag_to_priority: Dict[Tag, int]) -> int:
         """Return the priority of the most preferred tag that one of the wheel's file
         tag combinations achieves in the given list of supported tags using the given
         tag_to_priority mapping, where lower priorities are more-preferred.
@@ -86,8 +82,7 @@ def find_most_preferred_tag(self, tags, tag_to_priority):
             tag_to_priority[tag] for tag in self.file_tags if tag in tag_to_priority
         )
 
-    def supported(self, tags):
-        # type: (Iterable[Tag]) -> bool
+    def supported(self, tags: Iterable[Tag]) > bool:
         """Return whether the wheel is compatible with one of the given tags.
 
         :param tags: the PEP 425 tags to check the wheel against.

From 3e7d434e651874a3eb2c0158fd905497039e2a8b Mon Sep 17 00:00:00 2001
From: Diego Ramirez <dr01191115@gmail.com>
Date: Fri, 9 Jul 2021 14:09:46 -0500
Subject: [PATCH 21/22] Fix a simple annotation mistake

---
 src/pip/_internal/models/wheel.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pip/_internal/models/wheel.py b/src/pip/_internal/models/wheel.py
index 8fbacf6190a..b399dfe90f9 100644
--- a/src/pip/_internal/models/wheel.py
+++ b/src/pip/_internal/models/wheel.py
@@ -82,7 +82,7 @@ def find_most_preferred_tag(self, tags: List[Tag], tag_to_priority: Dict[Tag, in
             tag_to_priority[tag] for tag in self.file_tags if tag in tag_to_priority
         )
 
-    def supported(self, tags: Iterable[Tag]) > bool:
+    def supported(self, tags: Iterable[Tag]) -> bool:
         """Return whether the wheel is compatible with one of the given tags.
 
         :param tags: the PEP 425 tags to check the wheel against.

From af8d5776440c0c926195c654fdf100c607f54559 Mon Sep 17 00:00:00 2001
From: Diego Ramirez <dr01191115@gmail.com>
Date: Fri, 9 Jul 2021 14:17:18 -0500
Subject: [PATCH 22/22] Fix a line lenght

---
 src/pip/_internal/models/wheel.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pip/_internal/models/wheel.py b/src/pip/_internal/models/wheel.py
index b399dfe90f9..a79a86106ed 100644
--- a/src/pip/_internal/models/wheel.py
+++ b/src/pip/_internal/models/wheel.py
@@ -63,7 +63,9 @@ def support_index_min(self, tags: List[Tag]) -> int:
         """
         return min(tags.index(tag) for tag in self.file_tags if tag in tags)
 
-    def find_most_preferred_tag(self, tags: List[Tag], tag_to_priority: Dict[Tag, int]) -> int:
+    def find_most_preferred_tag(
+        self, tags: List[Tag], tag_to_priority: Dict[Tag, int]
+    ) -> int:
         """Return the priority of the most preferred tag that one of the wheel's file
         tag combinations achieves in the given list of supported tags using the given
         tag_to_priority mapping, where lower priorities are more-preferred.