diff --git a/readthedocs/doc_builder/python_environments.py b/readthedocs/doc_builder/python_environments.py index de7a5bde393..6895d40a86d 100644 --- a/readthedocs/doc_builder/python_environments.py +++ b/readthedocs/doc_builder/python_environments.py @@ -100,7 +100,7 @@ def install_core_requirements(self): 'sphinx==1.3.4', 'Pygments==2.0.2', 'setuptools==18.6.1', - 'docutils==0.11', + 'docutils==0.12', 'mkdocs==0.14.0', 'mock==1.0.1', 'pillow==2.6.1', @@ -174,22 +174,22 @@ def setup_base(self): shutil.rmtree(version_path) self.build_env.run( 'conda', + 'env', 'create', - '--yes', '--name', self.version.slug, - 'python={python_version}'.format(python_version=self.config.python_version), + '--file', + self.config.conda_file, bin_path=None, # Don't use conda bin that doesn't exist yet ) def install_core_requirements(self): - conda_env_path = os.path.join(self.project.doc_path, 'conda') # Use conda for requirements it packages requirements = [ 'sphinx==1.3.4', 'Pygments==2.0.2', - 'docutils==0.11', + 'docutils==0.12', 'mock==1.0.1', 'pillow==3.0.0', 'sphinx_rtd_theme==0.1.7', @@ -231,7 +231,6 @@ def install_core_requirements(self): ) def install_user_requirements(self): - conda_env_path = os.path.join(self.project.doc_path, 'conda') self.build_env.run( 'conda', 'env',