fixed almost all mypy errors

Author: mbdevpl

test/examples.py

@@ -134,7 +134,7 @@ def _remove_version_suffixes(path: pathlib.Path) -> t.Optional[pathlib.Path]:
     '0.4.4.dev5+84e1d430': ((0, 4, 4, '.', 'dev', 5, '84e1d430'), {}),
     '0.4.4.dev5+20171003.84e1d430': ((0, 4, 4, '.', 'dev', 5, '20171003', '.', '84e1d430'), {})}
 
-INCOMPATIBLE_STR_CASES = {
+INCOMPATIBLE_STR_CASES: t.Dict[str, t.Tuple[tuple, dict]] = {
     '1.0.0-2': ((1, 0, 0, '-', None, 2), {}),
     '1.0.0-0.2': ((1, 0, 0, '-', None, 0, '.', None, 2), {}),
     '4.5.0.dev': ((4, 5, 0, '.', 'dev', None), {})}

version_query/git_query.py

@@ -42,7 +42,8 @@ def _git_version_tags(repo: git.Repo) -> t.Mapping[git.Tag, Version]:
 
 def _latest_git_version_tag_on_branches(
         repo: git.Repo, assume_if_none: bool, commit: git.Commit, commit_distance: int,
-        skip_commits: t.Set[git.Commit]):
+        skip_commits: t.Set[git.Commit]) -> t.Union[int, t.Tuple[
+            git.Commit, t.Optional[git.TagReference], t.Optional[Version], int]]:
     _LOG.log(logging.NOTSET, 'entering %i branches...', len(commit.parents))
     results = []
     main_commit_distance = None
@@ -57,6 +58,7 @@ def _latest_git_version_tag_on_branches(
         if result[2] is not None:
             results.append(result)
     if not results:
+        assert main_commit_distance is not None
         return main_commit_distance
     final_result = sorted(results, key=lambda _: _[2])[-1]
     _LOG.log(logging.NOTSET, 'result from %i branches is %s and %s',
@@ -70,10 +72,10 @@ def _latest_git_version_tag_on_branches(
 def _latest_git_version_tag(
         repo: git.Repo, assume_if_none: bool = False, base_commit: git.Commit = None,
         commit_distance: int = 0, skip_commits: t.Set[git.Commit] = None) -> t.Tuple[
-            git.Commit, t.Optional[git.TagReference], Version, int]:
+            git.Commit, t.Optional[git.TagReference], t.Optional[Version], int]:
     """Retrun (commit, tag at that commit if any, latest version, distance from the version)."""
     version_tags = _git_version_tags(repo)
-    version_tag_commits = {}
+    version_tag_commits: t.Dict[git.Commit, set] = {}
     for tag, version in version_tags.items():
         commit = tag.commit
         if commit not in version_tag_commits:
@@ -159,7 +161,8 @@ def predict_git_repo(repo_path: pathlib.Path, search_parent_directories: bool =
     if is_repo_dirty:
         dt_ = 'dirty{}'.format(datetime.datetime.strftime(datetime.datetime.now(), '%Y%m%d%H%M%S'))
         if version.has_local:
-            version.local += ('.', dt_)
+            assert version.local is not None  # mypy needs this
+            version.local = (*version.local, '.', dt_)
         else:
             version.local = (dt_,)
     return version

version_query/version.py

@@ -206,8 +206,9 @@ def __init__(
         self._major: t.Optional[int] = None
         self._minor: t.Optional[int] = None
         self._patch: t.Optional[int] = None
-        self._pre_release = None
-        self._local = None
+        self._pre_release: t.Optional[
+            t.List[t.Tuple[t.Optional[str], t.Optional[str], t.Optional[int]]]] = None
+        self._local: t.Optional[t.Sequence[str]] = None
 
         self.release = major, minor, patch
 
@@ -453,6 +454,7 @@ def increment(self, component: VersionComponent, amount: int = 1) -> 'Version':
     def _increment_release(self, component: VersionComponent, amount: int):
         if component in (VersionComponent.Major, VersionComponent.Minor):
             if component is VersionComponent.Major:
+                assert self._major is not None
                 self._major += amount
                 if self._minor is not None:
                     self._minor = 0
@@ -511,6 +513,7 @@ def release_to_str(self) -> str:
         raise ValueError('cannot generate valid version string from {}'.format(repr(self)))
 
     def _pre_release_segment_to_str(self, segment: int) -> str:
+        assert self._pre_release is not None
         version_tuple = self._pre_release[segment]
         if _version_tuple_checker(version_tuple, (True, True, False)):
             return '{}{}'.format(*version_tuple[:2])
@@ -541,6 +544,7 @@ def release_to_tuple(self, sort: bool = False) -> tuple:
             (0 if sort else None) if self._patch is None else self._patch
 
     def pre_release_segment_to_tuple(self, segment: int, sort: bool = False) -> tuple:
+        assert self._pre_release is not None
         pre_separator, pre_type, pre_patch = self._pre_release[segment]
         return (1 if pre_type is None else 0) if sort else pre_separator, \
             ('' if pre_type is None else pre_type.lower()) if sort else pre_type, \
@@ -549,7 +553,9 @@ def pre_release_segment_to_tuple(self, segment: int, sort: bool = False) -> tupl
     def pre_release_to_tuple(self, sort: bool = False) -> tuple:
         """Create tuple from this version's pre-release component."""
         if self._pre_release is None:
-            return ((1, '', 0),) if sort else ()
+            if sort:
+                return ((1, '', 0),)
+            return ()
         parts = [self.pre_release_segment_to_tuple(i, sort)
                  for i, _ in enumerate(self._pre_release)]
         return tuple(parts) if sort else tuple(itertools.chain.from_iterable(parts))