Skip to content

Commit d58acc9

Browse files
authored
Merge pull request #951 from apdavison/remove_hdf5io
Remove NeoHdf5IO
2 parents d4481b3 + cd19565 commit d58acc9

File tree

9 files changed

+11
-626
lines changed

9 files changed

+11
-626
lines changed

doc/source/developers_guide.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Requirements
4545
* Sphinx_ (for building documentation)
4646
* (optional) coverage_ >= 2.85 (for measuring test coverage)
4747
* (optional) scipy >= 0.12 (for MatlabIO)
48-
* (optional) h5py >= 2.5 (for KwikIO, NeoHdf5IO)
48+
* (optional) h5py >= 2.5 (for KwikIO)
4949
* (optional) nixio (for NixIO)
5050
* (optional) pillow (for TiffIO)
5151

doc/source/install.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Certain IO modules have additional dependencies. If these are not satisfied,
2323
Neo will still install but the IO module that uses them will fail on loading:
2424

2525
* scipy >= 1.0.0 for NeoMatlabIO
26-
* h5py >= 2.5 for Hdf5IO, KwikIO
26+
* h5py >= 2.5 for KwikIO
2727
* klusta for KwikIO
2828
* igor >= 0.2 for IgorIO
2929
* nixio >= 1.5 for NixIO
@@ -33,15 +33,14 @@ Neo will still install but the IO module that uses them will fail on loading:
3333
These dependencies can be installed by specifying a comma-separated list with the
3434
``pip install`` command::
3535

36-
$ pip install neo[hdf5io,tiffio]
36+
$ pip install neo[nixio,tiffio]
3737

3838
Or when installing a specific version of neo::
3939

40-
$ pip install neo[hdf5io,tiffio]==0.9.0
40+
$ pip install neo[nixio,tiffio]==0.9.0
4141

4242
These additional dependencies for IO modules are available::
4343

44-
* hdf5io
4544
* igorproio
4645
* kwikio
4746
* neomatlabio

doc/source/io.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ Logging
224224

225225
:mod:`neo` uses the standard Python :mod:`logging` module for logging.
226226
All :mod:`neo.io` classes have logging set up by default, although not all classes produce log messages.
227-
The logger name is the same as the full qualified class name, e.g. :class:`neo.io.hdf5io.NeoHdf5IO`.
227+
The logger name is the same as the full qualified class name, e.g. :class:`neo.io.nixio.NixIO`.
228228
By default, only log messages that are critically important for users are displayed, so users should not disable log messages unless they are sure they know what they are doing.
229229
However, if you wish to disable the messages, you can do so::
230230

@@ -264,22 +264,22 @@ This can also be done for individual IO classes::
264264

265265
>>> import logging
266266
>>>
267-
>>> logger = logging.getLogger('neo.io.hdf5io.NeoHdf5IO')
267+
>>> logger = logging.getLogger('neo.io.nixio.NixIO')
268268
>>> handler = logging.FileHandler('filename.log')
269269
>>> logger.addHandler(handler)
270270

271271
Individual IO classes can have their loggers disabled as well::
272272

273273
>>> import logging
274274
>>>
275-
>>> logger = logging.getLogger('neo.io.hdf5io.NeoHdf5IO')
275+
>>> logger = logging.getLogger('neo.io.nixio.NixIO')
276276
>>> logger.setLevel(100)
277277

278278
And more detailed logging messages can be enabled for individual IO classes::
279279

280280
>>> import logging
281281
>>>
282-
>>> logger = logging.getLogger('neo.io.hdf5io.NeoHdf5IO')
282+
>>> logger = logging.getLogger('neo.io.nixio.NixIO')
283283
>>> logger.setLevel(logging.INFO)
284284

285285
The default handler, which is used to print logs to the command line, is stored in :attr:`neo.logging_handler`.

doc/source/io_developers_guide.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Logging
7171
=======
7272

7373
All IO classes by default have logging using the standard :mod:`logging` module: already set up.
74-
The logger name is the same as the fully qualified class name, e.g. :class:`neo.io.hdf5io.NeoHdf5IO`.
74+
The logger name is the same as the fully qualified class name, e.g. :class:`neo.io.nixio.NixIO`.
7575
The :attr:`class.logger` attribute holds the logger for easy access.
7676

7777
There are generally 3 types of situations in which an IO class should use a logger

neo/io/__init__.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
* :attr:`KlustaKwikIO`
3535
* :attr:`KwikIO`
3636
* :attr:`MicromedIO`
37-
* :attr:`NeoHdf5IO`
3837
* :attr:`NeoMatlabIO`
3938
* :attr:`NestIO`
4039
* :attr:`NeuralynxIO`
@@ -141,10 +140,6 @@
141140
142141
.. autoattribute:: extensions
143142
144-
.. autoclass:: neo.io.NeoHdf5IO
145-
146-
.. autoattribute:: extensions
147-
148143
.. autoclass:: neo.io.NeoMatlabIO
149144
150145
.. autoattribute:: extensions
@@ -267,7 +262,6 @@
267262
from neo.io.kwikio import KwikIO
268263
from neo.io.mearecio import MEArecIO
269264
from neo.io.micromedio import MicromedIO
270-
from neo.io.hdf5io import NeoHdf5IO
271265
from neo.io.neomatlabio import NeoMatlabIO
272266
from neo.io.nestio import NestIO
273267
from neo.io.neuralynxio import NeuralynxIO
@@ -312,8 +306,7 @@
312306
KwikIO,
313307
MEArecIO,
314308
MicromedIO,
315-
NixIO, # place NixIO before NeoHdf5IO to make it the default for .h5 files
316-
NeoHdf5IO,
309+
NixIO, # place NixIO before other IOs that use HDF5 to make it the default for .h5 files
317310
NeoMatlabIO,
318311
NestIO,
319312
NeuralynxIO,

0 commit comments

Comments
 (0)