Merge pull request #277 from WildMeOrg/Remove_CurvRank2_FinFindr

Remove curv, curvrank2, finfindr
WildMeOrg · May 30, 2024 · 7cce85c · 7cce85c
2 parents f121190 + bd6a271
commit 7cce85c
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 38 deletions.
diff --git a/devops/Dockerfile b/devops/Dockerfile
@@ -3,16 +3,17 @@ ARG WBIA_BASE_IMAGE=wildme/wbia-base:latest
 ARG WBIA_PROVISION_IMAGE=wildme/wbia-provision:latest
 
 FROM ${WBIA_PROVISION_IMAGE} as org.wildme.wbia.latest
+#  && cd /wbia/wbia-plugin-curvrank/wbia_curvrank_v2 \
+# && git reset --hard origin/main \
+# && git pull \
 
 # Grab latest code
 RUN set -ex \
  && git config --global user.email "[email protected]" \
  && git config --global user.name "Wild Me" \
  && find /wbia/wbia* -name '.git' -type d -print0 | xargs -0 -i /bin/bash -c \
     'cd {} && cd .. && echo $(pwd) && git reset --hard origin/main && git pull' \
- && cd /wbia/wbia-plugin-curvrank/wbia_curvrank_v2 \
- && git reset --hard origin/main \
- && git pull \
+
  && cd /wbia/wbia-plugin-kaggle7/wbia_kaggle7 \
  && git reset --hard origin/main \
  && git pull \
@@ -138,6 +139,11 @@ RUN set -ex \
 # && /virtualenv/env3/bin/python -c "import wbia;             from wbia.__main__ import smoke_test; smoke_test()" \
 # && /virtualenv/env3/bin/python -c "import wbia_flukematch;  from wbia_flukematch.plugin   import *" \  -- commented out due to Lasagne package dependency issues
 #  && /virtualenv/env3/bin/python -c "import wbia_finfindr;    from wbia_finfindr.__main__ import main;      main()" \
+#  && /virtualenv/env3/bin/python -c "import wbia_curvrank_v2; from wbia_curvrank_v2._plugin import *" \
+#&& /virtualenv/env3/bin/python -c "import wbia_finfindr;    from wbia_finfindr._plugin    import *" \
+# && /virtualenv/env3/bin/python -c "import wbia_whaleridgefindr;    from wbia_whaleridgefindr._plugin     import *" \
+
+
 RUN set -ex \
  && mkdir -p /data \
  && /virtualenv/env3/bin/python -m wbia.dev --set-workdir /data --preload-exit \
@@ -146,8 +152,6 @@ RUN set -ex \
  && /virtualenv/env3/bin/python -c "import wbia_pie_v2;      from wbia_pie_v2.__main__ import main;      main()" \
  && /virtualenv/env3/bin/python -c "import wbia_blend;       from wbia_blend._plugin import *" \
  && /virtualenv/env3/bin/python -c "import wbia_orientation; from wbia_orientation.__main__ import main; main()" \
- && /virtualenv/env3/bin/python -c "import wbia_curvrank_v2; from wbia_curvrank_v2._plugin import *" \
- && /virtualenv/env3/bin/python -c "import wbia_finfindr;    from wbia_finfindr._plugin    import *" \
  && /virtualenv/env3/bin/python -c "import wbia_whaleridgefindr;    from wbia_whaleridgefindr._plugin     import *" \
  && /virtualenv/env3/bin/python -c "import wbia_kaggle7;     from wbia_kaggle7._plugin     import *" \
  && /virtualenv/env3/bin/python -c "import wbia_lca;         from wbia_lca._plugin         import *" \

diff --git a/devops/base/Dockerfile b/devops/base/Dockerfile
@@ -123,12 +123,13 @@ RUN set -ex \
 RUN set -ex \
  && /virtualenv/env3/bin/pip install --upgrade \
         pip \
- && /virtualenv/env3/bin/pip install --upgrade \
+ && /virtualenv/env3/bin/pip install setuptools==59.5.0 \
+ && /virtualenv/env3/bin/pip install  --upgrade  \
         # Install build requirements
         cmake \
         ninja \
-        scikit-build \
-        setuptools \
+        setuptools==59.5.0 \
+        scikit-build \    
         setuptools_scm[toml] \
         cython \
         # Install handy developer tools

diff --git a/devops/develop/Dockerfile b/devops/develop/Dockerfile
@@ -8,6 +8,7 @@ RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \
  && pip uninstall -y wildbook-ia \
  && cd /wbia/wildbook-ia \
  && /bin/bash run_developer_setup.sh \
+ && pip install --upgrade pip setuptools-scm \
  && pip install --no-cache-dir -r /wbia/wildbook-ia/requirements/tests.txt \
  && pip install --no-cache-dir -r /wbia/wildbook-ia/requirements/runtime.txt \
  && pip install --no-cache-dir -r /wbia/wildbook-ia/requirements/postgres.txt \

diff --git a/devops/install.ubuntu.sh b/devops/install.ubuntu.sh
@@ -78,7 +78,7 @@ pip install --no-cache-dir --upgrade \
     'cmake!=3.18.2' \
     ninja \
     scikit-build \
-    'setuptools>=42' \
+    'setuptools==59.5.0' \
     'setuptools_scm[toml]>=3.4' \
     cython==3.0.0 \
     numpy \
@@ -192,17 +192,17 @@ git clone --branch develop https://github.com/WildMeOrg/wbia-deprecate-tpl-bramb
 git clone --branch develop https://github.com/WildMeOrg/wbia-deprecate-tpl-lightnet
 git clone --recursive --branch develop https://github.com/WildMeOrg/wbia-plugin-cnn.git
 git clone --branch develop https://github.com/WildMeOrg/wbia-plugin-flukematch.git
-git clone --branch develop https://github.com/WildMeOrg/wbia-plugin-finfindr.git
+#git clone --branch develop https://github.com/WildMeOrg/wbia-plugin-finfindr.git
 git clone --branch develop https://github.com/WildMeOrg/wbia-plugin-deepsense.git
 git clone --branch develop https://github.com/WildMeOrg/wbia-plugin-whaleridgefindr.git
 git clone --branch develop https://github.com/WildMeOrg/wbia-plugin-pie.git
 git clone https://github.com/WildMeOrg/wbia-plugin-blend.git
 
-cd ${CODE}
-git clone --recursive --branch develop https://github.com/WildMeOrg/wbia-plugin-curvrank.git
-cd wbia-plugin-curvrank/wbia_curvrank
-git fetch origin
-git checkout develop
+#cd ${CODE}
+#git clone --recursive --branch develop https://github.com/WildMeOrg/wbia-plugin-curvrank.git
+#cd wbia-plugin-curvrank/wbia_curvrank
+#git fetch origin
+#git checkout develop
 
 cd ${CODE}
 git clone --recursive --branch develop https://github.com/WildMeOrg/wbia-plugin-kaggle7.git
@@ -250,8 +250,8 @@ cd ${CODE}/wbia-plugin-pie
 cd ${CODE}/wbia-plugin-blend
 pip install --no-cache-dir -e .
 
-cd ${CODE}/wbia-plugin-finfindr
-pip install --no-cache-dir -e .
+#cd ${CODE}/wbia-plugin-finfindr
+#pip install --no-cache-dir -e .
 
 cd ${CODE}/wbia-plugin-whaleridgefindr
 pip install --no-cache-dir -e .
@@ -269,9 +269,9 @@ cd ${CODE}/wbia-plugin-flukematch
 ./unix_build.sh
 pip install --no-cache-dir -e .
 
-cd ${CODE}/wbia-plugin-curvrank
-./unix_build.sh
-pip install --no-cache-dir -e .
+#cd ${CODE}/wbia-plugin-curvrank
+#./unix_build.sh
+#pip install --no-cache-dir -e .
 
 pip uninstall -y \
     opencv-python \
@@ -316,8 +316,8 @@ python -c "import wbia_cnn;        from wbia_cnn.__main__ import main;   main()"
 python -c "import wbia_pie;        from wbia_pie.__main__ import main;   main()"
 python -c "import wbia_blend;      from wbia_blend._plugin import *"
 python -c "import wbia_flukematch; from wbia_flukematch.plugin import *"
-python -c "import wbia_curvrank;   from wbia_curvrank._plugin  import *"
-python -c "import wbia_finfindr;   from wbia_finfindr._plugin  import *"
+#python -c "import wbia_curvrank;   from wbia_curvrank._plugin  import *"
+#python -c "import wbia_finfindr;   from wbia_finfindr._plugin  import *"
 python -c "import wbia_whaleridgefindr;   from wbia_whaleridgefindr._plugin  import *"
 python -c "import wbia_kaggle7;    from wbia_kaggle7._plugin   import *"
 python -c "import wbia_deepsense;  from wbia_deepsense._plugin import *"

diff --git a/devops/provision/Dockerfile b/devops/provision/Dockerfile
@@ -37,7 +37,7 @@ RUN set -ex \
  && cd /wbia \
  && git clone https://github.com/WildMeOrg/wbia-plugin-orientation.git \
  && git clone https://github.com/WildMeOrg/wbia-plugin-flukematch.git \
- && git clone https://github.com/WildMeOrg/wbia-plugin-finfindr.git \
+ #&& git clone https://github.com/WildMeOrg/wbia-plugin-finfindr.git \
  && git clone https://github.com/WildMeOrg/wbia-plugin-deepsense.git \
  && git clone https://github.com/WildMeOrg/wbia-plugin-pie-v2.git \
  && git clone https://github.com/WildMeOrg/wbia-plugin-miew-id.git \
@@ -51,12 +51,12 @@ RUN set -ex \
  && git checkout main
 
 # Clone third-party WBIA plug-in repositories
-RUN set -ex \
- && cd /wbia \
- && git clone --recursive https://github.com/WildMeOrg/wbia-plugin-curvrank.git \
- && cd /wbia/wbia-plugin-curvrank/wbia_curvrank_v2 \
- && git fetch origin \
- && git checkout main
+#RUN set -ex \
+# && cd /wbia \
+# && git clone --recursive https://github.com/WildMeOrg/wbia-plugin-curvrank.git \
+# && cd /wbia/wbia-plugin-curvrank/wbia_curvrank_v2 \
+# && git fetch origin \
+# && git checkout main
 
 RUN set -ex \
  && cd /wbia \
@@ -128,9 +128,9 @@ RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \
  && cd /wbia/wbia-plugin-blend \
  && pip install --no-cache-dir -e .'
 
-RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \
- && cd /wbia/wbia-plugin-finfindr \
- && pip install --no-cache-dir -e .'
+#RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \
+# && cd /wbia/wbia-plugin-finfindr \
+# && pip install --no-cache-dir -e .'
 
 RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \
  && cd /wbia/wbia-plugin-whaleridgefindr \
@@ -157,10 +157,10 @@ RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \
  && ./unix_build.sh \
  && pip install --no-cache-dir -e .'
 
-RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \
- && cd /wbia/wbia-plugin-curvrank \
- && ./unix_build.sh \
- && pip install --no-cache-dir -e .'
+#RUN /bin/bash -xc '. /virtualenv/env3/bin/activate \
+# && cd /wbia/wbia-plugin-curvrank \
+# && ./unix_build.sh \
+# && pip install --no-cache-dir -e .'
 
 # Ensure no previous or deprecated repositories are installed
 # Ensure that opencv-python is un-installed since we want to use our built version

diff --git a/requirements/build.txt b/requirements/build.txt
@@ -2,6 +2,5 @@ cmake==3.25.2
 ninja==1.11.1
 fairseq==0.12.2
 setuptools==59.5.0
-setuptools_scm[toml]==6.3.2
 wheel==0.38.4
 pyhesaff==2.1.1
diff --git a/wbia/control/_sql_helpers.py b/wbia/control/_sql_helpers.py
@@ -18,7 +18,10 @@ def version_check():
     r"""
     duct tape function to avoid the setup tools version issues
     """
-    print("setuptools version:", setuptools.__version__)
+    try:
+        print("setuptools version:", setuptools.__version__)
+    except Exception as ex:
+        print("setuptools version - no able to fetch version", ex.message, ex.args)
 
 
 def compare_string_versions(a, b):