Merge pull request #1576 from rtfd/respect-install-project

Respect installing project in virtualenv in builder

Author: agjohnson

readthedocs/projects/models.py

@@ -141,7 +141,7 @@ class Project(models.Model):
     skip = models.BooleanField(_('Skip'), default=False)
     mirror = models.BooleanField(_('Mirror'), default=False)
     use_virtualenv = models.BooleanField(
-        _('Use virtualenv'),
+        _('Install Project'),
         help_text=_("Install your project inside a virtualenv using <code>setup.py "
                     "install</code>"),
         default=False

readthedocs/projects/tasks.py

@@ -309,7 +309,7 @@ def setup_environment(self):
         # Handle setup.py
         checkout_path = self.project.checkout_path(self.version.slug)
         setup_path = os.path.join(checkout_path, 'setup.py')
-        if os.path.isfile(setup_path):
+        if os.path.isfile(setup_path) and self.project.use_virtualenv:
             if getattr(settings, 'USE_PIP_INSTALL', False):
                 self.build_env.run(
                     'python',