From 0a28b7ca667e2691cd281b444e0cf7bae3a534c4 Mon Sep 17 00:00:00 2001 From: Charles Doutriaux Date: Sun, 30 Oct 2016 13:03:41 -0700 Subject: [PATCH] Np11 (#2136) * removed numbering for numpy * pulling for safety --- CMake/cdat_modules_extra/install_cdat_from_conda.bash.in | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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 ca00c62c28..baddecc0ae 100755 --- a/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in +++ b/CMake/cdat_modules_extra/install_cdat_from_conda.bash.in @@ -1,14 +1,12 @@ #!/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==1.9.2 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 proj4>=4.9.2 vtk@CONDA_NOX@ libcdms flake8 requests numpy hdf5=1.8.16 cycler matplotlib --show-channel-urls --copy source @ACTIVATE@ @CONDA_ENVIRONMENT_NAME@ for pkg in cdat_info cdtime cdms esg dv3d vcs vcsaddons cdutil unidata xmgrace genutil thermo wk distarray; do - cd @cdat_BINARY_DIR@ - git clone git://github.com/UV-CDAT/${pkg} - cd ${pkg} - git checkout @CHECKOUT_BRANCH@ + cd @cdat_BINARY_DIR@/${pkg} + git pull rm -rf build if [ ${pkg} == "vcs" ]; then python setup.py install --old-and-unmanageable