From 642e3357a1f09de7cff2fea1c70dca68633adf46 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 19 Aug 2023 12:19:11 +0530 Subject: [PATCH 1/8] Update mixin_simulation.py --- wbia/algo/graph/mixin_simulation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wbia/algo/graph/mixin_simulation.py b/wbia/algo/graph/mixin_simulation.py index 9e73539f8e..83bb69e94f 100644 --- a/wbia/algo/graph/mixin_simulation.py +++ b/wbia/algo/graph/mixin_simulation.py @@ -302,8 +302,8 @@ def _dynamic_test_callback(infr, edge, decision, prev_decision, user_id): test_print = ut.partial(infr.print, level=2) - def test_print(x, **kw): - infr.print('[ACTION] ' + x, level=2, **kw) + #def test_print(x, **kw): + # infr.print('[ACTION] ' + x, level=2, **kw) # test_print = lambda *a, **kw: None # NOQA From 5783653ed45dce157aaee6e664c0d869f1147382 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 19 Aug 2023 12:41:02 +0530 Subject: [PATCH 2/8] Update copy_sqlite_to_postgres.py --- wbia/dtool/copy_sqlite_to_postgres.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wbia/dtool/copy_sqlite_to_postgres.py b/wbia/dtool/copy_sqlite_to_postgres.py index 8bff07731e..0aa5d9189b 100644 --- a/wbia/dtool/copy_sqlite_to_postgres.py +++ b/wbia/dtool/copy_sqlite_to_postgres.py @@ -351,7 +351,7 @@ def rows_equal(row1, row2): def _complex_type_equality_check(v1, v2): """Returns True on the equality of ``v1`` and ``v2``; otherwise False""" - if type(v1) != type(v2): + if type(v1) is not type(v2): if isinstance(v1, (float, int)) and isinstance(v2, (float, int)): # We have some float in integer fields in sqlite, for example in # annotmatch, the annotmatch_posixtime_modified field has values From 023b1521260e46dad1341269fe188385830a5303 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 19 Aug 2023 12:45:28 +0530 Subject: [PATCH 3/8] Update mixin_simulation.py --- wbia/algo/graph/mixin_simulation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wbia/algo/graph/mixin_simulation.py b/wbia/algo/graph/mixin_simulation.py index 83bb69e94f..edf13ffdff 100644 --- a/wbia/algo/graph/mixin_simulation.py +++ b/wbia/algo/graph/mixin_simulation.py @@ -302,7 +302,7 @@ def _dynamic_test_callback(infr, edge, decision, prev_decision, user_id): test_print = ut.partial(infr.print, level=2) - #def test_print(x, **kw): + # def test_print(x, **kw): # infr.print('[ACTION] ' + x, level=2, **kw) # test_print = lambda *a, **kw: None # NOQA From cf9950835808011706e66bd158fc1b738f64e2cc Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sat, 19 Aug 2023 13:14:36 +0530 Subject: [PATCH 4/8] Update newgui.py --- wbia/gui/newgui.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wbia/gui/newgui.py b/wbia/gui/newgui.py index 0210ded0c5..73a2d11488 100755 --- a/wbia/gui/newgui.py +++ b/wbia/gui/newgui.py @@ -1022,8 +1022,8 @@ def make_adjacent_qtindex_callbacks(ibswgt, model, qtindex): current_rowid = model._get_row_id(qtindex) next_qtindex = model._get_adjacent_qtindex(qtindex, 1) prev_qtindex = model._get_adjacent_qtindex(qtindex, -1) - next_callback = None - prev_callback = None + # next_callback = None + # prev_callback = None numclicks = [0] # semephore, invalidates both functions after one call if next_qtindex is not None and next_qtindex.isValid(): From 872bd84c44a444e9f1c0f6e22e2a3748820515dc Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sun, 20 Aug 2023 12:28:01 +0530 Subject: [PATCH 5/8] Update testing.yml --- .github/workflows/testing.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index e517b24eb8..449674bb3a 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -137,6 +137,7 @@ jobs: # Install and test - name: Install project run: | + pip install --upgrade pip pip install -e .[tests,problematic,postgres] mkdir -p /tmp/work python -m wbia --set-workdir /tmp/work --preload-exit From 36adb3f9cbb97aa2f7eeee46dde8b1bb92140f3b Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sun, 20 Aug 2023 13:36:19 +0530 Subject: [PATCH 6/8] Update testing.yml --- .github/workflows/testing.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 449674bb3a..02bf1d60f1 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -67,6 +67,7 @@ jobs: # Install and test - name: Install project run: | + pip install --upgrade pip pip install -e .[tests,problematic] mkdir -p /tmp/work export PYTHONFAULTHANDLER=1 From ac127dcfd8a6196e758d8c9c5ad22238a4a321ab Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sun, 20 Aug 2023 14:48:40 +0530 Subject: [PATCH 7/8] Update runtime.txt --- requirements/runtime.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements/runtime.txt b/requirements/runtime.txt index 808496304c..64e17640af 100644 --- a/requirements/runtime.txt +++ b/requirements/runtime.txt @@ -42,7 +42,8 @@ markupsafe<2.0.0 # marshmallow-sqlalchemy==0.12.1 matplotlib==3.5.3 networkx==2.6.3 -numpy==1.21.6 +#numpy==1.21.6 +numpy==1.23.0 opencv-contrib-python-headless==4.7.0.72 pandas==1.3.5 parse==1.8.4 From 6cd45ccfd155c4d4f6153a3f7df50836c22255f4 Mon Sep 17 00:00:00 2001 From: tsubramanian Date: Sun, 20 Aug 2023 15:18:19 +0530 Subject: [PATCH 8/8] Update runtime.txt --- requirements/runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/runtime.txt b/requirements/runtime.txt index 64e17640af..074b12abf7 100644 --- a/requirements/runtime.txt +++ b/requirements/runtime.txt @@ -43,7 +43,7 @@ markupsafe<2.0.0 matplotlib==3.5.3 networkx==2.6.3 #numpy==1.21.6 -numpy==1.23.0 +numpy>=1.21.0 opencv-contrib-python-headless==4.7.0.72 pandas==1.3.5 parse==1.8.4