remove two init files. passes tests, fails mypy.

core/dbt/adapters/base/impl.py

@@ -9,7 +9,7 @@ from typing import (
 )
 
 import agate
-import pytz
+import pytz  # type: ignore[import]
 
 from dbt.exceptions import (
     raise_database_error, raise_compiler_error, invalid_type_error,
@@ -275,8 +275,8 @@ class BaseAdapter(metaclass=AdapterMeta):
             manifest = ManifestLoader.load_macros(
                 self.config, self.connections.set_query_header
             )
-            self._macro_manifest_lazy = manifest
-        return self._macro_manifest_lazy
+            self._macro_manifest_lazy = manifest  # type: ignore[assignment]
+        return self._macro_manifest_lazy  # type: ignore[return-value]
 
     def clear_macro_manifest(self):
         if self._macro_manifest_lazy is not None:
@@ -959,10 +959,10 @@ class BaseAdapter(metaclass=AdapterMeta):
         if context_override is None:
             context_override = {}
 
-        if manifest is None:
-            manifest = self._macro_manifest
+        # manifest has type Optional[Manifest]. working_manifest is not optional.
+        working_manifest: Union[Manifest, MacroManifest] = manifest or self._macro_manifest
 
-        macro = manifest.find_macro_by_name(
+        macro = working_manifest.find_macro_by_name(
             macro_name, self.config.project_name, project
         )
         if macro is None:
@@ -981,7 +981,7 @@ class BaseAdapter(metaclass=AdapterMeta):
         macro_context = generate_runtime_macro_context(
             macro=macro,
             config=self.config,
-            manifest=manifest,
+            manifest=working_manifest,  # type: ignore[arg-type]
             package_name=project
         )
         macro_context.update(context_override)

core/dbt/adapters/base/relation.py

@@ -89,8 +89,11 @@ class BaseRelation(FakeAPIObject, Hashable):
             if not self._is_exactish_match(k, v):
                 exact_match = False
 
-            if (
-                self.path.get_lowered_part(k).strip(self.quote_character) !=
+            lowered_part: Optional[str] = self.path.get_lowered_part(k)
+            if lowered_part is None:
+                approximate_match = False
+            elif (
+                lowered_part.strip(self.quote_character) !=
                 v.lower().strip(self.quote_character)
             ):
                 approximate_match = False

core/dbt/adapters/protocol.py

@@ -79,7 +79,7 @@ Column_T = TypeVar(
 Compiler_T = TypeVar('Compiler_T', bound=CompilerProtocol)
 
 
-class AdapterProtocol(
+class AdapterProtocol(  # type: ignore[misc]
     Protocol,
     Generic[
         AdapterConfig_T,

core/dbt/adapters/sql/connections.py

@@ -92,17 +92,17 @@ class SQLConnectionManager(BaseConnectionManager):
     @classmethod
     def process_results(
         cls,
-        column_names: Iterable[str],
+        column_names: List[str],
         rows: Iterable[Any]
     ) -> List[Dict[str, Any]]:
-        unique_col_names = dict()
+        unique_col_names: Dict[str, int] = dict()
         for idx in range(len(column_names)):
             col_name = column_names[idx]
             if col_name in unique_col_names:
                 unique_col_names[col_name] += 1
                 column_names[idx] = f'{col_name}_{unique_col_names[col_name]}'
             else:
-                unique_col_names[column_names[idx]] = 1
+                unique_col_names[col_name] = 1
         return [dict(zip(column_names, row)) for row in rows]
 
     @classmethod

core/dbt/adapters/sql/impl.py

@@ -74,7 +74,7 @@ class SQLAdapter(BaseAdapter):
     def convert_number_type(
         cls, agate_table: agate.Table, col_idx: int
     ) -> str:
-        decimals = agate_table.aggregate(agate.MaxPrecision(col_idx))
+        decimals = agate_table.aggregate(agate.MaxPrecision(col_idx))  # type: ignore[attr-defined]
         return "float8" if decimals else "integer"
 
     @classmethod

core/dbt/clients/jinja.py

@@ -12,12 +12,12 @@ from typing import (
     Callable
 )
 
-import jinja2
-import jinja2.ext
-import jinja2.nativetypes  # type: ignore
-import jinja2.nodes
-import jinja2.parser
-import jinja2.sandbox
+import jinja2  # type: ignore[import]
+import jinja2.ext  # type: ignore[import]
+import jinja2.nativetypes  # type: ignore[import]
+import jinja2.nodes  # type: ignore[import]
+import jinja2.parser  # type: ignore[import]
+import jinja2.sandbox  # type: ignore[import]
 
 from dbt.utils import (
     get_dbt_macro_name, get_docs_macro_name, get_materialization_macro_name,

core/dbt/clients/jinja_static.py

@@ -1,4 +1,4 @@
-import jinja2
+import jinja2  # type: ignore[import]
 from dbt.clients.jinja import get_environment
 from dbt.exceptions import raise_compiler_error
 

core/dbt/clients/registry.py

@@ -1,5 +1,5 @@
 import functools
-import requests
+import requests  # type: ignore[import]
 from dbt.events.functions import fire_event
 from dbt.events.types import (
     RegistryProgressMakingGETRequest,

core/dbt/clients/system.py

@@ -9,7 +9,7 @@ import shutil
 import subprocess
 import sys
 import tarfile
-import requests
+import requests  # type: ignore[import]
 import stat
 from typing import (
     Type, NoReturn, List, Optional, Dict, Any, Tuple, Callable, Union

core/dbt/clients/yaml_helper.py

@@ -1,6 +1,6 @@
 import dbt.exceptions
 from typing import Any, Dict, Optional
-import yaml
+import yaml  # type: ignore[import]
 
 # the C version is faster, but it doesn't always exist
 try:

core/dbt/context/base.py

@@ -21,7 +21,7 @@ from dbt.version import __version__ as dbt_version
 
 # These modules are added to the context. Consider alternative
 # approaches which will extend well to potentially many modules
-import pytz
+import pytz  # type: ignore[import]
 import datetime
 import re
 
@@ -82,7 +82,7 @@ def get_datetime_module_context() -> Dict[str, Any]:
 
 
 def get_re_module_context() -> Dict[str, Any]:
-    context_exports = re.__all__
+    context_exports = re.__all__  # type: ignore[attr-defined]
 
     return {
         name: getattr(re, name) for name in context_exports

core/dbt/context/context_config.py

@@ -150,7 +150,7 @@ class BaseContextConfigGenerator(Generic[T]):
                 result = self._update_from_config(result, fqn_config)
 
         # this is mostly impactful in the snapshot config case
-        return result
+        return result  # type: ignore[return-value]
 
     @abstractmethod
     def calculate_node_config_dict(
@@ -227,7 +227,7 @@ class UnrenderedConfigGenerator(BaseContextConfigGenerator[Dict[str, Any]]):
         base: bool,
         patch_config_dict: dict = None
     ) -> Dict[str, Any]:
-        return self.calculate_node_config(
+        return self.calculate_node_config(  # type: ignore[return-value]
             config_call_dict=config_call_dict,
             fqn=fqn,
             resource_type=resource_type,
@@ -299,9 +299,9 @@ class ContextConfig:
         patch_config_dict: dict = None
     ) -> Dict[str, Any]:
         if rendered:
-            src = ContextConfigGenerator(self._active_project)
+            src = ContextConfigGenerator(self._active_project)  # type: ignore[var-annotated]
         else:
-            src = UnrenderedConfigGenerator(self._active_project)
+            src = UnrenderedConfigGenerator(self._active_project)  # type: ignore[assignment]
 
         return src.calculate_node_config_dict(
             config_call_dict=self._config_call_dict,

core/dbt/context/docs.py

@@ -68,7 +68,7 @@ class DocsRuntimeContext(SchemaYamlContext):
             file_id = target_doc.file_id
             if file_id in self.manifest.files:
                 source_file = self.manifest.files[file_id]
-                source_file.add_node(self.node.unique_id)
+                source_file.add_node(self.node.unique_id)  # type: ignore[union-attr]
         else:
             doc_target_not_found(self.node, doc_name, doc_package_name)
 

core/dbt/context/macros.py

@@ -37,10 +37,10 @@ class MacroNamespace(Mapping):
         self.global_project_namespace: FlatNamespace = global_project_namespace
 
     def _search_order(self) -> Iterable[Union[FullNamespace, FlatNamespace]]:
-        yield self.local_namespace   # local package
-        yield self.global_namespace  # root package
-        yield self.packages          # non-internal packages
-        yield {
+        yield self.local_namespace                         # local package
+        yield self.global_namespace  # type: ignore[misc]  # root package
+        yield self.packages          # type: ignore[misc]  # non-internal packages
+        yield {  # type: ignore[misc]
             GLOBAL_PROJECT_NAME: self.global_project_namespace,  # dbt
         }
         yield self.global_project_namespace  # other internal project besides dbt

core/dbt/context/providers.py

@@ -21,6 +21,7 @@ from dbt.context.macro_resolver import MacroResolver, TestMacroNamespace
 from .macros import MacroNamespaceBuilder, MacroNamespace
 from .manifest import ManifestContext
 from dbt.contracts.connection import AdapterResponse
+from dbt.contracts.files import SchemaSourceFile
 from dbt.contracts.graph.manifest import (
     Manifest, Disabled
 )
@@ -1189,7 +1190,7 @@ class ProviderContext(ManifestContext):
                 source_file = self.manifest.files[self.model.file_id]
                 # Schema files should never get here
                 if source_file.parse_file_type != 'schema':
-                    source_file.env_vars.append(var)
+                    source_file.env_vars.append(var)  # type: ignore[union-attr]
             return return_value
         else:
             msg = f"Env var required but not provided: '{var}'"
@@ -1230,7 +1231,8 @@ class ModelContext(ProviderContext):
         if self.model.resource_type in [NodeType.Source, NodeType.Test]:
             return []
         return [
-            h.to_dict(omit_none=True) for h in self.model.config.pre_hook
+            h.to_dict(omit_none=True)
+            for h in self.model.config.pre_hook  # type: ignore[union-attr]
         ]
 
     @contextproperty
@@ -1238,13 +1240,14 @@ class ModelContext(ProviderContext):
         if self.model.resource_type in [NodeType.Source, NodeType.Test]:
             return []
         return [
-            h.to_dict(omit_none=True) for h in self.model.config.post_hook
+            h.to_dict(omit_none=True)
+            for h in self.model.config.post_hook  # type: ignore[union-attr]
         ]
 
     @contextproperty
     def sql(self) -> Optional[str]:
         if getattr(self.model, 'extra_ctes_injected', None):
-            return self.model.compiled_sql
+            return self.model.compiled_sql  # type: ignore[union-attr]
         return None
 
     @contextproperty
@@ -1495,9 +1498,14 @@ class TestContext(ProviderContext):
             if self.model:
                 self.manifest.env_vars[var] = return_value
                 # the "model" should only be test nodes, but just in case, check
-                if self.model.resource_type == NodeType.Test and self.model.file_key_name:
-                    source_file = self.manifest.files[self.model.file_id]
-                    (yaml_key, name) = self.model.file_key_name.split('.')
+                if (
+                    self.model.resource_type ==
+                    NodeType.Test and self.model.file_key_name  # type: ignore[union-attr]
+                ):
+                    source_file: SchemaSourceFile = \
+                        self.manifest.files[self.model.file_id]  # type: ignore[assignment]
+                    (yaml_key, name) = \
+                        self.model.file_key_name.split('.')  # type: ignore[union-attr]
                     source_file.add_env_var(var, yaml_key, name)
             return return_value
         else:

core/dbt/contracts/project.py

@@ -80,7 +80,7 @@ class GitPackage(Package):
 class RegistryPackage(Package):
     package: str
     version: Union[RawVersion, List[RawVersion]]
-    install_prerelease: Optional[bool] = False
+    install_prerelease: bool = False
 
     def get_versions(self) -> List[str]:
         if isinstance(self.version, list):

core/dbt/dataclass_schema.py

@@ -5,7 +5,7 @@ import re
 from dataclasses import fields
 from enum import Enum
 from datetime import datetime
-from dateutil.parser import parse
+from dateutil.parser import parse  # type: ignore[import]
 
 from hologram import JsonSchemaMixin, FieldEncoder, ValidationError
 

core/dbt/parser/generic_test.py

@@ -1,6 +1,6 @@
 from typing import Iterable, List
 
-import jinja2
+import jinja2  # type: ignore[import]
 
 from dbt.exceptions import ParsingException
 from dbt.clients import jinja

core/dbt/parser/macros.py

@@ -1,6 +1,6 @@
 from typing import Iterable, List
 
-import jinja2
+import jinja2  # type: ignore[import]
 
 from dbt.clients import jinja
 from dbt.contracts.graph.unparsed import UnparsedMacro

core/dbt/task/init.py

@@ -5,7 +5,7 @@ import re
 import shutil
 from typing import Optional
 
-import yaml
+import yaml  # type: ignore[import]
 import click
 
 import dbt.config

core/dbt/tracking.py

@@ -15,10 +15,10 @@ from snowplow_tracker import SelfDescribingJson
 from datetime import datetime
 
 import logbook
-import pytz
+import pytz  # type: ignore[import]
 import platform
 import uuid
-import requests
+import requests  # type: ignore[import]
 import os
 
 sp_logger.setLevel(100)

core/dbt/utils.py

@@ -6,10 +6,10 @@ import decimal
 import functools
 import hashlib
 import itertools
-import jinja2
+import jinja2  # type: ignore[import]
 import json
 import os
-import requests
+import requests  # type: ignore[import]
 import time
 
 from contextlib import contextmanager

core/dbt/version.py

@@ -5,7 +5,7 @@ import glob
 import json
 from typing import Iterator
 
-import requests
+import requests  # type: ignore[import]
 
 import dbt.exceptions
 import dbt.semver

dev-requirements.txt

@@ -3,7 +3,7 @@ flake8
 flaky
 freezegun==0.3.12
 ipdb
-mypy==0.782
+mypy==0.910
 pip-tools
 pytest
 pytest-dotenv

tox.ini

@@ -16,7 +16,7 @@ deps =
 description = mypy static type checking
 basepython = python3.8
 skip_install = true
-commands = mypy core/dbt
+commands = mypy --show-error-codes core/dbt
 deps =
   -rdev-requirements.txt
   -reditable-requirements.txt