Install project requirements first.

See readthedocs#1364 for details.

Author: NYKevin

readthedocs/projects/tasks.py

@@ -329,32 +329,19 @@ def setup_environment(version):
         ignore_option = ''
 
     requirements = ' '.join([
-        'sphinx==1.3.1',
-        'Pygments==2.0.2',
-        'virtualenv==1.10.1',
-        'setuptools==1.1',
-        'docutils==0.11',
-        'mkdocs==0.13.3',
-        'mock==1.0.1',
-        'pillow==2.6.1',
-        'readthedocs-sphinx-ext==0.5.4',
-        'sphinx-rtd-theme==0.1.8',
-        'recommonmark==0.1.1',
+        'sphinx~=1.3.1',
+        'Pygments~=2.0.2',
+        'virtualenv~=1.10.1',
+        'setuptools~=1.1',
+        'docutils~=0.11',
+        'mkdocs~=0.13.3',
+        'mock~=1.0.1',
+        'pillow~=2.6.1',
+        'readthedocs-sphinx-ext~=0.5.4',
+        'sphinx-rtd-theme~=0.1.8',
+        'recommonmark~=0.1.1',
     ])
 
-    wheeldir = os.path.join(settings.SITE_ROOT, 'deploy', 'wheels')
-    ret_dict['doc_builder'] = run(
-        (
-            '{cmd} install --use-wheel --find-links={wheeldir} -U '
-            '{ignore_option} {requirements}'
-        ).format(
-            cmd=project.venv_bin(version=version.slug, bin='pip'),
-            ignore_option=ignore_option,
-            wheeldir=wheeldir,
-            requirements=requirements,
-        )
-    )
-
     # Handle requirements
 
     requirements_file_path = project.requirements_file
@@ -377,6 +364,19 @@ def setup_environment(version):
                 cmd=project.venv_bin(version=version.slug, bin='pip'),
                 requirements=requirements_file_path))
 
+    wheeldir = os.path.join(settings.SITE_ROOT, 'deploy', 'wheels')
+    ret_dict['doc_builder'] = run(
+        (
+            '{cmd} install --use-wheel --find-links={wheeldir} '
+            '{ignore_option} {requirements}'
+        ).format(
+            cmd=project.venv_bin(version=version.slug, bin='pip'),
+            ignore_option=ignore_option,
+            wheeldir=wheeldir,
+            requirements=requirements,
+        )
+    )
+
     # Handle setup.py
 
     os.chdir(project.checkout_path(version.slug))