Merge next to develop prior to 1.1.0 release

.pylintrc

@@ -1,4 +1,4 @@
 # lint Python modules using external checkers.
 [MASTER]
 ignore=SVN
-disable=R0903,R0912,R0913,R0914,R0915,W0141,C0111,C0103,W0603,W0703,R0911,C0301,C0302,R0902,R0904,W0142,W0212,E1101,E1103,R0201,W0201,W0122,W0232,RP0001,RP0003,RP0101,RP0002,RP0401,RP0701,RP0801,F0401,E0611,R0801,I0011,F0401,E0611,E1004,C0111,I0011,I0012,W0704,W0142,W0212,W0232,W0613,W0702,R0201,W0614,R0914,R0912,R0915,R0913,R0904,R0801,C0301,C0411,R0204,W0622
+disable=R0903,R0912,R0913,R0914,R0915,W0141,C0111,C0103,W0603,W0703,R0911,C0301,C0302,R0902,R0904,W0142,W0212,E1101,E1103,R0201,W0201,W0122,W0232,RP0001,RP0003,RP0101,RP0002,RP0401,RP0701,RP0801,F0401,E0611,R0801,I0011,F0401,E0611,E1004,C0111,I0011,I0012,W0704,W0142,W0212,W0232,W0613,W0702,R0201,W0614,R0914,R0912,R0915,R0913,R0904,R0801,C0301,C0411,R0204,W0622,inconsistent-return-statements

.travis.yml

@@ -9,7 +9,9 @@ cache: pip
 before_install:
 - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_6e98b3e8e789_key -iv $encrypted_6e98b3e8e789_iv -in .env.enc -out .env -d || true'
 install: pip install tox-travis
-script: tox
+script:
+- pip install -U python-dotenv
+- tox
 before_deploy:
 - pip install -r requirements.txt
 - pip install -r requirements-dev.txt

README.md

@@ -1,6 +1,6 @@
 # Watson Developer Cloud Python SDK
 
-[![Build Status](https://travis-ci.org/watson-developer-cloud/python-sdk.svg)](https://travis-ci.org/watson-developer-cloud/python-sdk)
+[![Build Status](https://travis-ci.org/watson-developer-cloud/python-sdk.svg?branch=master)](https://travis-ci.org/watson-developer-cloud/python-sdk)
 [![Slack](https://wdc-slack-inviter.mybluemix.net/badge.svg)](https://wdc-slack-inviter.mybluemix.net)
 [![codecov.io](https://codecov.io/github/watson-developer-cloud/python-sdk/coverage.svg?branch=master)](https://codecov.io/github/watson-developer-cloud/python-sdk?branch=master)
 [![Latest Stable Version](https://img.shields.io/pypi/v/watson-developer-cloud.svg)](https://pypi.python.org/pypi/watson-developer-cloud)
@@ -66,7 +66,7 @@ Version 1.0 focuses on the move to programmatically-generated code for many of t
 ## Migration
 This version includes many breaking changes as a result of standardizing behavior across the new generated services. Full details on migration from previous versions can be found [here](https://github.com/watson-developer-cloud/python-sdk/wiki/Migration).
 
-## Configuring the http client
+## Configuring the http client (Supported from v1.1.0)
 To set client configs like timeout use the `with_http_config()` function and pass it a dictionary of configs.
 
 ```python
@@ -86,11 +86,13 @@ print(json.dumps(response, indent=2))
 ## Dependencies
 
 * [requests]
-* `pysolr` >=3.3, <4.0
-* `argparse` >=1.3.0
-* `pyOpenSSL` >=16.2.0
 * `python_dateutil` >= 2.5.3
 * [responses] for testing
+* Following for web sockets support in speech to text
+   * `autobahn` >= 0.10.9
+   * `Twisted` >= 13.2.0
+   * `pyOpenSSL` >= 16.2.0
+   * `service-identity` >= 17.0.0
 
 ## Contributing
 

examples/authorization_v1.py

@@ -6,5 +6,6 @@
     username='YOUR SERVICE USERNAME',
     password='YOUR SERVICE PASSWORD')
 
+
 print(json.dumps(authorization.get_token(url=SpeechToTextV1.default_url),
                  indent=2))

examples/conversation_tone_analyzer_integration/tone_conversation_integration.v1.py

@@ -58,7 +58,7 @@ def invokeToneConversation(payload, maintainToneHistoryInContext):
      with application-specific code to process the err or data object
      returned by the Conversation Service.
     """
-    tone = tone_analyzer.tone(tone_input=payload['input']['text'])
+    tone = tone_analyzer.tone(tone_input=payload['input']['text'], content_type='application/json')
     conversation_payload = tone_detection.\
         updateUserTone(payload, tone, maintainToneHistoryInContext)
     response = conversation.message(workspace_id=workspace_id,