build: update to the latest version of mypy

Author: parthea

mypy.ini

@@ -1,5 +1,5 @@
 [mypy]
-python_version = 3.6
+python_version = 3.8
 ignore_missing_imports = True
 
 

noxfile.py

@@ -33,7 +33,7 @@ def blacken(session):
 
 @nox.session(python=PYTHON_VERSIONS)
 def lint(session):
-    session.install('mypy==0.790', 'flake8', 'black==23.3.0')
+    session.install('mypy', 'flake8', 'black==23.3.0', 'types-protobuf', 'types-PyYAML', 'types-requests')
     session.run('pip', 'install', '-e', '.')
     session.run('pip', 'install', 'click>8.0')
     session.run('black', '--check', 'synthtool', 'tests')

synthtool/__init__.py

@@ -39,7 +39,7 @@
 # Make sure that synthtool is being used instead of running the synth file
 # directly
 _main_module = sys.modules["__main__"]
-if hasattr(_main_module, "__file__") and "synthtool" not in _main_module.__file__:
+if hasattr(_main_module, "__file__") and "synthtool" not in str(_main_module.__file__):
     logger.critical(
         "You are running the synthesis script directly, this will be disabled in a future release of Synthtool. Please use python3 -m synthtool instead."
     )

synthtool/__main__.py

@@ -85,11 +85,12 @@ def main(synthfile: str, metadata: str, extra_args: Sequence[str]):
         logger.debug(f"Executing {synth_file}.")
         # https://docs.python.org/3/library/importlib.html#importing-a-source-file-directly
         spec = importlib.util.spec_from_file_location("synth", synth_file)
-        synth_module = importlib.util.module_from_spec(spec)
 
-        if spec.loader is None:
+        if not spec or spec.loader is None:
             raise ImportError("Could not import synth.py")
 
+        synth_module = importlib.util.module_from_spec(spec)
+
         with synthtool.metadata.MetadataTrackerAndWriter(metadata):
             spec.loader.exec_module(synth_module)  # type: ignore
 

synthtool/gcp/gapic_bazel.py

@@ -80,11 +80,11 @@ def _generate_code(
         private: bool = False,
         discogapic: bool = False,
         diregapic: bool = False,
-        proto_path: Union[str, Path] = None,
-        output_dir: Union[str, Path] = None,
-        bazel_target: str = None,
+        proto_path: Optional[Union[str, Path]] = None,
+        output_dir: Optional[Union[str, Path]] = None,
+        bazel_target: Optional[str] = None,
         include_protos: bool = False,
-        proto_output_path: Union[str, Path] = None,
+        proto_output_path: Optional[Union[str, Path]] = None,
         tar_strip_components: int = 1,
     ):
         # Determine which googleapis repo to use

synthtool/gcp/gapic_generator.py

@@ -237,8 +237,8 @@ def _include_samples(
         version: str,
         genfiles: Path,
         googleapis_service_dir: Path,
-        samples_root_dir: Path = None,
-        samples_resources_dir: Path = None,
+        samples_root_dir: Optional[Path] = None,
+        samples_resources_dir: Optional[Path] = None,
     ):
         """Include code samples and supporting resources in generated output.
 

synthtool/gcp/gapic_microgenerator.py

@@ -75,11 +75,11 @@ def _generate_code(
         language: str,
         *,
         private: bool = False,
-        proto_path: Union[str, Path] = None,
+        proto_path: Optional[Union[str, Path]] = None,
         extra_proto_files: List[str] = [],
-        output_dir: Union[str, Path] = None,
+        output_dir: Optional[Union[str, Path]] = None,
         generator_version: str = GENERATOR_VERSION,
-        generator_args: Mapping[str, str] = None,
+        generator_args: Optional[Mapping[str, str]] = None,
     ):
         # Determine which googleapis repo to use
         if not private:

synthtool/languages/php.py

@@ -83,7 +83,7 @@ def owlbot_copy_version(
     src: Path,
     dest: Path,
     copy_excludes: typing.Optional[typing.List[str]] = None,
-    version_string: str = None,
+    version_string: typing.Optional[str] = None,
 ) -> None:
     """Copies files from a version subdirectory."""
     logger.debug("owlbot_copy_version called from %s to %s", src, dest)

synthtool/languages/python.py

@@ -18,7 +18,7 @@
 import json
 from pathlib import Path
 import shutil
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Optional
 import yaml
 
 import synthtool as s
@@ -108,7 +108,7 @@ def python_notebooks_testing_pipeline() -> None:
 
 def py_samples(
     *,
-    root: PathOrStr = None,
+    root: Optional[PathOrStr] = None,
     skip_readmes: bool = False,
     files_to_exclude: List[str] = [],
 ) -> None:

synthtool/py_templating_instructions/synth-template.py

@@ -23,4 +23,4 @@
 common = gcp.CommonTemplates()
 sample_files = common.py_samples()
 for path in sample_files:
-    s.move(path, excludes=["noxfile.py"])
+    s.move([path], excludes=["noxfile.py"])

synthtool/sources/git.py

@@ -73,8 +73,8 @@ def _local_default_branch(path: pathlib.Path) -> Union[str, None]:
 
 def clone(
     url: str,
-    dest: pathlib.Path = None,
-    committish: str = None,
+    dest: Optional[pathlib.Path] = None,
+    committish: Optional[str] = None,
     force: bool = False,
 ) -> pathlib.Path:
     """Clones a remote git repo.
@@ -164,7 +164,7 @@ def parse_repo_url(url: str) -> Dict[str, str]:
     return {"owner": owner, "name": name}
 
 
-def get_latest_commit(repo: pathlib.Path = None) -> Tuple[str, str]:
+def get_latest_commit(repo: Optional[pathlib.Path] = None) -> Tuple[str, str]:
     """Return the sha and commit message of the latest commit."""
     output = subprocess.check_output(
         ["git", "log", "-1", "--pretty=%H%n%B"], cwd=repo

synthtool/transforms.py

@@ -31,7 +31,9 @@ class MissingSourceError(Exception):
     pass
 
 
-def _expand_paths(paths: ListOfPathsOrStrs, root: PathOrStr = None) -> Iterable[Path]:
+def _expand_paths(
+    paths: ListOfPathsOrStrs, root: Optional[PathOrStr] = None
+) -> Iterable[Path]:
     """Given a list of globs/paths, expands them into a flat sequence,
     expanding globs as necessary."""
     if paths is None:
@@ -103,8 +105,8 @@ def _merge_file(
 def _copy_dir_to_existing_dir(
     source: Path,
     destination: Path,
-    excludes: ListOfPathsOrStrs = None,
-    merge: Callable[[str, str, Path], str] = None,
+    excludes: Optional[ListOfPathsOrStrs] = None,
+    merge: Optional[Callable[[str, str, Path], str]] = None,
 ) -> bool:
     """
     copies files over existing files to an existing directory
@@ -169,9 +171,9 @@ def merge(source_text: str, destinaton_text: str, file_path: Path) -> str:
 
 def move(
     sources: ListOfPathsOrStrs,
-    destination: PathOrStr = None,
-    excludes: ListOfPathsOrStrs = None,
-    merge: Callable[[str, str, Path], str] = None,
+    destination: Optional[PathOrStr] = None,
+    excludes: Optional[ListOfPathsOrStrs] = None,
+    merge: Optional[Callable[[str, str, Path], str]] = None,
     required: bool = False,
 ) -> bool:
     """