Merge pull request #299 from watson-developer-cloud/codecov

Update codecov and sphinx script

Author: germanattanasio

.travis.yml

@@ -1,21 +1,23 @@
 language: python
 sudo: false
-
 python:
 - '2.7'
 - '3.4'
 - '3.5'
 - '3.6'
-
 cache: pip
-
 before_install:
 - openssl aes-256-cbc -K $encrypted_6e98b3e8e789_key -iv $encrypted_6e98b3e8e789_iv
   -in .env.enc -out .env -d
-
 install: pip install tox-travis
 script: tox
-
-after_success:
-- codecov
-- docs/publish.sh
+before_deploy:
+- pip install -r requirements-dev.txt
+- pip install --editable .
+deploy:
+  provider: script
+  script: docs/publish.sh
+  skip_cleanup: true
+  on:
+    python: '2.7'
+    all_branches: true

docs/publish.sh

@@ -2,34 +2,30 @@
 # checking the build/job numbers allows it to only
 # publish once even though we test against multiple python versions
 
-cd $(dirname $0)
-
-if [ "$TRAVIS_REPO_SLUG" == "watson-developer-cloud/python-sdk" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" ] && [ "$TRAVIS_BUILD_NUMBER.1" == "$TRAVIS_JOB_NUMBER" ]; then
-
-  echo "Create Docs"
-  make document
-  echo "Publishing Docs..."
+[[ -z "$TRAVIS_BRANCH" ]] && { echo "TRAVIS_BRANCH cannot be null" ; exit 1; }
+[[ -z "$GH_TOKEN" ]] && { echo "GH_TOKEN cannot be null" ; exit 1; }
 
-  git config --global user.email "travis@travis-ci.org"
-  git config --global user.name "travis-ci"
-  git clone --quiet --branch=gh-pages https://${GH_TOKEN}@github.com/watson-developer-cloud/python-sdk.git gh-pages > /dev/null
-
-  pushd gh-pages
-    # on tagged builds, $TRAVIS_BRANCH is the tag (e.g. v1.2.3), otherwise it's the branch name (e.g. master)
-    rm -rf $TRAVIS_BRANCH
-    cp -Rf ../_build/html/ $TRAVIS_BRANCH
-    ../generate_index_html.sh > index.html
+cd $(dirname $0)
+pwd
 
-    git add -f .
-    git commit -m "Docs for $TRAVIS_BRANCH ($TRAVIS_COMMIT)"
-    git push -fq origin gh-pages > /dev/null
+echo "Create Docs"
+make document
+echo "Publishing Docs..."
 
-  popd
+git config --global user.email "travis@travis-ci.org"
+git config --global user.name "travis-ci"
+git clone --quiet --branch=gh-pages https://${GH_TOKEN}@github.com/watson-developer-cloud/python-sdk.git gh-pages > /dev/null
 
-  echo -e "Published Docs for $TRAVIS_BRANCH to gh-pages.\n"
+pushd gh-pages
+  # on tagged builds, $TRAVIS_BRANCH is the tag (e.g. v1.2.3), otherwise it's the branch name (e.g. master)
+  rm -rf $TRAVIS_BRANCH
+  cp -Rf ../_build/html/ $TRAVIS_BRANCH
+  ../generate_index_html.sh > index.html
 
-else
+  git add -f .
+  git commit -m "Docs for $TRAVIS_BRANCH ($TRAVIS_COMMIT)"
+  git push -fq origin gh-pages > /dev/null
+popd
 
-  echo -e "Not publishing docs for build $TRAVIS_BUILD_NUMBER ($TRAVIS_JOB_NUMBER) on branch $TRAVIS_BRANCH of repo $TRAVIS_REPO_SLUG"
+echo -e "Published Docs for $TRAVIS_BRANCH to gh-pages.\n"
 
-fi

tox.ini

@@ -2,13 +2,16 @@
 envlist = lint, py27, py34, py35, py36
 
 [testenv:lint]
-basepython=python2.7
-deps=pylint
-commands=pylint watson_developer_cloud
+basepython = python2.7
+deps = pylint
+commands = pylint watson_developer_cloud
 
 [testenv]
-commands = py.test --rerun 5 --cov=watson_developer_cloud
+passenv = TOXENV CI TRAVIS*
+commands = 
+         py.test --rerun 5 --cov=watson_developer_cloud
+         codecov -e TOXENV
 deps =
      -r{toxinidir}/requirements.txt
      -r{toxinidir}/requirements-dev.txt
-exclude = .venv,.git,.tox,docs
+exclude = .venv,.git,.tox,docs