Skip to content

Commit

Permalink
Merge branch 'codecov'
Browse files Browse the repository at this point in the history
  • Loading branch information
mcsitter committed Oct 25, 2019
2 parents 21513ab + af72ffd commit 1371d61
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 2 deletions.
7 changes: 6 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@ python:


# Command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
install: pip install -U tox-travis
install:
- pip install tox-travis
- pip install codecov

# Command to run tests, e.g. python setup.py test
script: tox

after_success:
codecov
7 changes: 7 additions & 0 deletions adnipy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
import matplotlib
import pandas as pd

if pd.__version__[:4] == "0.25":
pass
elif pd.__version__[:4] == "0.24":
pass
elif pd.__version__[:4] == "0.23":
pass

from .adnipy import (
drop_dynamic,
get_matching_images,
Expand Down
4 changes: 3 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,13 @@ commands = flake8 adnipy
setenv =
PYTHONPATH = {toxinidir}
deps =
pip==19.3.1
coverage
pytest
pandas23: pandas>=0.23,<0.24
pandas24: pandas>=0.24,<0.25
pandas25: pandas>=0.25
commands =
pip install -U pip
py.test --basetemp={envtmpdir}
coverage run -a -m py.test --basetemp={envtmpdir}

0 comments on commit 1371d61

Please sign in to comment.