Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

For v82 #66

Merged
merged 5 commits into from
Oct 18, 2019
Merged

For v82 #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f6c8ce
update cdat_metapackage.bash for v82
LinaMuryanto Sep 26, 2019
2dc6c77
update make_env.bash
LinaMuryanto Oct 3, 2019
057713e
fixed typo in make_env.bash
LinaMuryanto Oct 3, 2019
9120fef
cdat 82
LinaMuryanto Oct 18, 2019
bf03411
remove -x from make_env.bash
LinaMuryanto Oct 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions cdat_metapackage.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
export VERSION=8.1
export CDAT_VERSION=8.1
export CDAT_INFO_VERSION=8.1.1
export CDMS_VERSION=3.1.2
#!/bin/bash -x
export VERSION=8.2
export CDAT_VERSION=8.2
export CDAT_INFO_VERSION=8.2
export CDMS_VERSION=3.1.4
export CDTIME_VERSION=3.1.2
export GENUTIL_VERSION=8.1.1
export GENUTIL_VERSION=8.2
export VERSION_EXTRA=""
export BUILD=1
export OPERATOR="=="
export CDMS_OPERATOR="=="
export PY3_VERSION="<"
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 scipy "ffmpeg >4"
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"
20 changes: 17 additions & 3 deletions make_env.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,34 @@
#!/usr/bin/env bash

export RELEASE="v81"
export RELEASE="v82"
export PREPEND_CHANNEL="-c cdat/label/test"
export PREPEND_CHANNEL=""
export APPEND_CHANNEL=""

export ACTIVATE_COMMAND="conda"
export CREATE="n"
#export ACTIVATE_COMMAND="conda"
export ACTIVATE_COMMAND="source"
export CREATE="y"

echo "ACTIVATE COMMAND: ${ACTIVATE_COMMAND}"

#export CONDA_BASE=$(conda info --base)
#echo "CONDA_BASE: $CONDA_BASE"


${ACTIVATE_COMMAND} deactivate
${ACTIVATE_COMMAND} activate base

#source $CONDA_BASE/etc/profile.d/conda.sh

for PYVER in 2.7 3.6 3.7
do
if [ $PYVER == "2.7" ]; then
PYVER_STR = "python<3"
elif [ $PYVER == "3.6" ]; then
PYVER_STR = "python>=3.6,<3.7"
else
PYVER_STR = "python>=3.7"
fi
for MESA in y n
do
if [ $MESA == "y" ]; then
Expand Down