[pkg] fold in changes
[leap_pycommon.git] / setup.py
index 519ddb3..776a477 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -104,6 +104,11 @@ def get_versions(default={}, verbose=False):
         with open(versioneer.versionfile_source, 'w') as f:
             f.write(subst_template)
 
+try:
+    long_description = open('README.rst').read() + '\n\n\n' + \
+        open('CHANGELOG').read()
+except Exception:
+    long_description = ""
 
 cmdclass["freeze_debianver"] = freeze_debianver
 setup(
@@ -118,11 +123,11 @@ setup(
     maintainer='Kali Kaneko',
     maintainer_email='kali@leap.se',
     description='Common files used by the LEAP project.',
-    long_description=open('README.rst').read() + '\n\n\n' +
-    open('CHANGELOG').read(),
+    long_description=long_description,
     classifiers=trove_classifiers,
     namespace_packages=["leap"],
     package_dir={'': 'src'},
+    package_data={'': ['*.pem']},
     # For now, we do not exclude tests because of the circular dependency
     # between leap.common and leap.soledad.
     #packages=find_packages('src', exclude=['leap.common.tests']),
@@ -133,4 +138,11 @@ setup(
     tests_require=tests_requirements,
     include_package_data=True,
     zip_safe=False,
+
+    extras_require={
+        # needed for leap.common.http
+        #  service_identity needed for propper hostname identification,
+        #  see http://twistedmatrix.com/documents/current/core/howto/ssl.html
+        'Twisted':  ["Twisted>=14.0.2", "service_identity", "zope.insterface"]
+    },
 )