Merge lp:~andreserl/maas/maas_setup_data_files into lp:~maas-committers/maas/trunk

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 704
Proposed branch: lp:~andreserl/maas/maas_setup_data_files
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 32 lines (+22/-0)
1 file modified
setup.py (+22/-0)
To merge this branch: bzr merge lp:~andreserl/maas/maas_setup_data_files
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+112810@code.launchpad.net

Commit message

setup.py: Install data_files that are required by maas, rather than manually copy them on packaging

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) wrote :

I haven't checked this myself, and I'd like to eventually compose some sort of test around this, but this looks good for now. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'setup.py'
--- setup.py 2012-06-21 12:55:22 +0000
+++ setup.py 2012-06-29 16:42:18 +0000
@@ -52,6 +52,28 @@
52 package_dir={'': b'src'},52 package_dir={'': b'src'},
53 include_package_data=True,53 include_package_data=True,
5454
55 data_files=[
56 ('/etc/maas',
57 ['etc/pserv.yaml',
58 'etc/txlongpoll.yaml',
59 'etc/celeryconfig.py',
60 'etc/maas/import_ephemerals',
61 'etc/maas/commissioning-user-data',
62 'contrib/maas-http.conf',
63 'contrib/maas_local_settings.py']),
64 ('/etc/cron.d',
65 ['etc/cron.d/maas-gc']),
66 ('/usr/share/maas',
67 ['contrib/wsgi.py']),
68 ('/usr/share/maas/preseeds',
69 ['contrib/preseeds_v2/commissioning',
70 'contrib/preseeds_v2/enlist',
71 'contrib/preseeds_v2/generic',
72 'contrib/preseeds_v2/preseed_master']),
73 ('/usr/sbin',
74 ['scripts/maas-import-ephemerals', 'scripts/maas-import-pxe-files']),
75 ],
76
55 install_requires=[77 install_requires=[
56 'setuptools',78 'setuptools',
57 'Django == 1.3.1',79 'Django == 1.3.1',