Skip to content

Commit

Permalink
Merge branch 'release/2.10.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
juhuntenburg committed Mar 11, 2022
2 parents 3a57f52 + b7d94f4 commit 04b88bf
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ibllib/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "2.10.4"
__version__ = "2.10.5"
import warnings

from ibllib.misc import logger_config
Expand Down
8 changes: 5 additions & 3 deletions ibllib/oneibl/data_handlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,10 @@ def setUp(self):
:return:
"""
if self.lab == 'cortexlab':
df = super().getData(one=ONE(base_url='https://alyx.internationalbrainlab.org'))
one = ONE(base_url='https://alyx.internationalbrainlab.org')
df = super().getData(one=one)
else:
one = self.one
df = super().getData()

if len(df) == 0:
Expand All @@ -173,9 +175,9 @@ def setUp(self):
full_local_path = Path(self.globus.endpoints['local']['root_path']).joinpath(sess_path)
if not full_local_path.exists():

if self.one._index_type() is int:
if one._index_type() is int:
uuid = np2str(np.r_[i[0], i[1]])
elif self.one._index_type() is str:
elif one._index_type() is str:
uuid = i

self.local_paths.append(full_local_path)
Expand Down
3 changes: 3 additions & 0 deletions release_notes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
## Release Note 2.10

## Release Note 2.10.5 2022-03-11
- Fix moot release accident

## Release Note 2.10.4 2022-03-11
- Data handler connects to correct alyx database on cortexlab

Expand Down

0 comments on commit 04b88bf

Please sign in to comment.