Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed pinned versions from conda environments #2876

Merged
merged 1 commit into from
May 23, 2017
Merged

Removed pinned versions from conda environments #2876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions docs/conda.rst
View file
Open in desktop
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
View file
Open in desktop
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',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do worry about unpinning these. @agjohnson would know best, but I believe there is a released version that might bork things.

]

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