Return-Path: X-Original-To: apmail-climate-commits-archive@minotaur.apache.org Delivered-To: apmail-climate-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 627C410B8B for ; Wed, 4 Jun 2014 21:23:25 +0000 (UTC) Received: (qmail 45675 invoked by uid 500); 4 Jun 2014 21:23:25 -0000 Delivered-To: apmail-climate-commits-archive@climate.apache.org Received: (qmail 45596 invoked by uid 500); 4 Jun 2014 21:23:25 -0000 Mailing-List: contact commits-help@climate.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@climate.apache.org Delivered-To: mailing list commits@climate.apache.org Received: (qmail 45520 invoked by uid 99); 4 Jun 2014 21:23:25 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jun 2014 21:23:25 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F1B8993FB66; Wed, 4 Jun 2014 21:23:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: joyce@apache.org To: commits@climate.apache.org Date: Wed, 04 Jun 2014 21:23:26 -0000 Message-Id: <561c27e113f34ea18f42982529747f69@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Wed Jun 4 11:13:49 2014 -0700 Committer: Michael Joyce 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