Fix rebase conflicts

Author: xhochy

kartothek/io_components/merge.py

@@ -1,6 +1,6 @@
 import logging
 from functools import partial, reduce
-from typing import Dict, List, Optional
+from typing import TYPE_CHECKING, Callable, Dict, List, Optional, cast
 
 import pandas as pd
 
@@ -10,6 +10,10 @@
 from kartothek.io_components.read import dispatch_metapartitions_from_factory
 from kartothek.io_components.utils import _instantiate_store, _make_callable
 
+if TYPE_CHECKING:
+    from simplekv import KeyValueStore
+
+
 LOGGER = logging.getLogger(__name__)
 
 
@@ -138,7 +142,7 @@ def align_datasets_many(
     dataset_factories = [
         DatasetFactory(
             dataset_uuid=dataset_uuid,
-            store_factory=_make_callable(store),
+            store_factory=cast(Callable[[], "KeyValueStore"], _make_callable(store)),
             load_schema=True,
             load_all_indices=False,
             load_dataset_metadata=True,

kartothek/io_components/read.py

@@ -39,30 +39,6 @@ def dispatch_metapartitions_from_factory(
     ...
 
 
-@overload
-def dispatch_metapartitions_from_factory(
-    dataset_factory: Union[DatasetFactory, Callable],
-    label_filter: Optional[Callable] = None,
-    concat_partitions_on_primary_index: bool = False,
-    predicates: Optional[Any] = None,
-    store: Optional[Callable] = None,
-    dispatch_by: None = None,
-) -> Iterator[MetaPartition]:
-    ...
-
-
-@overload
-def dispatch_metapartitions_from_factory(
-    dataset_factory: Union[DatasetFactory, Callable],
-    label_filter: Optional[Callable],
-    concat_partitions_on_primary_index,
-    predicates: Optional[Any],
-    store: Optional[Callable],
-    dispatch_by: List[str],
-) -> Iterator[List[MetaPartition]]:
-    ...
-
-
 @normalize_args
 def dispatch_metapartitions_from_factory(
     dataset_factory: DatasetFactory,