Merge pull request #369 from adelavega/dep_indico

Remove Indico API
PsychoinformaticsLab · Feb 6, 2020 · 831ef84 · 831ef84
2 parents 60e2e18 + 0c068ef
commit 831ef84
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 308 deletions.
diff --git a/docker/README.md b/docker/README.md
@@ -21,7 +21,6 @@ To use it:
 WIT_AI_API_KEY=abc123
 IBM_USERNAME=joe@schmo.edu
 IBM_PASSWORD=xyzabc
-INDICO_APP_KEY=abcyyz
 GOOGLE_APPLICATION_CREDENTIALS=/root/share/googleapi.json
 CLARIFAI_API_KEY=hhhvvv
 ```

diff --git a/optional-dependencies.txt b/optional-dependencies.txt
@@ -5,7 +5,6 @@ python-twitter
 gensim
 google-api-python-client
 google-compute-engine
-IndicoIo
 librosa>=0.6.3
 matplotlib
 opencv-python

diff --git a/pliers/extractors/__init__.py b/pliers/extractors/__init__.py
@@ -4,9 +4,7 @@
 '''
 
 from .base import Extractor, ExtractorResult, merge_results
-from .api import (IndicoAPITextExtractor,
-                  IndicoAPIImageExtractor,
-                  ClarifaiAPIImageExtractor,
+from .api import (ClarifaiAPIImageExtractor,
                   ClarifaiAPIVideoExtractor,
                   GoogleVisionAPIFaceExtractor,
                   GoogleVisionAPILabelExtractor,
@@ -70,8 +68,6 @@
 __all__ = [
     'Extractor',
     'ExtractorResult',
-    'IndicoAPITextExtractor',
-    'IndicoAPIImageExtractor',
     'ClarifaiAPIImageExtractor',
     'ClarifaiAPIVideoExtractor',
     'STFTAudioExtractor',

diff --git a/pliers/extractors/api/__init__.py b/pliers/extractors/api/__init__.py
@@ -1,7 +1,5 @@
 from .clarifai import (ClarifaiAPIImageExtractor,
                        ClarifaiAPIVideoExtractor)
-from .indico import (IndicoAPITextExtractor,
-                     IndicoAPIImageExtractor)
 from .google import (GoogleVisionAPIFaceExtractor,
                      GoogleVisionAPILabelExtractor,
                      GoogleVisionAPIPropertyExtractor,
@@ -29,8 +27,6 @@
 __all__ = [
     'ClarifaiAPIImageExtractor',
     'ClarifaiAPIVideoExtractor',
-    'IndicoAPITextExtractor',
-    'IndicoAPIImageExtractor',
     'GoogleVisionAPIFaceExtractor',
     'GoogleVisionAPILabelExtractor',
     'GoogleVisionAPIPropertyExtractor',

diff --git a/pliers/extractors/api/indico.py b/pliers/extractors/api/indico.py
diff --git a/pliers/tests/extractors/api/test_indico_extractors.py b/pliers/tests/extractors/api/test_indico_extractors.py
diff --git a/setup.py b/setup.py
@@ -33,7 +33,7 @@
     extras_require={
         'all': ['google-api-python-client', 'google-compute-engine',
                 'tensorflow', 'clarifai', 'opencv-python', 'face_recognition',
-                'gensim', 'IndicoIo', 'pytesseract', 'librosa>=0.6.3',
+                'gensim', 'pytesseract', 'librosa>=0.6.3',
                 'rev_ai', 'spacy', 'SpeechRecognition>=3.6.0', 'pysrt',
                 'python-twitter', 'pathos', 'scikit-learn', 'matplotlib',
                 'seaborn', 'pygraphviz', 'xlrd', 'duecredit']