You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by go...@apache.org on 2014/06/04 22:33:54 UTC
[1/2] git commit: Removed the extra second source activate command
for conda
Repository: climate
Updated Branches:
refs/heads/CLIMATE-451 7ccd34b83 -> 98e3cb5f5
Removed the extra second source activate command for conda
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/b8dda5f7
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/b8dda5f7
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/b8dda5f7
Branch: refs/heads/CLIMATE-451
Commit: b8dda5f7a8c41143a48f2f9fba1f511898c823db
Parents: 7ccd34b
Author: cgoodale <si...@gmail.com>
Authored: Wed Jun 4 12:37:37 2014 -0700
Committer: cgoodale <si...@gmail.com>
Committed: Wed Jun 4 12:37:37 2014 -0700
----------------------------------------------------------------------
easy-ocw/install-osx.sh | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/b8dda5f7/easy-ocw/install-osx.sh
----------------------------------------------------------------------
diff --git a/easy-ocw/install-osx.sh b/easy-ocw/install-osx.sh
index e9419a9..c3ddddc 100755
--- a/easy-ocw/install-osx.sh
+++ b/easy-ocw/install-osx.sh
@@ -149,9 +149,6 @@ conda init >> install_log
header "Installing dependencies with conda ..."
echo | conda install --file ocw-conda-dependencies.txt
-# Before installing packages with pip we need to activate the virtualenv with conda
-source ~/ocw/bin/activate ~/ocw >> install_log
-
# We only use conda for the annoying dependencies like numpy,
# scipy, matplotlib, and basemap. For everything else, we stick
# with pip.
[2/2] git commit: Add additional POST INSTALL Message
Posted by go...@apache.org.
Add additional POST INSTALL Message
- Elaborated the POST INSTALL Message when the -e flag is used
- Create a new POST INSTALL Message for those who do not use the -e
option
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/98e3cb5f
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/98e3cb5f
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/98e3cb5f
Branch: refs/heads/CLIMATE-451
Commit: 98e3cb5f53979b876da8c8acbcb0dea654dcb006
Parents: b8dda5f
Author: cgoodale <si...@gmail.com>
Authored: Wed Jun 4 13:23:55 2014 -0700
Committer: cgoodale <si...@gmail.com>
Committed: Wed Jun 4 13:23:55 2014 -0700
----------------------------------------------------------------------
easy-ocw/install-osx.sh | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/98e3cb5f/easy-ocw/install-osx.sh
----------------------------------------------------------------------
diff --git a/easy-ocw/install-osx.sh b/easy-ocw/install-osx.sh
index c3ddddc..1e6a248 100755
--- a/easy-ocw/install-osx.sh
+++ b/easy-ocw/install-osx.sh
@@ -158,6 +158,12 @@ pip install -r ocw-pip-dependencies.txt >> install_log
if [ $WITH_VIRTUAL_ENV == 1 ]; then
echo "***POST INSTALLATION NOTE***
+
+If you are familiar with virtualenv you should know that activating
+the new 'ocw' environment is different because we use conda to install
+packages. An example of the command you want to run is listed in the
+alias below.
+
To make it easier to change into the 'ocw' virtualenv add the
following alias to your ~/.bash_profile
@@ -165,5 +171,26 @@ following alias to your ~/.bash_profile
When you want to use ocw in the future, you just have to type 'ocw'
in your terminal."
+else
+ echo "***POST INSTALLATION NOTE***
+
+If you have run this script within your own virtualenv you need to know
+a couple of caveats/side effects that are caused by using conda to install
+packages within the virtualenv.
+
+- Virtualenv wrapper will throw errors like those outlined here:
+https://issues.apache.org/jira/browse/CLIMATE-451
+
+- You will not be able to 'activate' the environment using the normal
+virtualenv command, you must instead use the conda activate command as follows:
+
+source path/to/your_env/bin/activate path/to/your_env
+
+Example: (assuming your env is in ~/.virtualenv/ocw)
+
+source ~/.virtualenv/ocw/bin/activate ~/.virtualenv/ocw
+
+"
+
fi