Commit f35ae6b2 authored by Xavier Thompson's avatar Xavier Thompson

Adapt imports to moved path in slapos.recipe.build

In slapos.recipe.build >= 0.57, code slapos/recipe/__init__.py
(which is a legacy namespace) was moved to slapos/recipe/utils.py

Also version up slapos.recipe.build requirement to >= 0.57
parent d68c3b68
...@@ -43,7 +43,7 @@ setup( ...@@ -43,7 +43,7 @@ setup(
install_requires=[ install_requires=[
'zc.buildout>=2', 'zc.buildout>=2',
'setuptools', 'setuptools',
'slapos.recipe.build>=0.49', 'slapos.recipe.build>=0.57',
], ],
extras_require={ extras_require={
'test': ['zope.testing', 'manuel'], 'test': ['zope.testing', 'manuel'],
......
...@@ -10,10 +10,12 @@ import sys ...@@ -10,10 +10,12 @@ import sys
import zc.buildout import zc.buildout
from zc.buildout import UserError from zc.buildout import UserError
from zc.buildout.buildout import bool_option from zc.buildout.buildout import bool_option
from .. import ( from ..utils import (
# from slapos.recipe.build # from slapos.recipe.build
EnvironMixin, Shared, downloadunpacked, is_true, rmtree EnvironMixin, Shared, is_true, rmtree
) )
# from slapos.recipe.build
from .. import downloadunpacked
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