wadllib

Merge lp:~leonardr/wadllib/package-to-include-sample-data into lp:wadllib

  1. package-to-include-sample-data
  2. Merge into trunk
Proposed by Leonard Richardson
Status: Merged
Approved by: Robert Collins
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
Reviewer Review Type Date Requested Status
Robert Collins (community) Approve
Review via email: mp+39072@code.launchpad.net

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/tests/data. Rather than manually add those files to MANIFEST.in, Benji and I decided it was easier to get rid of that file and have "setup.py sdist" include everything from the src/ directory.

To post a comment you must log in.
Revision history for this message
Leonard Richardson (leonardr) wrote :

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.

Revision history for this message
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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'MANIFEST.in'
2--- MANIFEST.in 2009-08-25 17:40:40 +0000
3+++ MANIFEST.in 1970-01-01 00:00:00 +0000
4@@ -1,4 +0,0 @@
5-include ez_setup.py
6-recursive-include src *.txt *.pt *.zcml
7-exclude MANIFEST.in buildout.cfg bootstrap.py .bzrignore
8-prune _bootstrap
9
10=== modified file 'src/wadllib/NEWS.txt'
11--- src/wadllib/NEWS.txt 2010-05-04 19:06:36 +0000
12+++ src/wadllib/NEWS.txt 2010-10-21 17:41:12 +0000
13@@ -2,6 +2,12 @@
14 NEWS for wadllib
15 ================
16
17+1.1.6 (2010-10-21)
18+==================
19+
20+- This revision contains no code changes, but the build system was
21+ changed to include the sample data used in tests.
22+
23 1.1.5 (2010-05-04)
24 ==================
25
26
27=== modified file 'src/wadllib/version.txt'
28--- src/wadllib/version.txt 2010-05-04 19:15:47 +0000
29+++ src/wadllib/version.txt 2010-10-21 17:41:12 +0000
30@@ -1,1 +1,1 @@
31-1.1.5
32+1.1.6

Subscribers

People subscribed via source and target branches