Merge branch 'master' of http://github.com/tfussell/xlnt

.travis.yml

@@ -10,24 +10,6 @@ notifications:
 
 matrix:
   include:
-    - os: linux
-      compiler: gcc
-      addons:
-        apt:
-          sources: 
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-4.9
-            - python-pip
-      before_script:
-        - pip install --user git+git://github.com/eddyxu/cpp-coveralls.git
-      env: 
-        - COMPILER=g++-4.9
-        - COVERAGE=ON
-        - STATIC=ON
-        - SAMPLES=OFF
-        - BENCHMARKS=OFF
-
     - os: linux
       compiler: gcc
       addons:
@@ -35,12 +17,11 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
           packages:
-            - g++-5
-            - valgrind
+            - g++-6
       env:
-        - COMPILER=g++-5
+        - COMPILER=g++-6
         - COVERAGE=OFF
-        - STATIC=OFF
+        - STATIC=ON
         - SAMPLES=ON
         - BENCHMARKS=ON
 
@@ -50,6 +31,3 @@ script:
   - cmake -D STATIC=$STATIC -D BENCHMARKS=$BENCHMARKS -D SAMPLES=$SAMPLES -D COVERAGE=$COVERAGE -D CMAKE_CXX_COMPILER=$COMPILER -D CMAKE_BUILD_TYPE=Debug ..
   - cmake --build .
   - cd bin && ./xlnt.test
-  - cd ..
-  - find source/CMakeFiles/xlnt.dir
-  - if [ "$COMPILER" = "g++4.9" ]; then coveralls --root source/CMakeFiles/xlnt.dir --verbose -x ".cpp" --gcov-options '\-p' ; fi