Skip to content

Commit

Permalink
Merge pull request #322 from skirpichev/v0.8.0a2
Browse files Browse the repository at this point in the history
v0.8.0a2
  • Loading branch information
skirpichev committed Aug 3, 2016
2 parents f853f32 + 8dc50ee commit cd1c762
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
15 changes: 7 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
branches:
only: master
language: python
sudo: false
cache: pip
Expand All @@ -19,10 +17,11 @@ addons:
matrix:
include:
- python: 3.4
env: COVERAGE_MARK='not slow and not xfail'
env: COVERAGE='on' SELECT='not slow and not xfail'
- python: 3.4
env: COVERAGE_MARK='slow and not xfail'
env: COVERAGE='on' SELECT='slow and not xfail'
- python: 3.4
env: COVERAGE='on' EXTRA='on'
install:
- pip install flake8 sphinx numpydoc pytest-cov sphinx_rtd_theme
- travis_wait pip install .[exports,plot,interactive]
Expand Down Expand Up @@ -52,12 +51,12 @@ before_script:
- export DISPLAY=:99.0
script:
- |
if [ -n "${COVERAGE_MARK}" ]; then
python setup.py test --cov -m "${COVERAGE_MARK}"
if [ -n "${COVERAGE}" ]; then
python setup.py test --cov -m "${SELECT}"
else
python setup.py test
fi
after_success: test -n "${COVERAGE_MARK}" && codecov
after_success: test -n "${COVERAGE}" && codecov
deploy:
provider: pypi
user: skirpichev
Expand All @@ -68,7 +67,7 @@ deploy:
server: https://testpypi.python.org/pypi
on:
python: 3.4
condition: -z "${COVERAGE_MARK}"
condition: -z "${COVERAGE}"
tags: true
notifications:
email: false
2 changes: 1 addition & 1 deletion diofant/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
simple as possible in order to be comprehensible and easily extensible.
"""

__version__ = "0.8.0a1"
__version__ = "0.8.0a2"

import os
DIOFANT_DEBUG = os.getenv('DIOFANT_DEBUG', 'False') != 'False'
Expand Down

0 comments on commit cd1c762

Please sign in to comment.