Buildout

Merge lp://staging/~gary/zc.buildout/python-support into lp://staging/zc.buildout

  1. python-support
  2. Merge into trunk
Proposed by Gary Poster
Status: Needs review
Proposed branch: lp://staging/~gary/zc.buildout/python-support
Merge into: lp://staging/zc.buildout
Prerequisite: lp://staging/~gary/zc.buildout/python-support-8-support-subprocess
Diff against target: 1026 lines (+349/-185) (has conflicts)
12 files modified
CHANGES.txt (+24/-2)
bootstrap/bootstrap.py (+1/-1)
dev.py (+44/-7)
src/zc/buildout/bootstrap.txt (+1/-1)
src/zc/buildout/buildout.py (+22/-2)
src/zc/buildout/buildout.txt (+181/-115)
src/zc/buildout/easy_install.py (+8/-28)
src/zc/buildout/easy_install.txt (+10/-5)
src/zc/buildout/tests.py (+42/-16)
src/zc/buildout/update.txt (+3/-2)
z3c.recipe.scripts_/src/z3c/recipe/scripts/tests.py (+3/-2)
zc.recipe.egg_/src/zc/recipe/egg/tests.py (+10/-4)
Text conflict in CHANGES.txt
Text conflict in src/zc/buildout/buildout.py
Text conflict in src/zc/buildout/buildout.txt
To merge this branch: bzr merge lp://staging/~gary/zc.buildout/python-support
Reviewer Review Type Date Requested Status
Francis J. Lacoste (community) Approve
Review via email: mp+21733@code.staging.launchpad.net

Description of the change

This merges recent zc.buildout changes with the python-support-* line of branches. As such, the only work from myself here is merge conflict resolutions.

To post a comment you must log in.
Revision history for this message
Francis J. Lacoste (flacoste) wrote :

My only question is on that change:

We have the best distribution that satisfies 'setuptools'.
> - Picked: setuptools = V.V
> + Picked: setuptools = 0.6
> <BLANKLINE>
> Configuration data:
> [buildout]
> @@ -2277,7 +2274,7 @@
> develop-eggs-directory = /sample-buildout/develop-eggs
> directory = /sample-buildout
> eggs-directory = /sample-buildout/eggs
> - executable = python
> + executable = /usr/local/bin/python2.3
> find-links =
> install-from-cache = false

Is this really correct?

review: Approve
Reply
lp://staging/~gary/zc.buildout/python-support updated
545. By Gary Poster

reinstate test cleanup

Revision history for this message
Gary Poster (gary) wrote :

Interesting, and good catch! The change is from the trunk, but from a very old revision. One of my many early branches must have changed the "Picked" and "executable" lines to the better versions, but the bzr merge didn't quite guess correctly as to what to do. So, yes, I should change it back to the values in my branch, thank you. I've done so.

Reply
lp://staging/~gary/zc.buildout/python-support updated
546. By Gary Poster

merge from python-support-8

Revision history for this message
Gary Poster (gary) wrote :

The most recent changes (r546) merely keep the branch up-to-date with python-support-8

Reply
lp://staging/~gary/zc.buildout/python-support updated
547. By Gary Poster

merge gary-9

548. By Gary Poster

merge lp:~gary/zc.buildout/python-support-10: add significantly improved Distribute support.

Unmerged revisions

548. By Gary Poster

merge lp:~gary/zc.buildout/python-support-10: add significantly improved Distribute support.

547. By Gary Poster

merge gary-9

546. By Gary Poster

merge from python-support-8

545. By Gary Poster

reinstate test cleanup

544. By Gary Poster

merge from python-support-8

543. By Gary Poster

merge from buildout trunk

542. By Gary Poster

merge from gary-8

541. By Gary Poster

merge buildout trunk with system python support branches.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: