Merge pull request #68 from CDAT/update_push_env_script

update make_env_from_yamls.bash and push_env_packages.py for v82
CDAT · Oct 28, 2019 · 80f331f · 80f331f
2 parents ad14624 + d595b78
commit 80f331f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/make_env_from_yamls.bash b/make_env_from_yamls.bash
@@ -1,12 +1,7 @@
 #!/usr/bin/env bash
 
-export RELEASE="v81"
-export PREPEND_CHANNEL="-c cdat/label/test"
-export PREPEND_CHANNEL=""
-export APPEND_CHANNEL=""
-
-export ACTIVATE_COMMAND="conda"
-export CREATE="n"
+export RELEASE="v82"
+export ACTIVATE_COMMAND="source"
 
 echo "ACTIVATE COMMAND: ${ACTIVATE_COMMAND}"
 
@@ -25,7 +20,8 @@ for PYVER in 2.7 3.6 3.7
                 export MESA_PKG=""
             fi
             echo "Doing version $PYVER with mesalib set to $MESA"
-            conda env create -f cdat-${RELEASE}${MESA_NAME}_py$PYVER.$(uname).yaml 
+            conda env create -n cdat-${RELEASE}${MESA_NAME}_py$PYVER -f cdat-${RELEASE}${MESA_NAME}_py$PYVER.$(uname).yaml
+	    echo "conda env create -n cdat-${RELEASE}${MESA_NAME}_py$PYVER -f cdat-${RELEASE}${MESA_NAME}_py$PYVER.$(uname).yaml"
             ${ACTIVATE_COMMAND} deactivate
             ${ACTIVATE_COMMAND} activate base
         done

diff --git a/push_env_packages.py b/push_env_packages.py
@@ -29,7 +29,7 @@ def run_cmd(cmd, verbose=False):
     tarball = os.path.join(conda_pkgs,tarname)
     print("looking at:",tarball,os.path.exists(tarball))
     if os.path.exists(tarball):
-        o,e = run_cmd("/Users/doutriaux1/miniconda3/bin/anaconda upload {} -u cdat-forge".format(tarball), verbose=True)
+        o,e = run_cmd("anaconda upload {} -u cdat-forge".format(tarball), verbose=True)
         print("OUT:",o.decode("utf8"))
         print("Err:",e.decode("utf8"))
     else: