Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issues 176 and 629: Process extends in order #644

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Issues 176 and 629: Process extends in order #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions src/zc/buildout/buildout.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1879,25 +1879,30 @@ def _open(
download_options, result['buildout']
)

# Process extends to handle nested += and -=
eresults = []
if extends:
extends = extends.split()
eresult, user_defaults = _open(
base, extends.pop(0), seen, download_options, override,
downloaded, user_defaults
)
for fname in extends:
next_extend, user_defaults = _open(
base, fname, seen, download_options, override,
downloaded, user_defaults
)
eresult = _update(eresult, next_extend)
result = _update(eresult, result)
downloaded, user_defaults)
eresults.extend(next_extend)
else:
if user_defaults:
result = _update(user_defaults, result)
user_defaults = {}

eresults.append(result)
seen.pop()
return result, user_defaults

if root_config_file:
final_result = {}
for eresult in eresults:
final_result = _update(final_result, eresult)
return final_result, user_defaults
else:
return eresults, user_defaults


ignore_directories = '.svn', 'CVS', '__pycache__', '.git'
Expand Down
35 changes: 35 additions & 0 deletions src/zc/buildout/tests/test_increment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,41 @@ def no_default_with_extends_increment_in_base2_and_base3():
versions= versions
DEFAULT_VALUE
"""
def increment_buildout_with_multiple_extended_without_base_equals():
r"""
>>> write('buildout.cfg', '''
... [buildout]
... extends = base1.cfg base2.cfg
... parts += foo
... [foo]
... recipe = zc.buildout:debug
... [base1]
... recipe = zc.buildout:debug
... [base2]
... recipe = zc.buildout:debug
... ''')
>>> write('base1.cfg', '''
... [buildout]
... extends = base3.cfg
... parts += base1
... ''')
>>> write('base2.cfg', '''
... [buildout]
... extends = base3.cfg
... parts += base2
... ''')
>>> write('base3.cfg', '''
... [buildout]
... ''')

>>> print_(system(buildout), end='')
Installing base1.
recipe='zc.buildout:debug'
Installing base2.
recipe='zc.buildout:debug'
Installing foo.
recipe='zc.buildout:debug'
"""

def test_suite():
return doctest.DocTestSuite(
Expand Down
Loading