Buildout

Merge lp://staging/~gary/zc.buildout/betafix1 into lp://staging/zc.buildout

  1. betafix1
  2. Merge into trunk
Proposed by Gary Poster
Status: Needs review
Proposed branch: lp://staging/~gary/zc.buildout/betafix1
Merge into: lp://staging/zc.buildout
Prerequisite: lp://staging/~gary/zc.buildout/betafixstart
Diff against target: 359 lines (+91/-216)
3 files modified
bootstrap/bootstrap.py (+0/-206)
src/zc/buildout/easy_install.py (+22/-10)
src/zc/buildout/tests.py (+69/-0)
To merge this branch: bzr merge lp://staging/~gary/zc.buildout/betafix1
Reviewer Review Type Date Requested Status
Francis J. Lacoste (community) Approve
Review via email: mp+27732@code.staging.launchpad.net

Description of the change

This change addresses two problems identified with the allowed_eggs_from_site_packages feature, as partially identified by bug 592524. I think the tests pretty clearly describe the problems they are addressing.

The first non-whitespace change in easy_install.py addresses the "allowed_eggs_from_site_packages_dependencies_bugfix" test. Hopefully the comment explains what is going on.

The remaining changes in easy_install.py address the "allowed_eggs_from_site_packages_bug_592524" test. The key line is "path = [p for p in path if p not in site_paths]" and, as with the other fix, it is explained with a comment.

To post a comment you must log in.
Revision history for this message
Gary Poster (gary) wrote :

I'm not sure why the diff shows bootstrap as having been deleted.

betafix1$ bzr ls bootstrap/
bootstrap.py

Similarly, loggerhead shows the diff for the single revision that comprises the branch as not including a change to bootstrap:
http://bazaar.launchpad.net/~gary/zc.buildout/betafix1/revision/554

(Unfortunately, loggerhead is giving me an Internal Server Error when I try to go to the browse link on the branch page, http://bazaar.launchpad.net/~gary/zc.buildout/betafix1/files .)

Reply
Revision history for this message
Francis J. Lacoste (flacoste) wrote :

Allow good here also.

review: Approve
Reply
Revision history for this message
Thomas Herve (therve) wrote :

This branch seems ready to land?

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

Thomas: Technically, yes. The problem is the fact that the buildout universe does not support betas well, and the last beta release for this branch caused a lot of problems. I have a plan to make the next release, and zc.buildout, better in this regard, but it involves more work.

Howvere, I can certainly make a local release easily, and now. If you would like me to move Launchpad to a new release so you all can use it too, I'm happy to: just let me know.

Gary

Reply

Unmerged revisions

554. By Gary Poster

Fix some problems with allowed_eggs_from_site_packages

553. By Gary Poster

get a baseline of zc.buildout with passing tests

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: