Merge lp://staging/~gary/zc.buildout/betafix4 into lp://staging/zc.buildout
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~gary/zc.buildout/betafix4 |
| Merge into: | lp://staging/zc.buildout |
| Prerequisite: | lp://staging/~gary/zc.buildout/betafix3 |
| Diff against target: |
1027 lines (+265/-537) 11 files modified
CHANGES.txt (+1/-1) bootstrap/bootstrap.py (+0/-210) bootstrap/bootstrap.py.THIS (+0/-116) buildout.cfg (+0/-1) src/zc/buildout/bootstrap.txt (+53/-1) src/zc/buildout/debugging.txt (+3/-3) src/zc/buildout/easy_install.py (+3/-3) src/zc/buildout/testing_bugfix.txt (+0/-12) src/zc/buildout/tests.py (+136/-127) z3c.recipe.scripts_/src/z3c/recipe/scripts/tests.py (+20/-18) zc.recipe.egg_/src/zc/recipe/egg/tests.py (+49/-45) |
| To merge this branch: | bzr merge lp://staging/~gary/zc.buildout/betafix4 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Francis J. Lacoste (community) | code | Approve | |
|
Review via email:
|
|||
Description of the change
Done by me:
- Made a small Python 2.6 bugfix in easy_install.py.
- Made some more Distribute test clean-ups.
- Normalized indentations in test.py.
From merges with trunk:
- Clean up some implementation in bootstrap.py (and mention what the code does in CHANGES.txt).
- Fix spellings, especially of occurred.
- Use stdlib doctest, rather than zope.testing version, to get rid of deprecation message.
Unmerged revisions
- 561. By Gary Poster
-
merge from trunk: correcting spelling errors, using standardlib doctest, simplifying bootstrap code somewhat.
- 560. By Gary Poster
-
small Python 2.6 bugfix and Distribute test clean-ups
- 559. By Gary Poster
-
fix tests for changes
- 558. By Gary Poster
-
mimic standard site.py behavior for inclusion of .pth files
- 557. By Gary Poster
-
eliminate spurious warning if you are using distribute.
- 556. By Gary Poster
-
add files so releases can be made from a non-SVN checkout
- 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
Looks good, although I have to admin that the indentation clean made at the same time than adding the normalization for distribute made it very hard to spot.