Merge pull request #71 from CDAT/strict-order

Strict channel order
CDAT · Nov 20, 2019 · c1a56e2 · c1a56e2
2 parents 052a973 + 7707a25
commit c1a56e2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/cdat_metapackage.bash b/cdat_metapackage.bash
@@ -7,9 +7,10 @@ export CDTIME_VERSION=3.1.2
 export GENUTIL_VERSION=8.2
 export LIBNETCDF_VERSION=4.6.2
 export VERSION_EXTRA=""
-export BUILD=2
+export BUILD=3
 export OPERATOR="=="
 export CDMS_OPERATOR="=="
 export PY3_VERSION="<"
 export LIBNETCDF_OPERATOR="=="
-conda metapackage cdat ${CDAT_VERSION}${VERSION_EXTRA} --build-number ${BUILD} --dependencies "cdat_info ${OPERATOR}${CDAT_INFO_VERSION}" "distarray ${OPERATOR}2.12.2" "cdms2 ${CDMS_OPERATOR}${CDMS_VERSION}" "cdtime ${OPERATOR}${CDTIME_VERSION}" "cdutil ${OPERATOR}${VERSION}" "genutil ${OPERATOR}${GENUTIL_VERSION}" vtk-cdat "dv3d ${OPERATOR}${VERSION}" "vcs ${OPERATOR}${VERSION}" "vcsaddons ${OPERATOR}${VERSION}" "wk ${OPERATOR}${VERSION}" matplotlib basemap ipython jupyter nb_conda flake8 autopep8 spyder eofs windspharm cibots cdp output_viewer esmpy=7.1.0 scipy "ffmpeg >4" "libnetcdf ${LIBNETCDF_OPERATOR=}${LIBNETCDF_VERSION}"
+
+conda metapackage -c conda-forge -c cdat/label/v82 cdat ${CDAT_VERSION}${VERSION_EXTRA} --build-number ${BUILD} --dependencies "cdat_info ${OPERATOR}${CDAT_INFO_VERSION}" "distarray ${OPERATOR}2.12.2" "cdms2 ${CDMS_OPERATOR}${CDMS_VERSION}" "cdtime ${OPERATOR}${CDTIME_VERSION}" "cdutil ${OPERATOR}${VERSION}" "genutil ${OPERATOR}${GENUTIL_VERSION}" vtk-cdat "dv3d ${OPERATOR}${VERSION}" "vcs ${OPERATOR}${VERSION}" "vcsaddons ${OPERATOR}${VERSION}" "wk ${OPERATOR}${VERSION}" matplotlib basemap ipython jupyter nb_conda flake8 autopep8 spyder eofs windspharm cibots cdp output_viewer esmpy=7.1.0 scipy "ffmpeg >4" "libnetcdf ${LIBNETCDF_OPERATOR=}${LIBNETCDF_VERSION}"
diff --git a/make_env.bash b/make_env.bash
@@ -17,6 +17,8 @@ echo "ACTIVATE COMMAND: ${ACTIVATE_COMMAND}"
 
 ${ACTIVATE_COMMAND} deactivate
 ${ACTIVATE_COMMAND} activate base
+conda config --add channels conda-forge
+conda config --set channel_priority strict
 
 #source $CONDA_BASE/etc/profile.d/conda.sh
 
@@ -40,7 +42,7 @@ for PYVER in 2.7 3.6 3.7
             fi
             echo "Doing version $PYVER with mesalib set to $MESA"
             if [ ${CREATE} == "y" ]; then
-                conda create -y -n cdat-${RELEASE}${MESA_NAME}_py$PYVER ${PREPEND_CHANNEL} -c cdat/label/${RELEASE} -c conda-forge ${APPEND_CHANNEL} cdat python=$PYVER ${MESA_PKG}
+                conda create -y -n cdat-${RELEASE}${MESA_NAME}_py$PYVER ${PREPEND_CHANNEL} -c conda-forge -c cdat/label/${RELEASE} ${APPEND_CHANNEL} cdat python=$PYVER ${MESA_PKG}
             fi
             ${ACTIVATE_COMMAND} activate cdat-${RELEASE}${MESA_NAME}_py$PYVER
             echo $(conda list vtk)