Commit 4b86eb17 authored by Maurits van Rees's avatar Maurits van Rees Committed by GitHub

Merge pull request #615 from buildout/maurits-python311-315-in-master

Add support for python311-315 in conditional section expressions. [master]
parents 5fcd34bd 5e79f005
Add support for python311-315 in conditional section expressions.
...@@ -1764,7 +1764,8 @@ def _default_globals(): ...@@ -1764,7 +1764,8 @@ def _default_globals():
# minor python major_python_versions as python24, python25 ... python39 # 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', '37', '38', '39', '310') '30', '31', '32', '33', '34', '35', '36', '37', '38', '39',
'310', '311', '312', '313', '314', '315')
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, python37, python38, python39, python310]) ] [s2: any([python2, python3, python24 , python25 , python26 , python27 , python30 , python31 , python32 , python33 , python34 , python35 , python36, python37, python38, python39, python310, python311, python312, python313, python314, python315]) ]
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