Merge lp:~leonardr/wadllib/package-to-include-sample-data into lp:wadllib
Proposed by
Leonard Richardson
on 2010-10-21
| Status: | Merged |
|---|---|
| Approved by: | Robert Collins on 2010-10-21 |
| Approved revision: | 17 |
| Merged at revision: | 17 |
| Proposed branch: | lp:~leonardr/wadllib/package-to-include-sample-data |
| Merge into: | lp:wadllib |
| Diff against target: |
32 lines (+7/-5) 3 files modified
MANIFEST.in (+0/-4) src/wadllib/NEWS.txt (+6/-0) src/wadllib/version.txt (+1/-1) |
| To merge this branch: | bzr merge lp:~leonardr/wadllib/package-to-include-sample-data |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Robert Collins (community) | 2010-10-21 | Approve on 2010-10-21 | |
|
Review via email:
|
|||
Description of the Change
This branch removes the MANIFEST.in file from wadllib. Without this file, "setup.py sdist" will look in the version-control repository to figure out which files to include in the tarball. That's exactly what we want. The MANIFEST.in file omitted an important part of wadllib: the sample data in src/wadllib/
To post a comment you must log in.
| Leonard Richardson (leonardr) wrote : | # |
| Robert Collins (lifeless) wrote : | # |
Looks fine; might be worth making a note in your docs for this project (in tree) that this is deliberate, and why - to save future you effort.
review:
Approve

This pastebin shows the old output of "setup.py sdist":
http:// pastebin. ubuntu. com/517579/
Note the errors:
reading manifest template 'MANIFEST.in'
warning: no files found matching '*.pt' under directory 'src'
warning: no files found matching '*.zcml' under directory 'src'
warning: no previously-included files found matching 'buildout.cfg'
warning: no previously-included files found matching 'bootstrap.py'
warning: no previously-included files found matching '.bzrignore'
no previously-included directories found matching '_bootstrap'
These errors are caused by the fact that MANIFEST.in was copied from some other project (possibly lazr.restful) and never tailored for wadllib.
This pastebin shows the new output:
http:// pastebin. ubuntu. com/517581/
The errors are gone, and all the files we want to include, are included.