Skip to content

Commit

Permalink
Merge pull request #259 from WildMeOrg/testing-fluke8-fix
Browse files Browse the repository at this point in the history
testing-fluke8-fix
  • Loading branch information
JasonWildMe authored Aug 20, 2023
2 parents 1f46815 + 6cd45cc commit 6d50be5
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion requirements/runtime.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions wbia/algo/graph/mixin_simulation.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion wbia/dtool/copy_sqlite_to_postgres.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions wbia/gui/newgui.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():

Expand Down

0 comments on commit 6d50be5

Please sign in to comment.