From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sun, 3 Aug 2014 19:09:31 +0000 (-0500)
Subject: Set up virtualenv to use py2
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=23002ee77f742f3b00fbee64def0dea5de0f5e51;p=mediagoblin.git

Set up virtualenv to use py2

This commit sponsored by Jonas Öberg.  Thanks Jonas!
---

diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst
index 9dea239f..741e9655 100644
--- a/docs/source/siteadmin/deploying.rst
+++ b/docs/source/siteadmin/deploying.rst
@@ -200,7 +200,7 @@ Clone the MediaGoblin repository and set up the git submodules::
 
 And set up the in-package virtualenv::
 
-    (virtualenv --system-site-packages . || virtualenv .) && ./bin/python setup.py develop
+    (virtualenv --python=python2 --system-site-packages . || virtualenv --python=python22 .) && ./bin/python setup.py develop
 
 .. note::
 
@@ -214,16 +214,6 @@ And set up the in-package virtualenv::
 
    Note: this is liable to break.  Use this method with caution.
 
-.. ::
-
-   (NOTE: Is this still relevant?)
-
-   If you have problems here, consider trying to install virtualenv
-   with the ``--distribute`` or ``--no-site-packages`` options. If
-   your system's default Python is in the 3.x series you may need to
-   run ``virtualenv`` with the  ``--python=python2.7`` or
-   ``--python=python2.6`` options.
-
 The above provides an in-package install of ``virtualenv``. While this
 is counter to the conventional ``virtualenv`` configuration, it is
 more reliable and considerably easier to configure and illustrate. If