Merge branch 'master' of https://github.com/watson-developer-cloud/python-sdk

Author: g-may

examples/alchemy_language_v1.py

@@ -12,6 +12,7 @@
 # print(json.dumps(alchemy_language.keywords(max_items=5, url=url), indent=2))
 # print(json.dumps(alchemy_language.concepts(max_items=2, url=url), indent=2))
 # print(json.dumps(alchemy_language.entities(url=url), indent=2))
+# print(json.dumps(alchemy_language.dates(url=url, anchor_date='2016-03-22 00:00:00'), indent=2))
 # print(json.dumps(alchemy_language.category(url=url), indent=2))
 # print(json.dumps(alchemy_language.typed_relations(url=url), indent=2))
 # print(json.dumps(alchemy_language.relations(url=url), indent=2))

examples/relationship_extraction_v1_beta.py

@@ -65,12 +65,12 @@ def run_tests(self):
       packages=['watson_developer_cloud'],
       keywords='alchemy datanews, language, vision, question and answer' +
       ' tone_analyzer, natural language classifier, retrieve and rank,' +
-      ' tradeoff analytics, concept insights, text to speech,' +
+      ' tradeoff analytics, text to speech,' +
       ' language translation, language identification,' +
       ' concept expansion, machine translation, personality insights,' +
       ' message resonance, watson developer cloud, wdc, watson, ibm,' +
       ' dialog, user modeling, alchemyapi, alchemy, tone analyzer,' +
-      'speech to text, visual recognition, relationship extraction',
+      'speech to text, visual recognition',
       classifiers=[
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',

setup.py

@@ -1,18 +1,14 @@
 # coding=utf-8
 
 import os
-import watson_developer_cloud
+
 import pytest
-import sys
-from os import getcwd
-from subprocess import Popen, PIPE
 from os.path import join, dirname
 from glob import glob
 
 # tests to exclude
 excludes = ['authorization_v1.py', 'alchemy_data_news_v1.py',
-            'alchemy_language_v1.py', 'alchemy_vision_v1.py',
-            'concept_insights_v2.py']
+            'alchemy_language_v1.py', 'alchemy_vision_v1.py']
 
 # examples path. /examples
 examples_path = join(dirname(__file__), '../', 'examples', '*.py')

test/test_examples.py

@@ -19,15 +19,13 @@
 from .alchemy_language_v1 import AlchemyLanguageV1
 from .alchemy_vision_v1 import AlchemyVisionV1
 from .authorization_v1 import AuthorizationV1
-from .concept_insights_v2 import ConceptInsightsV2
 from .conversation_v1 import ConversationV1
 from .conversation_v1_experimental import ConversationV1Experimental
 from .document_conversion_v1 import DocumentConversionV1
 from .dialog_v1 import DialogV1
 from .language_translation_v2 import LanguageTranslationV2
 from .natural_language_classifier_v1 import NaturalLanguageClassifierV1
 from .personality_insights_v2 import PersonalityInsightsV2
-from .relationship_extraction_v1_beta import RelationshipExtractionV1Beta
 from .retrieve_and_rank_v1 import RetrieveAndRankV1
 from .speech_to_text_v1 import SpeechToTextV1
 from .text_to_speech_v1 import TextToSpeechV1

test/test_relationship_extraction_v1_beta.py

@@ -60,6 +60,12 @@ def concepts(self, html=None, text=None, url=None, max_items=8, linked_data=True
                   'language': language}
         return self._alchemy_html_request('GetRankedConcepts', html=html, text=text, url=url, params=params)
 
+    def dates(self, html=None, text=None, url=None, anchor_date=None, show_source_text=False, language=None):
+        params = {'anchorDate': anchor_date,
+                  'showSourceText': show_source_text,
+                  'language': language}
+        return self._alchemy_html_request('ExtractDates', html=html, text=text, url=url, params=params)
+
     def entities(self, html=None, text=None, url=None, disambiguate=True, linked_data=True, coreference=True,
                  quotations=False, sentiment=False, show_source_text=False, max_items=50, language=None, model=None):
         params = {'disambiguate': disambiguate,