Skip to content

Commit

Permalink
Merge pull request #86 from blue-yonder/coverage
Browse files Browse the repository at this point in the history
Coverage
  • Loading branch information
MathMagique committed May 5, 2017
2 parents 9f1e28e + 0011372 commit e756baa
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 4 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ before_install: |
fi
install:
- pip install numpy==1.8.0 six twine
- pip install numpy==1.8.0 six twine pytest-cov coveralls

before_script: |
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
Expand All @@ -96,6 +96,9 @@ script:
- cmake -DCMAKE_INSTALL_PREFIX=./dist -DPYBIND11_PYTHON_VERSION=${TRAVIS_PYTHON_VERSION} ..
- make -j4
- ctest --verbose
- cd ../python/turbodbc_test
- coveralls
- cd ../../build
- make install
- cd dist
- python setup.py sdist
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ Version 1.1.2 (unreleased)
* Fixed bug with `cursor.rowcount` not showing the correct value when
manipulating queries were used without placeholders, i.e., with
parameters baked into the query.
* Global interpreter lock (GIL) is released during some operations to
facilitate basic multi-threading (thanks @chmp)
* Internal: The return code `SQL_SUCCESS_WITH_INFO` is now treated as
a success instead of an error when allocating environment, connection,
and statement handles. This may improve compatibility with some databases.
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Turbodbc - Turbocharged database access for data scientists.
[![Build Status](https://travis-ci.org/blue-yonder/turbodbc.svg?branch=master)](https://travis-ci.org/blue-yonder/turbodbc)
[![Build status](https://ci.appveyor.com/api/projects/status/e1e8wlidpvpmcauu/branch/master?svg=true)](https://ci.appveyor.com/project/MathMagique/turbodbc/branch/master)
[![Documentation Status](https://readthedocs.org/projects/turbodbc/badge/?version=latest)](http://turbodbc.readthedocs.io/en/latest/?badge=latest)
[![Coverage Status](https://coveralls.io/repos/github/blue-yonder/turbodbc/badge.svg)](https://coveralls.io/github/blue-yonder/turbodbc)

Turbodbc is a Python module to access relational databases via the
[Open Database Connectivity (ODBC)](https://en.wikipedia.org/wiki/Open_Database_Connectivity)
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ install:
SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
pip install numpy pytest mock
pip install numpy pytest pytest-cov mock
echo %PYTHON%
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ do the following:

::

pip install numpy pytest mock
pip install numpy pytest pytest-cov mock

#. Make sure you have a recent version of ``cmake`` installed. For some operating
systems, binary wheels are available in addition to the package your operating
Expand Down
2 changes: 1 addition & 1 deletion python/turbodbc_test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ find_package(PythonInterp REQUIRED)
add_test(
NAME turbodbc_integration_test
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMAND py.test -s --junitxml=${CMAKE_BINARY_DIR}/turbodbc_python_test.xml
COMMAND py.test --cov=turbodbc -s --junitxml=${CMAKE_BINARY_DIR}/turbodbc_python_test.xml --cov-report= --cov-report=term-missing
)
set_tests_properties(
turbodbc_integration_test
Expand Down

0 comments on commit e756baa

Please sign in to comment.