Skip to content

Update docs on python version #2643

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

Merged
merged 2 commits into from
Feb 14, 2017
Merged

Update docs on python version #2643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98ad33f
Update docs on python version
agjohnson Feb 14, 2017
d63863d
Bump docker version
agjohnson Feb 14, 2017
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
22 changes: 17 additions & 5 deletions docs/yaml-config.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,27 @@ used for building documentation.
python.version
``````````````

* Default: ``2``
* Options: ``2``, ``3``
* Default: ``2.7``
* Options: ``2.7``, ``2``, ``3.5``, ``3``

The version of Python to use when building your documentation.
This is the version of Python to use when building your documentation. If you
specify only the major version of Python, the highest supported minor version
will be selected.

The supported Python versions depends on the version of the build image your
project is using. The default build image that is used to build documentation
contains support for Python ``2.7`` and ``3.5``.

There is also an image in testing that supports Python versions ``2.7``,
``3.3``, ``3.4``, ``3.5``, and ``3.6``. If you would like access to this build
image, you can sign up for beta access here:

https://goo.gl/forms/AKEoeWHixlzVfqKT://goo.gl/forms/AKEoeWHixlzVfqKT2

.. code-block:: yaml

python:
version: 3
python:
version: 3.5

python.setup_py_install
```````````````````````
Expand Down
2 changes: 1 addition & 1 deletion readthedocs/settings/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ def INSTALLED_APPS(self): # noqa

# Docker
DOCKER_ENABLE = False
DOCKER_IMAGE = 'readthedocs/build:1.0'
DOCKER_IMAGE = 'readthedocs/build:2.0'

# All auth
ACCOUNT_ADAPTER = 'readthedocs.core.adapters.AccountAdapter'
Expand Down