Export html in package and use package-relative imports

MANIFEST.in

@@ -0,0 +1 @@
+recursive-include introspy/html *

introspy/DBAnalyzer.py

@@ -1,6 +1,7 @@
 from json import dumps
-from IOS_Utils.IOS_SIGNATURES import IOS_SIGNATURES
-from DBParser import DBParser
+
+from .DBParser import DBParser
+from .IOS_Utils.IOS_SIGNATURES import IOS_SIGNATURES
 
 
 class DBAnalyzer(DBParser):

introspy/DBParser.py

@@ -4,10 +4,10 @@
 import plistlib
 import datetime
 
-from TracedCall import TracedCall
-from IOS_Utils.IOS_ENUM_LIST import IOS_ENUM_LIST
-from IOS_Utils.APIGroups import APIGroups
-from IOS_Utils.Signature import Signature
+from .TracedCall import TracedCall
+from .IOS_Utils.IOS_ENUM_LIST import IOS_ENUM_LIST
+from .IOS_Utils.APIGroups import APIGroups
+from .IOS_Utils.Signature import Signature
 
 
 class DBParser(object):

introspy/HTMLReportGenerator.py

@@ -12,7 +12,7 @@ class HTMLReportGenerator:
     API_GROUPS_FILE_NAME =    'apiGroups.js'
 
     # TODO: merge the two templates and get rid of this
-    HTML_TEMPLATE_PATH = os.path.abspath('html')
+    HTML_TEMPLATE_PATH = os.path.join(os.path.dirname(__file__), 'html')
     ANDROID_TEMPLATE = 'report-android.html'
     IOS_TEMPLATE = 'report-ios.html'
     FINAL_TEMPLATE = 'report.html'

introspy/__init__.py

@@ -11,9 +11,10 @@
 import os
 from argparse import ArgumentParser
 
-from DBAnalyzer import DBAnalyzer
-from HTMLReportGenerator import HTMLReportGenerator
-from IOS_Utils.ScpClient import ScpClient
+from .DBAnalyzer import DBAnalyzer
+from .DBParser import DBParser
+from .HTMLReportGenerator import HTMLReportGenerator
+from .IOS_Utils.ScpClient import ScpClient
 
 
 def main(argv=None):

setup.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 import os
-from setuptools import setup
+from setuptools import setup, find_packages
 
 
 original_dir = os.getcwd()
@@ -10,8 +10,9 @@
     setup(
         name="Introspy-Analyzer",
         version=__import__("introspy").__version__,
-        packages=['introspy'],
-        package_data={'html': 'html'},
+        packages=find_packages(),
+        include_package_data=True,
+        zip_safe=False,
 
         # metadata for upload to PyPI
         author=__import__("introspy").__author__,