climate-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject [1/2] git commit: CLIMATE-427 - Install pip dependencies from a requirements file
Date Thu, 29 May 2014 23:28:59 GMT
Repository: climate
Updated Branches:
  refs/heads/master fd6f97926 -> 510deb9a7


CLIMATE-427 - Install pip dependencies from a requirements file

- Add ocw-pip-dependencies.txt for tracking all pip installed
  dependencies needed in an Easy-OCW installation. Note that this
  doesn't include things such as virtualenv or virtualenvwrapper which
  are only installed if the user requests them. This only includes
  dependencies that are pip installed by both the OS X and Ubuntu
  install scripts.
- Update the OS X and Ubuntu install scripts to use the new requirements
  text for pip installation.


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

Branch: refs/heads/master
Commit: ef25667da857aa8ac82ffa9e6a751e72583d9aad
Parents: fd6f979
Author: Michael Joyce <joyce@apache.org>
Authored: Thu May 29 14:54:03 2014 -0700
Committer: Michael Joyce <joyce@apache.org>
Committed: Thu May 29 14:54:03 2014 -0700

----------------------------------------------------------------------
 easy-ocw/install-osx.sh           | 32 +-------------------------------
 easy-ocw/install-ubuntu-12_04.sh  | 32 +-------------------------------
 easy-ocw/ocw-pip-dependencies.txt |  8 ++++++++
 3 files changed, 10 insertions(+), 62 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/ef25667d/easy-ocw/install-osx.sh
----------------------------------------------------------------------
diff --git a/easy-ocw/install-osx.sh b/easy-ocw/install-osx.sh
index 9bc32e7..dd477c5 100755
--- a/easy-ocw/install-osx.sh
+++ b/easy-ocw/install-osx.sh
@@ -174,34 +174,4 @@ echo | conda install --file ocw-conda-dependencies.txt
 # scipy, matplotlib, and basemap. For everything else, we stick
 # with pip.
 header "Installing additional Python packages"
-task "Installing requests ..."
-pip install requests >> install_log
-subtask "done"
-
-task "Installing bottle ..."
-pip install bottle >> install_log
-subtask "done"
-
-task "Installing pydap ..."
-pip install pydap >> install_log
-subtask "done"
-
-task "Installing webtest ..."
-pip install webtest >> install_log
-subtask "done"
-
-task "Installing nose ..."
-pip install nose >> install_log
-subtask "done"
-
-task "Installing pylint ..."
-pip install pylint >> install_log
-subtask "done"
-
-task "Installing sphinx ..."
-pip install sphinx==1.2.1 >> install_log
-subtask "done"
-
-task "Installing sphinxcontrib ..."
-pip install sphinxcontrib-httpdomain==1.2.1 >> install_log
-subtask "done"
+pip install -r ocw-pip-dependencies.txt >> install_log

http://git-wip-us.apache.org/repos/asf/climate/blob/ef25667d/easy-ocw/install-ubuntu-12_04.sh
----------------------------------------------------------------------
diff --git a/easy-ocw/install-ubuntu-12_04.sh b/easy-ocw/install-ubuntu-12_04.sh
index bc83143..db5095e 100755
--- a/easy-ocw/install-ubuntu-12_04.sh
+++ b/easy-ocw/install-ubuntu-12_04.sh
@@ -184,37 +184,7 @@ subtask "done"
 # can be installed with Conda, but since none of them have an annoying
 # compiled component we just installed them with Pip.
 header "Installing additional Python packages"
-task "Installing requests ..."
-pip install requests >> install_log
-subtask "done"
-
-task "Installing bottle ..."
-pip install bottle >> install_log
-subtask "done"
-
-task "Installing pydap ..."
-pip install pydap >> install_log
-subtask "done"
-
-task "Installing webtest ..."
-pip install webtest >> install_log
-subtask "done"
-
-task "Installing nose ..."
-pip install nose >> install_log
-subtask "done"
-
-task "Installing pylint ..."
-pip install pylint >> install_log
-subtask "done"
-
-task "Installing sphinx ..."
-pip install sphinx==1.2.1 >> install_log
-subtask "done"
-
-task "Installing sphinxcontrib ..."
-pip install sphinxcontrib-httpdomain==1.2.1 >> install_log
-subtask "done"
+pip install -r ocw-pip-dependencies.txt >> install_log
 
 # Ensure that the climate code is included in the Python Path
 header "Updating PYTHONPATH ..."

http://git-wip-us.apache.org/repos/asf/climate/blob/ef25667d/easy-ocw/ocw-pip-dependencies.txt
----------------------------------------------------------------------
diff --git a/easy-ocw/ocw-pip-dependencies.txt b/easy-ocw/ocw-pip-dependencies.txt
new file mode 100644
index 0000000..46d3daf
--- /dev/null
+++ b/easy-ocw/ocw-pip-dependencies.txt
@@ -0,0 +1,8 @@
+requests
+bottle
+pydap
+webtest
+nose
+pylint
+sphinx==1.2.1
+sphinxcontrib-httpdomain==1.2.1


Mime
View raw message