Merge lp://staging/~gary/zc.buildout/betafix2 into lp://staging/zc.buildout
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~gary/zc.buildout/betafix2 |
| Merge into: | lp://staging/zc.buildout |
| Prerequisite: | lp://staging/~gary/zc.buildout/betafix1 |
| Diff against target: |
634 lines (+366/-34) 6 files modified
dev.py (+14/-6) src/zc/buildout/buildout.py (+33/-9) src/zc/buildout/easy_install.py (+55/-10) src/zc/buildout/testing.py (+1/-1) src/zc/buildout/tests.py (+23/-8) src/zc/buildout/virtualenv.txt (+240/-0) |
| To merge this branch: | bzr merge lp://staging/~gary/zc.buildout/betafix2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Francis J. Lacoste (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
This is the set of changes to make buildout play nicely with virtualenv again.
The core problem with the virtualenv interaction is that the virtualenv executable's -S behavior is broken. Rather than detecting virtualenv, I try to detect that brokenness.
The basic goal with these changes was to make virtualenv users have the "classic" behavior with as little hindrance as possible. As shown in the tests, everything now is as transparent as I could make it. The only time you even get a complaint is when you get a recipe that tries to use the new features: it ignores the request for the new features and warns you. If you want to make the warning go away, you can use -s (new) or one or more -q options (the existing mechanism to request a "quiet" build).
It would be legitimate to request more tests, for instance of the restart behavior within zc.buildout. I have not yet done so because I felt that the tests I did add were reasonably comprehensive and representative, even though they were not exhaustive.
A reasonable approach to the review might be to look at the virtualenv.txt test first, and then go out from there.
Unmerged revisions
- 555. By Gary Poster
-
fix virtualenv interaction by identfying broken virtualenv characteristic and reverting to previous behavior in that case.
- 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
> +Well, that was ugly, but it seems to have done the trick. The
> +executable represented by py_path has the same problematic
Indeed!
But other than that, all is good. Test is very readable and I think is enough.