Commit 9bb2c613 authored by Julien Muchembled's avatar Julien Muchembled

Drop compatibility code for zc.buildout<2

parent 4f14e1ff
...@@ -41,7 +41,7 @@ setup( ...@@ -41,7 +41,7 @@ setup(
include_package_data=True, include_package_data=True,
zip_safe=False, zip_safe=False,
install_requires=[ install_requires=[
'zc.buildout', 'zc.buildout>=2',
'setuptools', 'setuptools',
'slapos.recipe.build>=0.40', 'slapos.recipe.build>=0.40',
], ],
......
...@@ -12,15 +12,7 @@ import stat ...@@ -12,15 +12,7 @@ import stat
import subprocess import subprocess
import sys import sys
import zc.buildout import zc.buildout
try: from zc.buildout.buildout import bool_option
# import from zc.buildout>2
from zc.buildout.buildout import bool_option
except:
def bool_option(options, name, defaults=None):
if getattr(options, "query_bool", None) is None:
from zc.buildout.buildout import Options
options = Options({}, "options", options)
return options.query_bool(name, defaults)
startup_environ = os.environ.copy() startup_environ = os.environ.copy()
......
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