EbookFoundation
/
readthedocs.org
mirror of https://github.com/EbookFoundation/readthedocs.org.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update docs on python version (#2643) 

* Update docs on python version

Adds info for new build images.

* Bump docker version
19-upgrade
Anthony 2017-02-14 15:23:00 -08:00 committed by GitHub
parent a534402a06
commit 055a1acfe4
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docs/yaml-config.rst
View File

@ -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
```````````````````````

2
readthedocs/settings/base.py
View File

@ -240,7 +240,7 @@ class CommunityBaseSettings(Settings):
# Docker
DOCKER_ENABLE = False
DOCKER_IMAGE = 'readthedocs/build:1.0'
DOCKER_IMAGE = 'readthedocs/build:2.0'
# All auth
ACCOUNT_ADAPTER = 'readthedocs.core.adapters.AccountAdapter'