Skip to content

Commit

Permalink
Reenable OSX, clean up unused stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
MathMagique committed May 19, 2017
1 parent 76db01b commit e1c48cc
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 13 deletions.
18 changes: 8 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ sudo: required

matrix:
include:
# - os: osx
# osx_image: xcode6.4
# language: generic
# env:
# - TRAVIS_PYTHON_VERSION="2.7.12"
# - TURBODBC_TEST_CONFIGURATION_FILES="query_fixtures_postgresql.json"
# - ODBC_DIR=odbc_osx
- os: osx
osx_image: xcode6.4
language: generic
env:
- TRAVIS_PYTHON_VERSION="2.7.12"
- TURBODBC_TEST_CONFIGURATION_FILES="query_fixtures_postgresql.json"
- ODBC_DIR=odbc_osx
# Disable for now until a workaround for the detection of pyenv versions by pybind11
# is found
# - os: osx
Expand Down Expand Up @@ -108,9 +108,7 @@ script:
- echo "Uploading C++ coverage"
- bash <(curl -s https://codecov.io/bash) -s $PWD/gcov/ -X coveragepy -X gcov

# - cd ../python/turbodbc_test
# - coveralls
# - cd ../../build
# - cd build
# - make install
# - cd dist
# - python setup.py sdist
Expand Down
3 changes: 0 additions & 3 deletions codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,3 @@ ignore:
- "cpp/cpp_odbc/Library/src/level1/unixodbc_backend_debug.cpp"
# C++-only things that are currently not considered as part of the interface
- "cpp/turbodbc/Library/src/parameter_sets/field_parameter_set.cpp"

fixes:
# - "/home/travis/build/blue-yonder/turbodbc/build/turbodbc/::python/turbodbc/"

0 comments on commit e1c48cc

Please sign in to comment.