You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by jo...@apache.org on 2014/06/04 23:23:26 UTC

[03/12] git commit: CLIMATE-454 - Copy over install dependencies during VM build

CLIMATE-454 - Copy over install dependencies during VM build

- The requirements files for pip and conda weren't being copied over
  during the VM build which was causing it to fail. The requirements
  files for both pip and conda are copied over now even though the conda
  one isn't used at the moment. In the future, it is planned that conda
  will be used instead of downloading an Anaconda Python distribution.


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

Branch: refs/heads/master
Commit: 3fd3478a170d7f94166b6d1253d50608c866739b
Parents: e9437d0
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jun 4 11:13:49 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jun 4 11:13:49 2014 -0700

----------------------------------------------------------------------
 ocw-vm/init-ocw-vm.sh | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/3fd3478a/ocw-vm/init-ocw-vm.sh
----------------------------------------------------------------------
diff --git a/ocw-vm/init-ocw-vm.sh b/ocw-vm/init-ocw-vm.sh
index 720775c..c0d6f37 100755
--- a/ocw-vm/init-ocw-vm.sh
+++ b/ocw-vm/init-ocw-vm.sh
@@ -39,5 +39,10 @@ sudo apt-get install -y eog
 # Use the Easy-OCW Ubuntu install script to get everything
 # else installed!
 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-12_04.sh .
+# Copy the requirements files for conda and pip used by Easy-OCW
+cp climate/easy-ocw/*.txt .
+
 bash install-ubuntu-12_04.sh -q