Skip to content

Commit

Permalink
Fixed travis config as travis-after-all is now embeded into tox-travis
Browse files Browse the repository at this point in the history
Change-Id: Ib8a4209d1a5c073e156e233e41e46b3c547cc19e
  • Loading branch information
ssbarnea committed Jan 14, 2017
1 parent c5668bc commit 08fdfa6
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
15 changes: 10 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@ python:
- '3.5'
- '3.6'
install:
- pip -q --log dist/pip.log install --upgrade pip setuptools tox-travis py
- pip -q --log dist/pip.log install --upgrade pip setuptools tox-travis py wheel
- python setup.py install bdist_wheel
- pip install ./dist/jira-*.whl
- pip --version
script:
- tox
- export PACKAGE_NAME=$(python setup.py --name)
- export PACKAGE_VERSION=$(python setup.py --version)
- tox --installpkg ./dist/jira-*.whl --travis-after
after_success:
- python travis_after_all.py
- export $(cat .to_export_back)
Expand Down Expand Up @@ -63,7 +65,8 @@ deploy:
skip_cleanup: true
on:
tags: false
condition: "$BUILD_LEADER = YES"
python: 2.7
condition: $TOXENV != docs
- provider: pypi
user: sorin
password:
Expand All @@ -72,7 +75,8 @@ deploy:
skip_cleanup: true
on:
tags: false
condition: "$BUILD_LEADER = YES"
python: 2.7
condition: $TOXENV != docs
branch: master
- provider: pypi
server: https://testpypi.python.org/pypi
Expand All @@ -83,7 +87,8 @@ deploy:
skip_cleanup: true
on:
tags: false
condition: "$BUILD_LEADER = YES"
python: 2.7
condition: $TOXENV != docs
branch: develop
after_deploy:
- echo "Now we only have tag the changeset and push..."
Expand Down
3 changes: 3 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@ setenv =
PYTHONPATH =
passenv =
CI_JIRA_*

[travis:after]
toxenv = py27

0 comments on commit 08fdfa6

Please sign in to comment.