Fix LocalRepo2dockerBuild to work with latest BuildExecutor

Author: manics

binderhub/build_local.py

@@ -11,6 +11,7 @@
 from threading import Thread
 
 from tornado.log import app_log
+from traitlets import default
 
 from .build import BuildExecutor, ProgressEvent
 
@@ -111,6 +112,16 @@ class LocalRepo2dockerBuild(BuildExecutor):
     WARNING: This is still under development. Breaking changes may be made at any time.
     """
 
+    @default("identifier")
+    def _default_identifier(self):
+        try:
+            import repo2docker
+
+            return repo2docker.__version__
+        except ImportError:
+            self.log.error("repo2docker not installed")
+            return ""
+
     def submit(self):
         """
         Run a build to create the image for the repository.

binderhub/tests/test_main.py

@@ -108,7 +108,16 @@ async def test_versions_handler(app):
     assert r.status_code == 200
 
     data = r.json()
-    assert data["builder"] == app.build_image
+    # Version is different for KubernetesExecutor and LocalRepo2dockerBuild
+    try:
+        import repo2docker
+
+        allowed_versions = [repo2docker.__version__]
+    except ImportError:
+        allowed_versions = []
+    allowed_versions.append(app.build_image)
+
+    assert data["builder"] in allowed_versions
     assert data["binderhub"].split("+")[0] == binder_version.split("+")[0]
 
 

testing/local-binder-local-hub/binderhub_config.py

@@ -24,7 +24,7 @@
 c.BinderHub.builder_required = False
 
 c.BinderHub.build_class = LocalRepo2dockerBuild
-c.BinderHub.push_secret = None
+c.BinderHub.push_secret = ""
 c.BinderHub.launch_quota_class = LaunchQuota
 
 c.BinderHub.about_message = "This is a local dev deployment without Kubernetes"