Merge pull request #276 from SylvainCorlay/cling-0.6

Update to cling 0.6.0

.appveyor.yml

@@ -32,17 +32,17 @@ install:
   - conda update -q conda
   - conda info -a
   # Install dependencies
-  #- conda install cmake dirent xeus=0.23.2 cling=0.5.0 clangdev=5.0 clang_variant=*=cling_6.14.06 llvmdev=5 nlohmann_json=3.6.1 cppzmq=4.3.0 xtl=0.6.5 pugixml cxxopts=2.1.1 -c conda-forge
+  - conda install cmake dirent xeus=0.23.2 cling=0.6.0 clangdev=5.0 llvmdev=5 nlohmann_json=3.6.1 cppzmq=4.3.0 xtl=0.6.5 pugixml cxxopts=2.1.1 -c conda-forge
   # Build and install xeus-cling
-  #- mkdir build
-  #- cd build
-  #- cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D CMAKE_BUILD_TYPE=%CONFIGURATION% -D XEXTRA_JUPYTER_DATA_DIR=%MINICONDA%\\share\\jupyter ..
+  - mkdir build
+  - cd build
+  # - cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D CMAKE_BUILD_TYPE=%CONFIGURATION% -D XEXTRA_JUPYTER_DATA_DIR=%MINICONDA%\\share\\jupyter ..
   #- nmake
   #- nmake install
   # Install jupyter_kernel_test and pytest
-  #- conda install pytest jupyter_kernel_test -c conda-forge
-  #- cd..
-  #- cd test
+  - conda install pytest jupyter_kernel_test -c conda-forge
+  - cd..
+  - cd test
 
 build_script:
   # Allowing failure on jupyter kernel tests as Cling does not support windows

.travis.yml

@@ -13,7 +13,7 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
     - os: osx
-      osx_image: xcode8
+      osx_image: xcode6.4
 install:
     # Define the version of miniconda to download
     - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
@@ -28,7 +28,11 @@ install:
     - conda config --set always_yes yes --set changeps1 no
     - conda update -q conda
     # Install host dependencies
-    - conda install xeus=0.23.2 cling=0.5.0 clang_variant=*=cling_6.14.06 clangdev=5.0 llvmdev=5 nlohmann_json=3.6.1 cppzmq=4.3.0 xtl=0.6.5 pugixml cxxopts=2.1.1 -c conda-forge
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+        conda install xeus=0.23.2 cling=0.6.0 clangdev=5.0 llvmdev=5 nlohmann_json=3.6.1 cppzmq=4.3.0 xtl=0.6.5 pugixml cxxopts=2.1.1 -c conda-forge;
+      else
+        conda install xeus=0.23.2 cling=0.6.0 clangdev=5.0 libcxx llvmdev=5 nlohmann_json=3.6.1 cppzmq=4.3.0 xtl=0.6.5 pugixml cxxopts=2.1.1 -c conda-forge;
+      fi
     # Install build dependencies
     - conda install cmake -c conda-forge
     - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then