Merge branch 'master' of github.com:ehdsouza/python-sdk

Author: ehdsouza

requirements-dev.txt

@@ -8,7 +8,6 @@ pylint>=1.4.4
 coverage<4
 codecov>=1.6.3
 pytest-cov>=2.2.1
-requests>=2.8.0
 
 # documentation
 recommonmark>=0.2.0

test/test_speech_to_text_v1.py

@@ -34,7 +34,7 @@ def test_success():
             audio_file, content_type='audio/l16; rate=44100')
 
     request_url = responses.calls[1].request.url
-    assert request_url == recognize_url + '?continuous=false'
+    assert request_url == recognize_url
     assert responses.calls[1].response.text == recognize_response
 
     assert len(responses.calls) == 2
@@ -219,5 +219,3 @@ def test_custom_words():
     assert 'word type must be all, user, or corpora' in str(keyerror.value)
 
     assert len(responses.calls) == 9
-
-

tox.ini

@@ -0,0 +1,19 @@
+[tox]
+envlist = pep8, py27, py34, py35, py36
+
+[testenv]
+commands = py.test -v
+deps =
+     -r{toxinidir}/requirements.txt
+     -r{toxinidir}/requirements-dev.txt
+
+[testenv:pep8]
+deps = flake8
+commands = flake8
+
+[flake8]
+exclude = .venv,.git,.tox,docs
+; If you want to make tox run the tests with the same versions, create a
+; requirements.txt with the pinned versions and uncomment the following lines:
+; deps =
+;     -r{toxinidir}/requirements.txt

watson_developer_cloud/dialog_v1.py

@@ -29,11 +29,11 @@ class DialogV1(WatsonDeveloperCloudService):
     def __init__(self, url=default_url, **kwargs):
         WatsonDeveloperCloudService.__init__(self, 'dialog', url, **kwargs)
         print(
-            'WARNING: The Dialog service was deprecated, existing instances '
-            'of the service will continue to function'
-            'until August 9, 2017. See '
-            'https://www.ibm.com/watson/developercloud/doc/conversation'
-            '/migration.shtml')
+            'WARNING: The Dialog service was deprecated. Existing instances '
+            'of the service stopped functioning on August 9, 2017. '
+            'Dialog was replaced by the Conversation service. See '
+            'https://console.bluemix.net/docs/services/conversation'
+            '/index.html#about')
 
     def get_dialogs(self):
         return self.request(method='GET', url='/v1/dialogs', accept_json=True)