From 4c796871991ac2b6d0d4bf91f3081fa9d1d5ea27 Mon Sep 17 00:00:00 2001
From: Manuel Kaufmann <humitos@gmail.com>
Date: Mon, 22 May 2017 17:18:03 -0300
Subject: [PATCH] Removed pinned versions from conda environments

---
 docs/conda.rst                                |  3 +-
 .../doc_builder/python_environments.py        | 28 ++++++-------------
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/docs/conda.rst b/docs/conda.rst
index d0b6d052a29..cdeab45031a 100644
--- a/docs/conda.rst
+++ b/docs/conda.rst
@@ -25,9 +25,8 @@ You can enable it by creating a `readthedocs.yml` file in the root of your repos
 This Conda environment will also have Sphinx and other build time dependencies installed.
 It will use the same order of operations that we support currently:
 
-* Environment Creation (``conda create``)
+* Environment Creation (``conda env create``)
 * Dependency Installation (Sphinx)
-* User Package Installation (``conda env update``)
 
 Custom Installs
 ---------------
diff --git a/readthedocs/doc_builder/python_environments.py b/readthedocs/doc_builder/python_environments.py
index b332f8634d2..9811f67a6a2 100644
--- a/readthedocs/doc_builder/python_environments.py
+++ b/readthedocs/doc_builder/python_environments.py
@@ -192,13 +192,11 @@ def install_core_requirements(self):
 
         # Use conda for requirements it packages
         requirements = [
-            'sphinx==1.3.5',
-            'Pygments==2.2.0',
-            'docutils==0.12',
+            'sphinx',
             'mock',
-            'pillow>=3.0.0',
-            'sphinx_rtd_theme==0.1.7',
-            'alabaster>=0.7,<0.8,!=0.7.5',
+            'pillow',
+            'sphinx_rtd_theme',
+            'mkdocs',
         ]
 
         cmd = [
@@ -215,10 +213,8 @@ def install_core_requirements(self):
 
         # Install pip-only things.
         pip_requirements = [
-            'mkdocs==0.15.0',
-            'readthedocs-sphinx-ext<0.6',
-            'commonmark==0.5.4',
-            'recommonmark==0.1.1',
+            'readthedocs-sphinx-ext',
+            'recommonmark',
         ]
 
         pip_cmd = [
@@ -236,12 +232,6 @@ def install_core_requirements(self):
         )
 
     def install_user_requirements(self):
-        self.build_env.run(
-            'conda',
-            'env',
-            'update',
-            '--name',
-            self.version.slug,
-            '--file',
-            self.config.conda_file,
-        )
+        # as the conda environment was created by using the ``environment.yml``
+        # defined by the user, there is nothing to update at this point
+        pass