diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index e517b24eb8..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 @@ -137,6 +138,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 diff --git a/requirements/runtime.txt b/requirements/runtime.txt index 808496304c..074b12abf7 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.21.0 opencv-contrib-python-headless==4.7.0.72 pandas==1.3.5 parse==1.8.4 diff --git a/wbia/algo/graph/mixin_simulation.py b/wbia/algo/graph/mixin_simulation.py index 9e73539f8e..edf13ffdff 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 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 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():