Commit 425a1f60 authored by Xavier Thompson's avatar Xavier Thompson

[feat] Add 'zc.buildout' mode to 'extra-paths'

This mode is similar to 'legacy' mode as it uses only the paths of
the currently running distributions for zc.buildout and dependencies,
but unlike 'legacy' mode it respects the order in which these appear
in sys.path, avoiding unexpected results.

This is now set to the default because it is closer to 'legacy' mode
and because it has a nice property: running in succession

  `buildout buildout:extra-paths= bootstrap` (1)
  `bin/buildout` (2)

will result in the (1) installing zc.buildout and its dependencies
in /eggs in isolation from the environment, and (2) using only the
paths of these in /eggs, i.e. continuing to operate in isolation,
even without setting extra-paths explictly.

Before this change, (2) would have still used  the whole `sys.path`
unless extra-paths was set otherwise.

With this change, we can remove 'extra-paths=legacy' in the tests
that previously required it.
parent 5892f3bf
...@@ -113,7 +113,6 @@ update our Buildout configuration to add a ``bobo`` part: ...@@ -113,7 +113,6 @@ update our Buildout configuration to add a ``bobo`` part:
[buildout] [buildout]
parts = bobo parts = bobo
extra-paths = legacy
[bobo] [bobo]
recipe = zc.recipe.egg recipe = zc.recipe.egg
...@@ -427,7 +426,6 @@ where you list them, as in: ...@@ -427,7 +426,6 @@ where you list them, as in:
>>> prefix = """ >>> prefix = """
... [buildout] ... [buildout]
... parts = bobo ... parts = bobo
... extra-paths = legacy
... """ ... """
>>> with open('buildout.cfg', 'w') as f: >>> with open('buildout.cfg', 'w') as f:
... _ = f.write(prefix) ... _ = f.write(prefix)
...@@ -460,7 +458,6 @@ The more common way to pin a version is using a ``versions`` section: ...@@ -460,7 +458,6 @@ The more common way to pin a version is using a ``versions`` section:
[buildout] [buildout]
parts = bobo server parts = bobo server
extra-paths = legacy
[bobo] [bobo]
recipe = zc.recipe.egg recipe = zc.recipe.egg
......
...@@ -21,7 +21,6 @@ Buildout work better: ...@@ -21,7 +21,6 @@ Buildout work better:
>>> write("""\ >>> write("""\
... [buildout] ... [buildout]
... parts = bobo ... parts = bobo
... extra-paths = legacy
... [bobo] ... [bobo]
... recipe=zc.recipe.egg ... recipe=zc.recipe.egg
... eggs=bobo ... eggs=bobo
......
...@@ -248,7 +248,6 @@ is typically used to set up a shared egg or cache directory, as in: ...@@ -248,7 +248,6 @@ is typically used to set up a shared egg or cache directory, as in:
>>> write("""\ >>> write("""\
... [buildout] ... [buildout]
... parts = bobo ... parts = bobo
... extra-paths = legacy
... [bobo] ... [bobo]
... recipe=zc.recipe.egg ... recipe=zc.recipe.egg
... eggs=bobo ... eggs=bobo
......
...@@ -374,7 +374,7 @@ _buildout_default_options = _annotate_section({ ...@@ -374,7 +374,7 @@ _buildout_default_options = _annotate_section({
'develop-eggs-directory': 'develop-eggs', 'develop-eggs-directory': 'develop-eggs',
'eggs-directory': 'eggs', 'eggs-directory': 'eggs',
'executable': sys.executable, 'executable': sys.executable,
'extra-paths': 'sys.path', 'extra-paths': 'zc.buildout',
'find-links': '', 'find-links': '',
'install-from-cache': 'false', 'install-from-cache': 'false',
'installed': '.installed.cfg', 'installed': '.installed.cfg',
...@@ -626,6 +626,21 @@ class Buildout(DictMixin): ...@@ -626,6 +626,21 @@ class Buildout(DictMixin):
# special case: sys.path # special case: sys.path
extra_paths = sys.path extra_paths = sys.path
options['extra-paths'] = ' '.join(extra_paths) options['extra-paths'] = ' '.join(extra_paths)
elif extra_paths == 'zc.buildout':
# special case: only zc.buildout and its dependencies
# but in the order they appear in sys.path, unlike legacy
old_extra_paths = zc.buildout.easy_install.extra_paths(
[d.location for d in pkg_resources.working_set])
try:
buildout_and_setuptools_dists = set(
zc.buildout.easy_install.install(['zc.buildout'], None,
check_picked=False))
finally:
zc.buildout.easy_install.extra_paths(old_extra_paths)
extra_paths = [
d.location for d in pkg_resources.working_set
if d in buildout_and_setuptools_dists]
options['extra-paths'] = ' '.join(extra_paths)
else: else:
extra_paths = extra_paths.split() extra_paths = extra_paths.split()
zc.buildout.easy_install.extra_paths(extra_paths) zc.buildout.easy_install.extra_paths(extra_paths)
......
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