Skip to content

Commit

Permalink
Merge 497b380 into 743081e
Browse files Browse the repository at this point in the history
  • Loading branch information
@ssbarnea
ssbarnea committed Nov 14, 2016
2 parents 743081e + 497b380 commit 8993b26
Show file tree
Hide file tree
Showing 25 changed files with 489 additions and 2,865 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@ tests/settings.py
tests/test-reports-*/*
**/*.log
/.python-version
/CHANGELOG
/AUTHORS
3 changes: 1 addition & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ install:
- pip -q --log dist/pip.log install -r requirements.txt -r requirements-dev.txt
- pwd
script:
- travis_wait python setup.py test
- python setup.py test
- export PACKAGE_NAME=$(python setup.py --name)
- export PACKAGE_VERSION=$(python setup.py --version)
after_success:
Expand All @@ -34,7 +34,6 @@ after_success:
- coveralls
- travis_wait python setup.py prerelease
- requires.io update-site -t ac3bbcca32ae03237a6aae2b02eb9411045489bb -r
- make test
after_failure:
- python travis_after_all.py
- export $(cat .to_export_back)
Expand Down
Loading

0 comments on commit 8993b26

Please sign in to comment.