valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #47873 from gtmanfred/2017.7.6

Browse Source 
allow tornado 5.0 to be installed only for python2
This commit is contained in:
Nicole Thomas 2018-05-29 15:30:22 -04:00 committed by GitHub
commit 1f0bada07c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/topics/releases/2017.7.6.rst
View File

@ -5,6 +5,16 @@ In Progress: Salt 2017.7.6 Release Notes
Version 2017.7.6 is an **unreleased** bugfix release for :ref:`2017.7.0 <release-2017-7-0>`.
This release is still in progress and has not been released yet.
Tornado 5.0 Support for Python 2 Only
-------------------------------------
Tornado 5.0 moves to using asyncio for all python3 versions. Because of this
and changes in asyncio between python 3.4 and 3.5 to only be able to use one
ioloop, which requires some rearchitecting, support for tornado 5.0 and python3
versions of salt has been delayed to a later release.
For now, to use tornado 5.0, the python 2 version of salt must be used.
Option to Return to Previous Pillar Include Behavior
----------------------------------------------------

4
requirements/base.txt
View File

@ -5,6 +5,8 @@ msgpack>=0.5,!=0.5.5
PyYAML
MarkupSafe
requests>=1.0.0
tornado>=4.2.1,<6.0
tornado>=4.2.1,<6.0; python_version < 3
tornado>=4.2.1,<5.0; python_version >= 3.4
# Required by Tornado to handle threads stuff.
futures>=2.0