Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.buildout
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
6
Merge Requests
6
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
slapos.buildout
Commits
db3d6e2f
Commit
db3d6e2f
authored
Oct 13, 2020
by
Holger Brunn
Committed by
GitHub
Oct 13, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support python 3.7, 3.8, 3.9 in conditional section expressions (#535)
Co-authored-by:
Michael Howitz
<
mh@gocept.com
>
parent
2ff96557
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
4 deletions
+7
-4
CHANGES.rst
CHANGES.rst
+1
-1
doc/topics/variables-extending-and-substitutions.rst
doc/topics/variables-extending-and-substitutions.rst
+3
-0
src/zc/buildout/buildout.py
src/zc/buildout/buildout.py
+2
-2
src/zc/buildout/configparser.test
src/zc/buildout/configparser.test
+1
-1
No files found.
CHANGES.rst
View file @
db3d6e2f
...
@@ -4,7 +4,7 @@ Change History
...
@@ -4,7 +4,7 @@ Change History
3.0.0
a3
(
unreleased
)
3.0.0
a3
(
unreleased
)
====================
====================
-
Nothing
changed
yet
.
-
Support
python37
,
python38
and
python39
in
conditional
section
expressions
3.0.0
a2
(
2020
-
05
-
25
)
3.0.0
a2
(
2020
-
05
-
25
)
...
...
doc/topics/variables-extending-and-substitutions.rst
View file @
db3d6e2f
...
@@ -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
...
...
src/zc/buildout/buildout.py
View file @
db3d6e2f
...
@@ -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 ... python3
6
# minor python major_python_versions as python24, python25 ... python3
9
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
...
...
src/zc/buildout/configparser.test
View file @
db3d6e2f
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment