Merge branch 'keras-gradcam-text' of github.com:teabolt/eli5 into pytorch-gradcam

Author: teabolt

CHANGES.rst

@@ -1,6 +1,18 @@
 Changelog
 =========
 
+0.10.1 (2019-08-29)
+-------------------
+
+* Don't include typing dependency on Python 3.5+
+  to fix installation on Python 3.7
+
+0.10.0 (2019-08-21)
+-------------------
+
+* Keras image classifiers: explaining predictions with Grad-CAM
+  (GSoC-2019 project by @teabolt).
+
 0.9.0 (2019-07-05)
 ------------------
 

eli5/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
 
-__version__ = '0.9.0'
+__version__ = '0.10.1'
 
 from .formatters import (
     format_as_html,
@@ -96,6 +96,7 @@
 except ImportError:
     # keras is not available
     pass
+<<<<<<< HEAD
 
 
 try:
@@ -104,4 +105,6 @@
     )
 except ImportError:
     # pytorch is not available
-    pass
+    pass
+=======
+>>>>>>> ec0f51c60aaf360327ca18e3e0cdae2222cec6bf

eli5/_feature_names.py

@@ -5,8 +5,8 @@
     Union, Callable, Pattern
 )
 
-import numpy as np  # type: ignore
-import scipy.sparse as sp  # type: ignore
+import numpy as np
+import scipy.sparse as sp
 
 
 class FeatureNames(Sized, Iterable):

eli5/_feature_weights.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
 
-import numpy as np  # type: ignore
+import numpy as np
 
 from eli5.base import FeatureWeights, FeatureWeight
 from .utils import argsort_k_largest_positive, argsort_k_smallest, mask

eli5/_graphviz.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-import graphviz  # type: ignore
+import graphviz
 
 
 def is_supported():

eli5/base.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from typing import Any, List, Tuple, Union, Optional
 
-import numpy as np # type: ignore
+import numpy as np
 
 from .base_utils import attrs
 from .formatters.features import FormattedFeatureName

eli5/base_utils.py

@@ -1,9 +1,9 @@
 import inspect
 
-import attr  # type: ignore
+import attr
 
 try:
-    from functools import singledispatch  # type: ignore
+    from functools import singledispatch
 except ImportError:
     from singledispatch import singledispatch  # type: ignore
 

eli5/catboost.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division
 
-import numpy as np  # type: ignore
-import catboost # type: ignore
+import numpy as np
+import catboost
 
 from eli5.explain import explain_weights
 from eli5._feature_importances import get_feature_importance_explanation

eli5/formatters/as_dataframe.py

@@ -2,7 +2,7 @@
 from typing import Any, Dict, List, Optional
 import warnings
 
-import pandas as pd  # type: ignore
+import pandas as pd
 
 import eli5
 from eli5.base import (

eli5/formatters/as_dict.py

@@ -1,7 +1,7 @@
 import six
 
-import attr   # type: ignore
-import numpy as np   # type: ignore
+import attr
+import numpy as np
 
 from .features import FormattedFeatureName