conda root is first

lisa/update_stable.py

@@ -22,31 +22,32 @@ def update(dry_run=False):
         except:
             logger.warning('Problem with git pull')
     conda_ok = True
-    print ('Updating conda modules')
+    print ('Updating conda root modules')
     try:
         cmd = ["conda", "install", "--yes", "--file",
-               op.join(path_to_base, "requirements_conda.txt")]
+               op.join(path_to_base, "requirements_conda_root.txt")]
         if dry_run:
             cmd.append('--dry-run')
         subprocess.call(cmd)
     except:
-        logger.warning('Problem with conda update')
+        logger.warning('Problem with conda root update')
         traceback.print_exc()
         conda_ok = False
-        # try:
-        #     install_and_import('wget', '--user')
 
-    print ('Updating conda root modules')
+    print ('Updating conda modules')
     try:
         cmd = ["conda", "install", "--yes", "--file",
-               op.join(path_to_base, "requirements_conda_root.txt")]
+               op.join(path_to_base, "requirements_conda.txt")]
         if dry_run:
             cmd.append('--dry-run')
         subprocess.call(cmd)
     except:
-        logger.warning('Problem with conda root update')
+        logger.warning('Problem with conda update')
         traceback.print_exc()
         conda_ok = False
+        # try:
+        #     install_and_import('wget', '--user')
+
 
     print ('Updating pip modules')
     try:

requirements_conda.txt

@@ -1,8 +1,8 @@
 # This file may be used to create an environment using:
 # $ conda create --name <env> --file <this file>
 # platform: win-64
-# numpy=1.9.1=py27_0
-numpy=1.9.2=py27_0
+numpy=1.9.1=py27_0
+# numpy=1.9.2=py27_0
 pip=6.0.8=py27_0
 python=2.7.9=1
 scipy=0.15.1=np19py27_0

requirements_conda_root.txt

@@ -1,2 +1,2 @@
-conda=3.7.0
+conda=3.10.0