address Issue #86 with setuptools

hupili · Jul 18, 2013 · d06d548 · d06d548
1 parent 76d0c90
commit d06d548
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 3 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,5 @@
 include snscli.py snsgui.py README.md VERSION.md CONTRIBUTOR requirements.txt
 recursive-include snsapi *.py *.md
 recursive-include conf *.example *.ini
+include snsapi/data/init-channel.json.example
+include snsapi/data/snsgui.ini
diff --git a/setup.py b/setup.py
@@ -27,7 +27,11 @@
       maintainer_email='[email protected]',
       url='https://github.com/hupili/snsapi',
       packages=['snsapi', 'snsapi.third', 'snsapi.plugin', 'snsapi.plugin_trial'],
-      package_data={'snsapi': ['conf/*.ini', 'conf/*.example']},
+      package_data={'snsapi': ['data/*.ini', 'data/*.example']},
+      data_files=[
+          ('data', ['snsapi/data/init-channel.json.example', 'snsapi/data/snsgui.ini'])
+      ],
+      include_package_data=True,
       scripts=['snscli.py', 'snsgui.py'],
       provides=['snsapi'],
       requires=REQUIRES,

diff --git a/snsapi/conf b/snsapi/conf
diff --git a/conf/init-channel.json.example → snsapi/data/init-channel.json.example b/conf/init-channel.json.example → snsapi/data/init-channel.json.example
diff --git a/conf/snsgui.ini → snsapi/data/snsgui.ini b/conf/snsgui.ini → snsapi/data/snsgui.ini
diff --git a/snsapi/snsconf.py b/snsapi/snsconf.py
@@ -107,7 +107,7 @@ class SNSConf(object):
 
     #TODO:
     #    Find better way to organize static package data
-    SNSAPI_DIR_STATIC_DATA = path.join(path.dirname(path.abspath(__file__)), 'conf')
+    SNSAPI_DIR_STATIC_DATA = path.join(path.dirname(path.abspath(__file__)), 'data')
     _USER_HOME = path.expanduser('~')
     _SNSAPI_DIR_USER_ROOT = path.join(_USER_HOME, '.snsapi')
     _SNSAPI_DIR_CWD = path.abspath('.')