Merge lp:~benji/wadllib/missing-files into lp:wadllib

Proposed by Benji York
Status: Merged
Merged at revision: 18
Proposed branch: lp:~benji/wadllib/missing-files
Merge into: lp:wadllib
Diff against target: 29 lines (+8/-1)
3 files modified
MANIFEST.in (+1/-0)
src/wadllib/NEWS.txt (+6/-0)
src/wadllib/version.txt (+1/-1)
To merge this branch: bzr merge lp:~benji/wadllib/missing-files
Reviewer Review Type Date Requested Status
Leonard Richardson (community) Approve
Review via email: mp+39400@code.launchpad.net

Description of the change

The wadllib source distribution was missing some xml and json files. This branch adds a MANIFEST.in so those files are included.

The reason setuptools doesn't understand bzr (it does understand svn and cvs), therefore it doesn't know which non-Python files are part of the project and which aren't. If setuptools did understand bzr we could add a "package_data" argument to setup() to have those files included. Instead we have to add a "recursive-include" statement to the MANIFEST.in.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'MANIFEST.in'
2--- MANIFEST.in 1970-01-01 00:00:00 +0000
3+++ MANIFEST.in 2010-10-26 19:56:08 +0000
4@@ -0,0 +1,1 @@
5+recursive-include src *.json *.xml
6
7=== modified file 'src/wadllib/NEWS.txt'
8--- src/wadllib/NEWS.txt 2010-10-21 17:31:20 +0000
9+++ src/wadllib/NEWS.txt 2010-10-26 19:56:08 +0000
10@@ -2,6 +2,12 @@
11 NEWS for wadllib
12 ================
13
14+1.1.7 (2010-10-26)
15+==================
16+
17+- This revision contains no code changes, but the build system was
18+ changed (again) to include the sample data used in tests.
19+
20 1.1.6 (2010-10-21)
21 ==================
22
23
24=== modified file 'src/wadllib/version.txt'
25--- src/wadllib/version.txt 2010-10-21 17:31:20 +0000
26+++ src/wadllib/version.txt 2010-10-26 19:56:08 +0000
27@@ -1,1 +1,1 @@
28-1.1.6
29+1.1.7

Subscribers

People subscribed via source and target branches