Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
rossant committed Sep 7, 2021
1 parent ebc63a9 commit e335c39
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion phy/cluster/tests/test_supervisor.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#from contextlib import contextmanager

from pytest import fixture, fixture
from pytest import fixture
import numpy as np
from numpy.testing import assert_array_equal as ae

Expand Down
8 changes: 6 additions & 2 deletions phy/cluster/views/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,11 +210,14 @@ def finished():
# starting to record all OpenGL calls instead of executing them immediately.
# This is what we call the "lazy" mode.
emit('is_busy', self, True)
if getattr(gui, '_enable_threading', True):

# HACK: disable threading mechanism for now
# if getattr(gui, '_enable_threading', True):
if 0: # pragma: no cover
# This is only for OpenGL views.
self.canvas.set_lazy(True)
thread_pool().start(worker)
else: # pragma: no cover
else:
# This is for OpenGL views, without threading.
worker.run()
self._lock = None
Expand Down Expand Up @@ -419,6 +422,7 @@ def on_select(self, sender=None, cluster_ids=(), **kwargs):
class BaseColorView(BaseWheelMixin):
"""Provide facilities to add and select color schemes in the view.
"""

def __init__(self, *args, **kwargs):
super(BaseColorView, self).__init__(*args, **kwargs)
self.state_attrs += ('color_scheme',)
Expand Down
2 changes: 1 addition & 1 deletion phy/plot/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Imports
#------------------------------------------------------------------------------

from pytest import fixture, fixture
from pytest import fixture

from ..base import BaseCanvas
from ..panzoom import PanZoom
Expand Down
2 changes: 1 addition & 1 deletion phy/utils/tests/test_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import numpy as np
from numpy.testing import assert_array_equal as ae
from pytest import fixture, fixture
from pytest import fixture

from phylib.io.array import write_array, read_array
from ..context import Context, _fullname
Expand Down

0 comments on commit e335c39

Please sign in to comment.