[1/2] climate git commit: CLIMATE-712 - Update VM build to use conda install

[jo...@apache.org]

Repository: climate
Updated Branches:
  refs/heads/master a9c8ef40f -> bc6c08c08


CLIMATE-712 - Update VM build to use conda install

- Update the VM build script to use the new conda based dependency
  install from Easy-OCW.
- Add activate of OCW conda environment to system .bashrc.
- Update script so "interactive mode" checks in the .bashrc file wont
  break the build.


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/3706b95c
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/3706b95c
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/3706b95c

Branch: refs/heads/master
Commit: 3706b95cda8c088a6142ec2bdb46cd843aa8e419
Parents: a9c8ef4
Author: Michael Joyce <jo...@apache.org>
Authored: Fri Nov 20 15:02:38 2015 -0800
Committer: Michael Joyce <jo...@apache.org>
Committed: Fri Nov 20 15:02:38 2015 -0800

----------------------------------------------------------------------
 ocw-vm/init-ocw-vm.sh | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/3706b95c/ocw-vm/init-ocw-vm.sh
----------------------------------------------------------------------
diff --git a/ocw-vm/init-ocw-vm.sh b/ocw-vm/init-ocw-vm.sh
index bf38fd7..1f941e4 100755
--- a/ocw-vm/init-ocw-vm.sh
+++ b/ocw-vm/init-ocw-vm.sh
@@ -17,6 +17,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
+# Make sure we don't fail to source a .bashrc file due to
+# interactive mode checks.
+PS1='$ '
+
 # Install some useful/necessary dependencies to make future installs easier
 sudo apt-get update
 sudo apt-get install -y make
@@ -29,6 +33,7 @@ sudo apt-get install -y python-dev
 sudo apt-get install -y ia32-libs --fix-missing
 sudo apt-get install -y git
 sudo apt-get install -y vim
+sudo apt-get install -y curl
 
 # GUI related installs
 sudo apt-get install -y lightdm
@@ -46,21 +51,23 @@ sudo apt-get install -y ubuntu-desktop
 git clone http://git-wip-us.apache.org/repos/asf/climate.git
 
 # Copy the Easy-OCW install script for Ubuntu
-cp climate/easy-ocw/install-ubuntu.sh .
+cp climate/easy-ocw/conda-install.sh .
 # Copy the requirements files for conda and pip used by Easy-OCW
 cp climate/easy-ocw/*.txt .
 
-bash install-ubuntu.sh -q
+./conda-install.sh
 
 # Set symlink for the UI frontend code
 cd climate/ocw-ui/backend
 ln -s ../frontend/app app
 
-# Cleanup Anaconda and Basemap downloads from the install script
+# Cleanup junk from the install
 cd
-sudo rm -f Anaconda-1.9.2-Linux-x86_64.sh
-sudo rm -f basemap-1.0.7.tar.gz
-sudo rm -rf basemap-1.0.7
+rm *.sh
+rm *.txt
+
+# Auto-activate the OCW conda environment!
+echo "source activate OCW" >> ~/.bashrc
 
 mkdir /home/vagrant/Desktop
 
@@ -101,3 +108,5 @@ UIBOOTUP
 chmod +x ~/Desktop/climate.desktop
 chmod +x ~/Desktop/.ui.sh
 chmod +x ~/Desktop/ui.desktop
+
+source ~/.bashrc

[2/2] climate git commit: Resolve CLIMATE-712. Merge PR #266.

[jo...@apache.org]

Resolve CLIMATE-712. Merge PR #266.


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/bc6c08c0
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/bc6c08c0
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/bc6c08c0

Branch: refs/heads/master
Commit: bc6c08c08f5b90276910d617873ae06432cb459d
Parents: a9c8ef4 3706b95
Author: Michael Joyce <jo...@apache.org>
Authored: Fri Nov 20 15:05:48 2015 -0800
Committer: Michael Joyce <jo...@apache.org>
Committed: Fri Nov 20 15:05:48 2015 -0800

----------------------------------------------------------------------
 ocw-vm/init-ocw-vm.sh | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------