Fix CI

jupyter-xeus · Jan 31, 2019 · 5ca80d9 · 5ca80d9
1 parent e411155
commit 5ca80d9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -29,7 +29,7 @@ install:
   - conda update -q conda
   - conda info -a
   # Install dependencies
-  - conda install cmake dirent xeus=0.18.1 cling=0.5.0 nlohmann_json=3.3.0 cppzmq=4.3.0 xtl=0.5.2 pugixml cxxopts=2.1.1 -c QuantStack -c conda-forge
+  - conda install cmake dirent xeus=0.18.1 cling=0.5.0 clangdev=5.0 clang_variant=*=cling_6.14.06 llvmdev=5 nlohmann_json=3.3.0 cppzmq=4.3.0 xtl=0.5.2 pugixml cxxopts=2.1.1 -c QuantStack -c conda-forge
   # Build and install xeus-cling
   - mkdir build
   - cd build

diff --git a/.travis.yml b/.travis.yml
@@ -28,7 +28,7 @@ install:
     - conda config --set always_yes yes --set changeps1 no
     - conda update -q conda
     # Install host dependencies
-    - conda install xeus=0.18.1 cling=0.5.0 nlohmann_json=3.4.0 cppzmq=4.3.0 xtl=0.5.2 pugixml cxxopts=2.1.1 -c conda-forge
+    - conda install xeus=0.18.1 cling=0.5.0 clang_variant=*=cling_6.14.06 clangdev=5.0 llvmdev=5 nlohmann_json=3.4.0 cppzmq=4.3.0 xtl=0.5.2 pugixml cxxopts=2.1.1 -c conda-forge
     # Install build dependencies
     - conda install cmake -c conda-forge
     - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
@@ -41,6 +41,7 @@ install:
     - cd build
     - cmake -D CMAKE_INSTALL_PREFIX=$HOME/miniconda/ -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX ..
     - make -j2 install
+    - rm -rf test/googletest-src
     # Install jupyter_kernel_test and pytest
     - conda install pytest jupyter_kernel_test -c conda-forge
     - cd ../test

diff --git a/README.md b/README.md
@@ -65,7 +65,7 @@ Quick help is shown on the pager with the special `?` magic.
 
 ![Help](help.png)
 
-Content for the help is available for the standard library and the QuantStack packages.
+Content for the quick help is available for the standard library and the QuantStack packages.
 
 ### Rendering of rich outputs
 

diff --git a/docs/source/installation.rst b/docs/source/installation.rst
@@ -29,7 +29,7 @@ A package for xeus-cling is available on the conda package manager.
 
 .. code::
 
-    conda install -c QuantStack -c conda-forge xeus-cling
+    conda install -c conda-forge xeus-cling
 
 .. image:: cmake.svg