Issue clear warning when using Galaxy within planemo's virtualenv.

Stipulate warning added in 4a5f3cc only applies if you are not using the brew install.
galaxyproject · Dec 19, 2014 · aa80141 · aa80141
1 parent 4a5f3cc
commit aa80141
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/README.rst b/README.rst
@@ -43,9 +43,12 @@ install with ``pip``.
    % virtualenv .venv; . .venv/bin/activate
    % pip install git+https://github.com/galaxyproject/planemo.git
 
-To prevent errors:
- * Please do not install Planemo into the same virtualenv with Galaxy.
- * Please do not use Galaxy from Planemo's virtualenv.
+If *not* using the brew recipe, Planemo and Galaxy `may conflict
+<http://planemo.readthedocs.org/en/latest/installation.html>`_ with
+each other - to prevent errors:
+
+* Do not install Planemo into Galaxy's virtualenv.
+* Do not use Galaxy from Planemo's virtualenv.
 
 This quick start will assume you will have a directory with one or more
 tool XML files. If none is available, one can be quickly create for

diff --git a/galaxy/eggs/__init__.py b/galaxy/eggs/__init__.py
@@ -0,0 +1,7 @@
+PLANEMO_WARNING = ("It looks like you are trying to use Galaxy from within a "
+                   "Python environment that has planemo installed. Please "
+                   "either deactivate planemo's virtual environment, set up "
+                   "one for Galaxy, or uninstall planemo from this "
+                   "environment.")
+
+raise ImportError(PLANEMO_WARNING)
diff --git a/setup.py b/setup.py
@@ -34,6 +34,7 @@
         'planemo.commands',
         'planemo.reports',
         'galaxy',
+        'galaxy.eggs',
         'galaxy.tools',
         'galaxy.tools.linters',
         'galaxy.tools.deps',