From c85afe6d5235687173aac7cc3368ae2f5ce9c461 Mon Sep 17 00:00:00 2001 From: LashaO Date: Fri, 21 Apr 2023 18:46:20 +0400 Subject: [PATCH] test branch override --- devops/Dockerfile | 5 +++-- devops/provision/Dockerfile | 2 +- wbia/control/IBEISControl.py | 7 ++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/devops/Dockerfile b/devops/Dockerfile index 180f4edf3..b4b7734c5 100644 --- 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 index 58030dcb4..78f113914 100644 --- 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 index 21183f858..a2905479c 100644 --- 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