Skip to content

Commit 4eb0e46

Browse files
committed
Fix setup + correctly use package_data
It was working kind of by chance the setup.
1 parent d30ca26 commit 4eb0e46

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

MANIFEST.in

+4
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,9 @@ include COPYING
22
include *.rst
33
include errbot/*.svg
44
include errbot/templates/*.md
5+
include errbot/templates/*.tmpl
6+
include errbot/templates/initdir/*.tmpl
7+
include errbot/templates/initdir/*.plug
8+
include errbot/templates/initdir/*.py
59
include errbot/core_plugins/templates/*.md
610
prune tests

setup.py

+16-3
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,12 @@ def read(fname):
125125
from tools.py2conv import convert_to_python2
126126
convert_to_python2()
127127

128+
packages = find_packages(src_root, include=['errbot', 'errbot.*'])
129+
128130
setup(
129131
name="errbot",
130132
version=VERSION,
131-
packages=find_packages(src_root, exclude=['tests', 'tests.*', 'tools']),
133+
packages=packages,
132134
entry_points={
133135
'console_scripts': [
134136
'errbot = errbot.cli:main',
@@ -138,7 +140,19 @@ def read(fname):
138140
install_requires=deps,
139141
tests_require=['nose', 'webtest', 'requests'],
140142
package_data={
141-
'': ['*.txt', '*.rst', '*.plug', '*.md'],
143+
'errbot': ['backends/*.plug',
144+
'backends/*.html',
145+
'backends/styles/*.css',
146+
'backends/images/*.svg',
147+
'core_plugins/*.plug',
148+
'core_plugins/templates/*.md',
149+
'storage/*.plug',
150+
'templates/initdir/example.py',
151+
'templates/initdir/example.plug',
152+
'templates/initdir/config.py.tmpl',
153+
'templates/*.md',
154+
'templates/new_plugin.py.tmpl',
155+
],
142156
},
143157
extras_require={
144158
'graphic': ['PySide', ],
@@ -160,7 +174,6 @@ def read(fname):
160174
"Development Status :: 5 - Production/Stable",
161175
"Topic :: Communications :: Chat",
162176
"Topic :: Communications :: Chat :: Internet Relay Chat",
163-
"Topic :: Communications :: Conferencing",
164177
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
165178
"Operating System :: OS Independent",
166179
"Programming Language :: Python :: 2",

0 commit comments

Comments
 (0)