Fixes to get the bundler working with the new jsonschema version.

2 files changed, 3 insertions, 1 deletions

diff --git a/bundler/depcollector.py b/bundler/depcollector.py
index bb0ed5f..c6bb197 100644
--- a/bundler/depcollector.py
+++ b/bundler/depcollector.py
@@ -41,6 +41,7 @@ def collect_deps(root, dest_lib_dir, path_file):
     mg.import_hook("tuf")
     mg.import_hook("timeit")
     mg.import_hook("daemon")  # for leap/bitmask/util/polkit_agent.py
+    mg.import_hook("functools32")  # jsonschema dep
 
     # this import ensures the inclusion of the 'service-identity' dependency
     # since we don't import it implicitly anywhere
@@ -58,7 +59,7 @@ def collect_deps(root, dest_lib_dir, path_file):
 
     for (name, pkg) in sorted_pkg:
         # skip namespace packages
-        if name in ("leap", "leap.soledad", "google", "zope") or \
+        if name in ("leap", "leap.soledad", "google", "zope", "repoze") or \
                 name.endswith("leap/bitmask/app.py"):
             continue
 
diff --git a/createbundle.sh b/createbundle.sh
index 511eb87..c32e125 100755
--- a/createbundle.sh
+++ b/createbundle.sh
@@ -166,6 +166,7 @@ setup_bundler() {
     pip install --upgrade pip
     pip install --allow-external u1db --allow-unverified u1db --allow-external dirspec --allow-unverified dirspec u1db dirspec
     pip install pysqlcipher
+    pip install functools32  # HACK: this dependency is needed by jsonschema and is not automatically gathered
 
     # HACK: this is needed so tuf can verify the downloaded data, if we add
     # this to the requirements.pip pycrypto is installed as an egg and the