Merge pull request #30 from jakirkham/support_python3

Support Python 3

.travis.yml

@@ -1,7 +1,10 @@
 language: generic
 env:
-   - PYTHON_VERSION="2.7"
+   - PYTHON_VERSION="2.7" DEPLOY_DOCS=true
+   - PYTHON_VERSION="3.5"
 before_install:
+   # If `$DEPLOY_DOCS` is unset, make it `false` by default.
+   - if [ -z $DEPLOY_DOCS ]; then DEPLOY_DOCS=false; fi
    # Get the tag if it wasn't provided. Travis doesn't provide this if it isn't a tagged build.
    - if [ -z $TRAVIS_TAG ]; then TRAVIS_TAG=`git tag --contains` ; fi
    - echo $TRAVIS_TAG
@@ -52,7 +55,7 @@ install:
    - conda install nose-timer
    - echo "coverage 3.*" >> $HOME/miniconda/envs/testenv/conda-meta/pinned
    - conda install coverage
-   - conda install docstring-coverage
+   - conda install docstring-coverage || true
    - conda install python-coveralls
    # Clean up downloads as there are quite a few and they waste space/memory.
    - sudo apt-get clean
@@ -64,7 +67,7 @@ script:
    # Build documentation.
    - python setup.py build_sphinx
    # Get info on docstring coverage.
-   - docstring-coverage splauncher | tee .docstring-coverage
+   - (hash docstring-coverage && docstring-coverage nanshe | tee .docstring-coverage) || true
 after_success:
    # Submit results to coveralls.io.
    - coveralls
@@ -94,7 +97,7 @@ after_success:
    # Commit changes and push. Reference commit used and tag if relevant.
    - git add -A
    - if [ -z $TRAVIS_TAG ]; then git commit -m "Rebuilt documentation for commit (${TRAVIS_COMMIT})." --allow-empty ; else git commit -m "Rebuilt documentation for commit (${TRAVIS_COMMIT}) and tag (${TRAVIS_TAG})." --allow-empty ; fi
-   - git push -q origin gh-pages > /dev/null 2>&1; echo $?
+   - $DEPLOY_DOCS && (git push -q origin gh-pages > /dev/null 2>&1; echo $?)
    # Check to see if this is a release. If so, create and upload binaries.
    - if [ -z $TRAVIS_TAG ]; then exit 0 ; fi
    - git checkout $TRAVIS_TAG