diff --git a/.travis.yml b/.travis.yml index e5cdc4c706..75931c6201 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,9 +15,9 @@ before_install: - conda install cmake script: - export NOX="OFF" -- export CONDA_XTRA="uvcdat" +- export CONDA_XTRA="conda-forge -c uvcdat" - export NCPUS="4" -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then export NOX="ON"; export CONDA_XTRA="uvcdat -c spyder-ide libxcb"; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then export NOX="ON"; export CONDA_XTRA="conda-forge -c uvcdat -c spyder-ide libxcb"; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export NCPUS="8" ; fi - echo $TRAVIS_BRANCH - export TRAVIS_PR_BRANCH=$TRAVIS_BRANCH diff --git a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in index baddecc0ae..efa32adb6e 100755 --- a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in +++ b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in @@ -1,6 +1,6 @@ #!/usr/bin/env bash -@CONDA@ create -y -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@ ipython libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor proj4>=4.9.2 vtk@CONDA_NOX@ libcdms flake8 requests numpy hdf5=1.8.16 cycler matplotlib --show-channel-urls --copy +@CONDA@ create -y -n @CONDA_ENVIRONMENT_NAME@ -c @CONDA_CHANNEL_UVCDAT@ ipython libnetcdf lapack clapack ossuuid libcf esmf jasper g2clib yasm x264 ffmpeg cmor vtk-cdat@CONDA_NOX@ libcdms flake8 requests numpy cycler matplotlib --show-channel-urls --copy source @ACTIVATE@ @CONDA_ENVIRONMENT_NAME@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b8161dda8..fabe4250fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -254,7 +254,7 @@ include(ExternalProject) include(cdat_pkg) # CONDA Options set(CONDA_ENVIRONMENT_NAME ${cdat_VERSION} CACHE STRING "Name of conda environment we want to build CDAT in") -set(CONDA_CHANNEL_UVCDAT uvcdat CACHE STRING "channels to use (if more than one use '-c' between channels e.g. uvcdat/label/nightly -c uvcdat)") +set(CONDA_CHANNEL_UVCDAT "conda-forge -c uvcdat" CACHE STRING "channels to use (if more than one use '-c' between channels e.g. uvcdat/label/nightly -c uvcdat)") execute_process(COMMAND "${GIT_EXECUTABLE}" symbolic-ref --short HEAD