test branch override

WildMeOrg · Apr 21, 2023 · c85afe6 · c85afe6
1 parent 83ddb93
commit c85afe6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/devops/Dockerfile b/devops/Dockerfile
@@ -23,7 +23,8 @@ RUN set -ex \
  && git reset --hard origin/main \
  && git pull \
  && cd /wbia/wildbook-ia/ \
- && git reset --hard origin/main \
+ && git fetch \
+ && git reset --hard origin/add-plugin-tbd  \
  && git config pull.rebase true \
  && git pull
 
@@ -35,7 +36,7 @@ ARG VERSION="3.7.2"
 
 ARG VCS_URL="https://github.com/WildMeOrg/wildbook-ia"
 
-ARG VCS_REF="main"
+ARG VCS_REF="add-plugin-tbd"
 
 ARG BUILD_DATE="2023"
 

diff --git a/devops/provision/Dockerfile b/devops/provision/Dockerfile
@@ -5,7 +5,7 @@ FROM ${WBIA_BASE_IMAGE} as org.wildme.wbia.provision
 # Wildbook IA version
 ARG VCS_URL="https://github.com/WildMeOrg/wildbook-ia"
 
-ARG VCS_REF="main"
+ARG VCS_REF="add-plugin-tbd"
 
 # Clone WBIA repository
 RUN set -ex \

diff --git a/wbia/control/IBEISControl.py b/wbia/control/IBEISControl.py
@@ -212,7 +212,12 @@
             continue
     try:
         # ut.import_modname(modname)
-        ub.import_module_from_name(modname)
+        ## NOTE hack
+        if modname == 'wbia_tbd._plugin':
+            ub.import_module_from_path('/wbia/wbia-plugin-tbd/wbia_tbd/__init__.py'
+)
+        else:
+            ub.import_module_from_name(modname)
     except ImportError:
         if 'wbia_cnn' in modname:
             import warnings