@@ -54,10 +54,9 @@ before_install:
5454 - $NOMC || popd
5555 - $NOMC || export PATH="${HOME}/mc/bin:${PATH}"
5656 - $NOMC || conda update --yes conda
57- - $NOMC || conda install --yes python=${MYPYTHON_VERSION} conda-build
57+ - $NOMC || conda install --yes conda-build jinja2
5858 - $NOMC || conda create --name=testenv --yes python=${MYPYTHON_VERSION}
59- - $NOMC || conda config --add channels pavoljuhas/channel/dev
60- - $NOMC || conda config --add channels pavoljuhas
59+ - $NOMC || conda config --add channels diffpy
6160
6261 - $NOAPT || test "${TRAVIS_OS_NAME}" = "linux"
6362 - $NOAPT || sudo apt-get update -qq
@@ -71,7 +70,7 @@ before_install:
7170 https://github.com/CxxTest/cxxtest/releases/download/4.4/cxxtest-4.4.tar.gz
7271 - $NOAPT || tar xzf cxxtest-4.4.tar.gz
7372 - $NOAPT || export "CXXTEST=${PWD}/cxxtest-4.4"
74- - $NOAPT || git clone https://github.com/diffpy/libObjCryst .git
73+ - $NOAPT || git clone https://github.com/diffpy/libobjcryst .git
7574 - $NOAPT || popd
7675
7776install :
@@ -83,7 +82,7 @@ install:
8382 - $NOMC || MYPREFIX="${HOME}/mc/envs/testenv"
8483 - $NOMC || MYWORKDIR="${HOME}/mc/conda-bld/work"
8584
86- - $NOAPT || sudo scons -C ~/pkgs/libObjCryst install
85+ - $NOAPT || sudo scons -C ~/pkgs/libobjcryst install
8786 - $NOAPT || cd ~/pkgs/"$(basename "${MYTARBUNDLE}" .tar.gz)"/
8887 - $NOAPT || scons build=fast alltests
8988 - $NOAPT || sudo scons build=fast install
0 commit comments