From 9537143fe0a9f762ee4a526119edd5f16cf747d0 Mon Sep 17 00:00:00 2001 From: Vinayak Mehta Date: Tue, 2 Oct 2018 20:41:11 +0530 Subject: [PATCH] Add pytest-cov Add fix for coverage Add source and omit to coveragerc Update coveragerc Update coveragerc Add source to coveragerc Update coveragerc source Add init to tests Fix ImportError Fix ImportError again --- .coveragerc | 6 +----- .travis.yml | 6 ++++-- requirements-dev.txt | 3 ++- setup.cfg | 4 ++-- tests/__init__.py | 0 tests/{test_data.py => data.py} | 0 tests/test_common.py | 2 +- 7 files changed, 10 insertions(+), 11 deletions(-) create mode 100644 tests/__init__.py rename tests/{test_data.py => data.py} (100%) mode change 100644 => 100755 diff --git a/.coveragerc b/.coveragerc index c7bf13e..6b08179 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,6 +1,2 @@ [run] -branch = True -source = camelot -include = */camelot/* -omit = - */setup.py +branch = True \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index f475d11..cfde80d 100755 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,6 @@ +sudo: false language: python +cache: pip python: - "2.7" - "3.6" @@ -7,6 +9,6 @@ before_install: install: - pip install ".[dev]" script: - - pytest + - pytest --verbose --cov-config .coveragerc --cov-report term --cov-report xml --cov=camelot tests after_success: - - codecov + - codecov --verbose \ No newline at end of file diff --git a/requirements-dev.txt b/requirements-dev.txt index 543e97c..57c1892 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,4 +1,5 @@ codecov==2.0.15 pytest==3.8.0 +pytest-cov==2.6.0 pytest-runner==4.2 -Sphinx==1.7.9 +Sphinx==1.7.9 \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index 730f976..1b48058 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,5 +2,5 @@ test=pytest [tool:pytest] -addopts = --verbose -python_files = tests/test_*.py +addopts = --verbose --cov-config .coveragerc --cov-report term --cov-report xml --cov=camelot tests +python_files = tests/test_*.py \ No newline at end of file diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_data.py b/tests/data.py old mode 100644 new mode 100755 similarity index 100% rename from tests/test_data.py rename to tests/data.py diff --git a/tests/test_common.py b/tests/test_common.py index 10b852c..afcb611 100644 --- a/tests/test_common.py +++ b/tests/test_common.py @@ -6,7 +6,7 @@ import pandas as pd import camelot -from test_data import * +from .data import * testdir = os.path.dirname(os.path.abspath(__file__)) testdir = os.path.join(testdir, "files")