Skip to content

Commit

Permalink
Merge e49bc97 into dc06864
Browse files Browse the repository at this point in the history
  • Loading branch information
facundobatista committed May 23, 2019
2 parents dc06864 + e49bc97 commit 0bf465b
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 11 deletions.
27 changes: 21 additions & 6 deletions .travis.yml
@@ -1,20 +1,35 @@
dist: xenial # required for Python >= 3.7

language: python

python:
- "3.5"
- "3.6"
- "3.7-dev"
- "3.7"
- "3.8-dev"
install:
- "pip install -r requirements.txt"
- if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then pip install python-coveralls ; fi
- >
if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]
then
pip install python-coveralls "pytest-cov<2.6.0"
fi
script:
- "pytest --cov=fades"
after_script:
- "flake8 fades --max-line-length=99 --select=E,W,F,C,N"
- >
if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]
then
pytest --cov=fades
else
pytest
fi
# report coverage to coveralls.io
after_success:
- if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then coveralls; fi
- >
if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]
then
coveralls
fi
cache:
apt: true
Expand Down
2 changes: 0 additions & 2 deletions requirements.txt
Expand Up @@ -7,9 +7,7 @@ pyxdg==0.25
rst2html5==1.9.3
setuptools>=5.5
wheel==0.26.0
coverage==4.0.3
pytest==4.4.2
pytest-xdist==1.28.0
pytest-sugar==0.9.2
pytest-cov==2.5.1
pytest-mock==1.10.4
4 changes: 1 addition & 3 deletions test
Expand Up @@ -10,9 +10,7 @@ else
TARGET_TESTS=""
fi

FADES='./bin/fades -r requirements.txt'

$FADES -x pytest --cov=fades $TARGET_TESTS
./bin/fades -r requirements.txt -d pytest-cov -x pytest --cov=fades $TARGET_TESTS

# check if we are using exit() in the code.
if grep -r -n ' exit(' --include="*.py" .; then echo 'Please use sys.exit() instead of exit(). https://github.com/PyAr/fades/issues/280'; fi

0 comments on commit 0bf465b

Please sign in to comment.