Skip to content

Commit 4c79687

Browse files
committed
Removed pinned versions from conda environments
1 parent 8996546 commit 4c79687

File tree

2 files changed

+10
-21
lines changed

2 files changed

+10
-21
lines changed

docs/conda.rst

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ You can enable it by creating a `readthedocs.yml` file in the root of your repos
2525
This Conda environment will also have Sphinx and other build time dependencies installed.
2626
It will use the same order of operations that we support currently:
2727

28-
* Environment Creation (``conda create``)
28+
* Environment Creation (``conda env create``)
2929
* Dependency Installation (Sphinx)
30-
* User Package Installation (``conda env update``)
3130

3231
Custom Installs
3332
---------------

readthedocs/doc_builder/python_environments.py

+9-19
Original file line numberDiff line numberDiff line change
@@ -192,13 +192,11 @@ def install_core_requirements(self):
192192

193193
# Use conda for requirements it packages
194194
requirements = [
195-
'sphinx==1.3.5',
196-
'Pygments==2.2.0',
197-
'docutils==0.12',
195+
'sphinx',
198196
'mock',
199-
'pillow>=3.0.0',
200-
'sphinx_rtd_theme==0.1.7',
201-
'alabaster>=0.7,<0.8,!=0.7.5',
197+
'pillow',
198+
'sphinx_rtd_theme',
199+
'mkdocs',
202200
]
203201

204202
cmd = [
@@ -215,10 +213,8 @@ def install_core_requirements(self):
215213

216214
# Install pip-only things.
217215
pip_requirements = [
218-
'mkdocs==0.15.0',
219-
'readthedocs-sphinx-ext<0.6',
220-
'commonmark==0.5.4',
221-
'recommonmark==0.1.1',
216+
'readthedocs-sphinx-ext',
217+
'recommonmark',
222218
]
223219

224220
pip_cmd = [
@@ -236,12 +232,6 @@ def install_core_requirements(self):
236232
)
237233

238234
def install_user_requirements(self):
239-
self.build_env.run(
240-
'conda',
241-
'env',
242-
'update',
243-
'--name',
244-
self.version.slug,
245-
'--file',
246-
self.config.conda_file,
247-
)
235+
# as the conda environment was created by using the ``environment.yml``
236+
# defined by the user, there is nothing to update at this point
237+
pass

0 commit comments

Comments
 (0)