summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-07-14 17:59:19 -0300
committerTomás Touceda <chiiph@leap.se>2014-07-14 17:59:19 -0300
commit0237fa1f443d6ab5d1fbe26df46bfcab4eb52388 (patch)
treea333c45820fa04045adc2201d67d84f78a9c25ed
parent90cd60a3c73796372b11b90f0b23ec91c944bfc1 (diff)
parent1e9010e2902bf53706758f40da8b68b35908c811 (diff)
Merge remote-tracking branch 'refs/remotes/kali/bug/install-pemfiles-data' into develop
-rw-r--r--changes/bug_5897-include-pemfiles1
-rw-r--r--setup.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/changes/bug_5897-include-pemfiles b/changes/bug_5897-include-pemfiles
new file mode 100644
index 0000000..b25345b
--- /dev/null
+++ b/changes/bug_5897-include-pemfiles
@@ -0,0 +1 @@
+o Include pemfile in the package data. Closes: #5897
diff --git a/setup.py b/setup.py
index 264d04c..a7de8f9 100644
--- a/setup.py
+++ b/setup.py
@@ -127,6 +127,7 @@ setup(
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']),