Skip to content

Commit

Permalink
Merge pull request #79 from simpeg/ref/travis
Browse files Browse the repository at this point in the history
remove travis dev deployment
  • Loading branch information
lheagy authored Dec 5, 2017
2 parents d88c1f0 + 3f28b6c commit d8b41dc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ sudo: false
env:
global:
- MASTER_BRANCH=master
- DEV_BRANCH=dev
- PYPI_PY=3.6 # deploy to pypi from python 3.6

before_install:
Expand Down Expand Up @@ -40,10 +39,11 @@ script:
- nosetests tests/base tests/tree tests/docs --with-cov --cov discretize --cov-config .coveragerc -v -s;

after_success:

- bash <(curl -s https://codecov.io/bash)

# early exit if not on a deplotment branch
- if ! [ "$TRAVIS_BRANCH" = "$MASTER_BRANCH" -o "$TRAVIS_BRANCH" = "$DEV_BRANCH" -o "$TRAVIS_TAG" = "true" ]; then
# early exit if not on a deplotment branch
- if ! [ "$TRAVIS_BRANCH" = "$MASTER_BRANCH" -o "$TRAVIS_TAG" = "true" ]; then
echo "Not deploying (because this is not a deployment branch)" ;
exit 0 ;
fi
Expand All @@ -57,14 +57,12 @@ after_success:
- tar -xvzf credentials.tar.gz

# deploy to pypi on tags
- if [ "$TRAVIS_TAG" = "true" ]; then
- if [ "$TRAVIS_TAG" = "true" -o "$TRAVIS_BRANCH" = "ref/travis" ]; then
mv credentials/.pypirc ~/.pypirc ;
python setup.py sdist bdist_wheel ;
python setup.py sdist bdist_wheel --universal ;
travis_wait 20 twine upload -r pypi --skip-existing dist/* ;
fi

# travis_wait 20 python setup.py sdist upload -r pypi ;


notifications:
slack: simpeg:1KZq5giMtlJJ58TijIPgqf7n
Binary file modified credentials.tar.gz.enc
Binary file not shown.

0 comments on commit d8b41dc

Please sign in to comment.