Commit db3d6e2f authored by Holger Brunn's avatar Holger Brunn Committed by GitHub

Support python 3.7, 3.8, 3.9 in conditional section expressions (#535)

Co-authored-by: default avatarMichael Howitz <mh@gocept.com>
parent 2ff96557
...@@ -4,7 +4,7 @@ Change History ...@@ -4,7 +4,7 @@ Change History
3.0.0a3 (unreleased) 3.0.0a3 (unreleased)
==================== ====================
- Nothing changed yet. - Support python37, python38 and python39 in conditional section expressions
3.0.0a2 (2020-05-25) 3.0.0a2 (2020-05-25)
......
...@@ -199,6 +199,9 @@ python33 True if running Python 3.3 ...@@ -199,6 +199,9 @@ python33 True if running Python 3.3
python34 True if running Python 3.4 python34 True if running Python 3.4
python35 True if running Python 3.5 python35 True if running Python 3.5
python36 True if running Python 3.6 python36 True if running Python 3.6
python37 True if running Python 3.7
python38 True if running Python 3.8
python39 True if running Python 3.9
sys_version ``sys.version.lower()`` sys_version ``sys.version.lower()``
pypy True if running PyPy pypy True if running PyPy
jython True if running Jython jython True if running Jython
......
...@@ -1733,9 +1733,9 @@ def _default_globals(): ...@@ -1733,9 +1733,9 @@ def _default_globals():
globals_defs.update({'python2': major_python_versions[0] == '2', globals_defs.update({'python2': major_python_versions[0] == '2',
'python3': major_python_versions[0] == '3'}) 'python3': major_python_versions[0] == '3'})
# minor python major_python_versions as python24, python25 ... python36 # minor python major_python_versions as python24, python25 ... python39
minor_python_versions = ('24', '25', '26', '27', minor_python_versions = ('24', '25', '26', '27',
'30', '31', '32', '33', '34', '35', '36') '30', '31', '32', '33', '34', '35', '36', '37', '38', '39')
for v in minor_python_versions: for v in minor_python_versions:
globals_defs['python' + v] = ''.join(major_python_versions[:2]) == v globals_defs['python' + v] = ''.join(major_python_versions[:2]) == v
......
...@@ -291,7 +291,7 @@ called by buildout:: ...@@ -291,7 +291,7 @@ called by buildout::
# major and minor python versions, yes even python 3.5 and 3.6 are there , prospectively # major and minor python versions, yes even python 3.5 and 3.6 are there , prospectively
# comment: this expression "is true" and not that long expression cannot span several lines # comment: this expression "is true" and not that long expression cannot span several lines
[s2: any([python2, python3, python24 , python25 , python26 , python27 , python30 , python31 , python32 , python33 , python34 , python35 , python36]) ] [s2: any([python2, python3, python24 , python25 , python26 , python27 , python30 , python31 , python32 , python33 , python34 , python35 , python36, python37, python38,python39]) ]
b = 1 b = 1
# common python interpreter types # common python interpreter types
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment