build: fix several small issues

Author: mbdevpl

Jenkinsfile

@@ -79,7 +79,7 @@ pipeline {
         }
       }
       environment {
-        PACKAGE_NAME = 'ingit'
+        PACKAGE_NAME = 'version-query'
         VERSION = sh(script: 'python3 -m version_query --predict .', returnStdout: true).trim()
         PYPI_AUTH = credentials('mbdev-pypi-auth')
         TWINE_USERNAME = "${PYPI_AUTH_USR}"

MANIFEST.in

@@ -1,4 +1,3 @@
-include setup_boilerplate.py
 include requirements.txt
 include LICENSE
 include NOTICE

pyproject.toml

@@ -10,6 +10,12 @@ requires = [
 max-line-length = 100
 max-doc-length = 100
 
+[[tool.mypy.overrides]]
+module = [
+    'semver'
+]
+ignore_missing_imports = true
+
 [tool.pydocstyle]
 ignore = [
     'D102', 'D103', 'D105', 'D107',

requirements_ci.txt

@@ -6,3 +6,4 @@ mypy ~= 1.5
 pydocstyle ~= 6.3
 pylint ~= 2.17
 twine ~= 4.0
+types-setuptools >= 67.4

requirements_test.txt

@@ -1,3 +1,4 @@
 -r requirements.txt
 boilerplates[packaging_tests] ~= 0.1
 colorlog ~= 6.7
+setuptools >= 67.4

version_query/git_query.py

@@ -46,7 +46,8 @@ def _latest_git_version_tag_on_branches(
             t.Optional[git.objects.Commit], t.Optional[git.TagReference], t.Optional[Version],
             int]]:
     _LOG.log(logging.NOTSET, 'entering %i branches...', len(commit.parents))
-    results = []
+    results: t.List[t.Tuple[
+        t.Optional[git.objects.Commit], t.Optional[git.TagReference], Version, int]] = []
     main_commit_distance = None
     for parent in commit.parents:
         try:
@@ -57,7 +58,7 @@ def _latest_git_version_tag_on_branches(
         if main_commit_distance is None:
             main_commit_distance = result[3]
         if result[2] is not None:
-            results.append(result)
+            results.append(result)  # type: ignore
     if not results:
         if main_commit_distance is None:
             raise ValueError(f'reached max commit distance {MAX_COMMIT_DISTANCE}'
@@ -73,8 +74,9 @@ def _latest_git_version_tag_on_branches(
 
 
 def _latest_git_version_tag(
-        repo: git.Repo, assume_if_none: bool = False, base_commit: git.objects.Commit = None,
-        commit_distance: int = 0, skip_commits: t.Set[git.objects.Commit] = None) -> t.Tuple[
+        repo: git.Repo, assume_if_none: bool = False,
+        base_commit: t.Optional[git.objects.Commit] = None, commit_distance: int = 0,
+        skip_commits: t.Optional[t.Set[git.objects.Commit]] = None) -> t.Tuple[
             t.Optional[git.objects.Commit], t.Optional[git.TagReference], t.Optional[Version], int]:
     """Return (commit, tag at that commit if any, latest version, distance from the version)."""
     version_tags = _git_version_tags(repo)