Skip to content

Commit

Permalink
Merge pull request #2876 from rtfd/humitos/conda/do-not-pin
Browse files Browse the repository at this point in the history
Removed pinned versions from conda environments
  • Loading branch information
ericholscher authored May 23, 2017
2 parents df3d547 + 4c79687 commit 4693f9e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 21 deletions.
3 changes: 1 addition & 2 deletions docs/conda.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
---------------
Expand Down
28 changes: 9 additions & 19 deletions readthedocs/doc_builder/python_environments.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand All @@ -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 = [
Expand All @@ -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

0 comments on commit 4693f9e

Please sign in to comment.