Skip to content

Commit 287b725

Browse files
authored
Merge branch 'master' into fix/raw-binary-read
2 parents 6e93f50 + c521f97 commit 287b725

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

doc/source/share_data.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ You can download them by hand, by selecting each file then selecting "Download f
5757

5858
In [2]: from urllib.parse import quote
5959

60-
In [3]: dataset_url = "https://object.cscs.ch/v1/AUTH_63ea6845b1d34ad7a43c8158d9572867/hbp-d000017_PatchClamp-GranuleCells_pub"
60+
In [3]: dataset_url = "https://data-proxy.ebrains.eu/api/v1/buckets/p63ea6-hbp-d000017_PatchClamp-GranuleCells_pub"
6161

6262
In [4]: folder = "GrC_Subject15_180116"
6363

neo/io/kwikio.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
import importlib.metadata
2626
from packaging.version import Version, parse
2727

28-
numpy_version = parse(importlib.metadata.version('numpy'))
28+
numpy_version = parse(importlib.metadata.version("numpy"))
29+
2930

3031
class KwikIO(BaseIO):
3132
"""
@@ -64,10 +65,12 @@ def __init__(self, filename):
6465
"""
6566

6667
if numpy_version >= Version("2.3.0"):
67-
deprecation_msg = ("As the kwik package is no longer actively maintained it only works with NumPy < 2.3.0 and your environment "
68-
f"has {numpy_version}. Downgrade your NumPy version to use this IO")
68+
deprecation_msg = (
69+
"As the kwik package is no longer actively maintained it only works with NumPy < 2.3.0 and your environment "
70+
f"has {numpy_version}. Downgrade your NumPy version to use this IO"
71+
)
6972
raise NeoReadWriteError(deprecation_msg)
70-
73+
7174
from klusta import kwik
7275

7376
BaseIO.__init__(self)

neo/test/iotest/test_kwikio.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import importlib.metadata
88
from packaging.version import Version, parse
99

10-
kwik_spec = importlib.util.find_spec('klusta')
10+
kwik_spec = importlib.util.find_spec("klusta")
1111
# kwik no longer works with recent versions of numpy
12-
numpy_version = parse(importlib.metadata.version('numpy'))
13-
numpy_okay = numpy_version < Version('2.3.0')
12+
numpy_version = parse(importlib.metadata.version("numpy"))
13+
numpy_okay = numpy_version < Version("2.3.0")
1414
if kwik_spec is not None and numpy_okay:
1515
HAVE_KWIK = True
1616
else:

neo/test/rawiotest/test_openephysbinaryrawio.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ def test_no_sync(self):
7373
with self.assertRaises(ValueError):
7474
with self.assertWarns(DeprecationWarning):
7575
rawio_no_sync = OpenEphysBinaryRawIO(
76-
self.get_local_path("openephysbinary/v0.6.x_neuropixels_multiexp_multistream"), load_sync_channel=True
76+
self.get_local_path("openephysbinary/v0.6.x_neuropixels_multiexp_multistream"),
77+
load_sync_channel=True,
7778
)
7879
rawio_no_sync.parse_header()
7980

0 commit comments

Comments
 (0)