Skip to content

Commit

Permalink
update travis.yml to master
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthew Chan committed Sep 14, 2017
1 parent 4f37915 commit d85d36f
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
- PROJECT_NAME=iodata
- CONDA_PKG_NAME_PY=iodata

# TEMPLATED FROM https://raw.githubusercontent.com/theochem/python-cython-ci-example/download_template/.travis.yml
# TEMPLATED FROM https://raw.githubusercontent.com/theochem/python-cython-ci-example/master/.travis.yml
####
# EVERYTHING BELOW THIS LINE IS AUTOGENERATED.
####
Expand Down Expand Up @@ -63,7 +63,6 @@ branches:
- /^[0-9]+\.[0-9]+(\.[0-9]+)?([ab][0-9]+)?$/

before_install:
# Only run if tagged or if linux and py27 (will change to py36 layer).
- if ! [[ $TRAVIS_TAG || $TRAVIS_OS_NAME == "linux" && $MYCONDAPY == "2.7" ]]; then exit 0; fi
# Get miniconda. Take the right version, so re-installing python is hopefully not needed.
- if test -e $HOME/miniconda/bin; then
Expand Down Expand Up @@ -223,5 +222,5 @@ deploy:
local_dir: doc/_build/html
on:
repo: ${GITHUB_REPO_NAME}
condition: "$TRAVIS_TAG != *[ab]* && $MYCONDAPY == 2.7 && $TRAVIS_OS_NAME == linux"
condition: "-e doc && $TRAVIS_TAG != *[ab]* && $MYCONDAPY == 2.7 && $TRAVIS_OS_NAME == linux"
tags: true

0 comments on commit d85d36f

Please sign in to comment.