Use tox with Travis and some cleanup (#282)

* 🎨 use too with Travis and some cleanup

* 🐛 pass VCAP_SERVICES when running tests with tox

Author: germanattanasio

.travis.yml

@@ -1,23 +1,20 @@
 language: python
 sudo: false
-notifications:
-  email: false
+
 python:
 - '2.7'
 - '3.4'
 - '3.5'
 - '3.6'
+
+cache: pip
+
 before_install:
 - ! '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_c3e85137836d_key -iv $encrypted_c3e85137836d_iv -in .env.enc -out .env -d || true'
-install:
-- pip install -r requirements-dev.txt
-- pip install pylint
-- pip install codecov
-- pip install git+git://github.com/watson-developer-cloud/python-sdk.git#egg=watson-developer-cloud
-- pip show six
-script:
-- sh pylint.sh
-- py.test test --cov=watson_developer_cloud
+
+install: pip install tox-travis
+script: tox
+
 after_success:
 - codecov
 - docs/publish.sh

CONTRIBUTING.md

@@ -1,50 +1,56 @@
-# Questions
+# Contributing
+
+## Questions
 
 If you are having difficulties using the APIs or have a question about the IBM Watson Services,
 please ask a question on [dW Answers][dw] or [Stack Overflow][stackoverflow].
 
-# Issues
+## Issues
 
 If you encounter an issue with the Python SDK, you are welcome to submit a [bug report](https://github.com/watson-developer-cloud/python-sdk/issues).
 Before that, please search for similar issues. It's possible somebody has encountered this issue already.
 
 ## Pull Requests
 
 If you want to contribute to the repository, here's a quick guide:
-  1. Fork the repository
-  2. develop and test your code changes with [pytest].
+
+1. Fork the repository
+1. Install `virtualenv` and `tox`
+1. Develop and test your code changes with [pytest].
     * Respect the original code [style guide][styleguide].
     * Only use spaces for indentation.
     * Create minimal diffs - disable on save actions like reformat source code or organize imports. If you feel the source code should be reformatted create a separate PR for this change.
-    * Check for unnecessary whitespace with git diff --check before committing.
-  3. Make the test pass
-  4. Commit your changes
-  5. Push to your fork and submit a pull request to the `dev` branch
+    * Check for unnecessary whitespace with `git diff --check` before committing.
+    * Make sure your code supports Python 2.7, 3.4, 3.5 and 3.6. You can use `pyenv` and `tox` for this
+1. Make the test pass
+1. Commit your changes
+1. Push to your fork and submit a pull request to the `dev` branch
 
 ## Running the tests
 
 You probably want to set up a [virtualenv].
 
- 1. Clone this repository:
-    ```
+1. Clone this repository:
+    ```sh
     git clone https://github.com/watson-developer-cloud/python-sdk.git
     ```
- 2. Install the sdk as an editable package using the current source:
-    ```
+1. Install the sdk as an editable package using the current source:
+    ```sh
     pip install --editable .
     ```
- 3. Install the test dependencies with:
-```
-pip install -r requirements-dev.txt
-```
- 4. Run the test cases with:
+1. Install the test dependencies with:
+    ```sh
+    pip install -r requirements-dev.txt
     ```
+1. Run the test cases with:
+    ```sh
     py.test test
     ```
 
 ## Additional Resources
-+ [General GitHub documentation](https://help.github.com/)
-+ [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
+
+* [General GitHub documentation](https://help.github.com/)
+* [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
 
 [dw]: https://developer.ibm.com/answers/questions/ask/?topics=watson
 [stackoverflow]: http://stackoverflow.com/questions/ask?tags=ibm-watson