Skip to content

Commit

Permalink
Merge pull request #215 from SylvainCorlay/drop-quanstack-channel
Browse files Browse the repository at this point in the history
Drop QuantStack channel in CI
  • Loading branch information
SylvainCorlay committed Jan 19, 2019
2 parents b12bfea + f94db58 commit 1974c29
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
15 changes: 8 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ matrix:
- ubuntu-toolchain-r-test
- os: osx
osx_image: xcode8
compiler: clang
install:
# Define the version of miniconda to download
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
Expand All @@ -28,17 +27,19 @@ install:
- hash -r
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
# Install dependencies
- conda install cmake 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
# 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
# Install build dependencies
- conda install cmake -c conda-forge
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
conda install gcc-7 -c QuantStack -c conda-forge;
elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
conda install clangdev llvmdev -c QuantStack -c conda-forge;
conda install gxx_linux-64 -c conda-forge;
fi
# Activate root environment
- source activate root
# Build and install xeus-cling
- mkdir build
- cd build
- cmake -D CMAKE_INSTALL_PREFIX=$HOME/miniconda/ ..
- cmake -D CMAKE_INSTALL_PREFIX=$HOME/miniconda/ -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX ..
- make -j2 install
# Install jupyter_kernel_test and pytest
- conda install pytest jupyter_kernel_test -c conda-forge
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ source activate cling
Then you can install in this environment `xeus-cling` and its dependencies

```
conda install xeus-cling notebook -c QuantStack -c conda-forge
conda install xeus-cling -c conda-forge
```

Or you can install it directly from the sources, if all the dependencies are already installed.
Expand Down

0 comments on commit 1974c29

Please sign in to comment.