##// END OF EJS Templates
setup.py: use package_data to grab UserConfig files, install UserConfig as normal package
ville -
Show More
@@ -104,7 +104,7 b' def file_doesnt_endwith(test,endings):'
104 # Note that http://www.redbrick.dcu.ie/~noel/distutils.html, ex. 2/3, contain
104 # Note that http://www.redbrick.dcu.ie/~noel/distutils.html, ex. 2/3, contain
105 # information on how to do this more cleanly once python 2.4 can be assumed.
105 # information on how to do this more cleanly once python 2.4 can be assumed.
106 # Thanks to Noel for the tip.
106 # Thanks to Noel for the tip.
107 docdirbase = 'share/doc/ipython-%s' % version
107 docdirbase = 'share/doc/ipython'
108 manpagebase = 'share/man/man1'
108 manpagebase = 'share/man/man1'
109
109
110 # We only need to exclude from this things NOT already excluded in the
110 # We only need to exclude from this things NOT already excluded in the
@@ -136,7 +136,6 b" datafiles = [('data', docdirbase, docfiles),"
136 ('data', pjoin(docdirbase, 'examples'),examfiles),
136 ('data', pjoin(docdirbase, 'examples'),examfiles),
137 ('data', pjoin(docdirbase, 'manual'),manfiles),
137 ('data', pjoin(docdirbase, 'manual'),manfiles),
138 ('data', manpagebase, manpages),
138 ('data', manpagebase, manpages),
139 ('lib', 'IPython/UserConfig', cfgfiles),
140 ('data',pjoin(docdirbase, 'extensions'),igridhelpfiles),
139 ('data',pjoin(docdirbase, 'extensions'),igridhelpfiles),
141 ]
140 ]
142
141
@@ -156,6 +155,11 b" if 'setuptools' in sys.modules:"
156 #datafiles = [('lib', 'IPython/UserConfig', cfgfiles)]
155 #datafiles = [('lib', 'IPython/UserConfig', cfgfiles)]
157 else:
156 else:
158 egg_extra_kwds = {}
157 egg_extra_kwds = {}
158 # package_data of setuptools was introduced to distutils in 2.4
159 if sys.version_info < (2,4):
160 datafiles.append(('lib', 'IPython/UserConfig', cfgfiles))
161
162
159
163
160
164
161 # Call the setup() routine which does most of the work
165 # Call the setup() routine which does most of the work
@@ -170,8 +174,9 b' setup(name = name,'
170 license = license,
174 license = license,
171 platforms = platforms,
175 platforms = platforms,
172 keywords = keywords,
176 keywords = keywords,
173 packages = ['IPython', 'IPython.Extensions', 'IPython.external', 'IPython.gui', 'IPython.gui.wx'],
177 packages = ['IPython', 'IPython.Extensions', 'IPython.external', 'IPython.gui', 'IPython.gui.wx', 'IPython.UserConfig'],
174 scripts = scriptfiles,
178 scripts = scriptfiles,
179 package_data = {'IPython.UserConfig' : ['*'] },
175
180
176 cmdclass = {'install_data': install_data_ext},
181 cmdclass = {'install_data': install_data_ext},
177 data_files = datafiles,
182 data_files = datafiles,
General Comments 0
You need to be logged in to leave comments. Login now