Commit f96cb793 authored by Tiago de Freitas Pereira's avatar Tiago de Freitas Pereira

Merge branch 'remove-matlab' into 'master'

Removed dependency with bob.io.matlab

Closes #7

See merge request !8
parents e86fc8be 7b272246
Pipeline #46452 skipped
...@@ -11,7 +11,6 @@ import scipy.io.wavfile ...@@ -11,7 +11,6 @@ import scipy.io.wavfile
import numpy import numpy
import bob.io.base import bob.io.base
import bob.io.matlab
from . import reader, writer from . import reader, writer
from bob.io.base.test_utils import datafile, temporary_filename from bob.io.base.test_utils import datafile, temporary_filename
...@@ -75,7 +74,7 @@ def test_compare_wav_matlab(): ...@@ -75,7 +74,7 @@ def test_compare_wav_matlab():
# reading the .mat file that contains the data generated by the Matlab # reading the .mat file that contains the data generated by the Matlab
# wavread function # wavread function
mat_data = bob.io.base.load(F('sample3.mat')) mat_data = bob.io.base.load(F('sample3_matlab.hdf5'))
assert numpy.array_equal(data, mat_data), '%r != %r' % (data, mat_data) assert numpy.array_equal(data, mat_data), '%r != %r' % (data, mat_data)
......
...@@ -29,7 +29,6 @@ requirements: ...@@ -29,7 +29,6 @@ requirements:
- bob.blitz - bob.blitz
- bob.core - bob.core
- bob.io.base - bob.io.base
- bob.io.matlab
- libblitz {{ libblitz }} - libblitz {{ libblitz }}
- boost {{ boost }} - boost {{ boost }}
- sox {{ sox }} - sox {{ sox }}
......
...@@ -12,7 +12,6 @@ develop = src/bob.extension ...@@ -12,7 +12,6 @@ develop = src/bob.extension
src/bob.blitz src/bob.blitz
src/bob.core src/bob.core
src/bob.io.base src/bob.io.base
src/bob.io.matlab
. .
; options for bob.buildout extension ; options for bob.buildout extension
...@@ -25,7 +24,6 @@ bob.extension = git https://gitlab.idiap.ch/bob/bob.extension ...@@ -25,7 +24,6 @@ bob.extension = git https://gitlab.idiap.ch/bob/bob.extension
bob.blitz = git https://gitlab.idiap.ch/bob/bob.blitz bob.blitz = git https://gitlab.idiap.ch/bob/bob.blitz
bob.core = git https://gitlab.idiap.ch/bob/bob.core bob.core = git https://gitlab.idiap.ch/bob/bob.core
bob.io.base = git https://gitlab.idiap.ch/bob/bob.io.base bob.io.base = git https://gitlab.idiap.ch/bob/bob.io.base
bob.io.matlab = git https://gitlab.idiap.ch/bob/bob.io.matlab
[scripts] [scripts]
recipe = bob.buildout:scripts recipe = bob.buildout:scripts
...@@ -3,5 +3,4 @@ scipy ...@@ -3,5 +3,4 @@ scipy
bob.extension>2.0.4 bob.extension>2.0.4
bob.blitz bob.blitz
bob.core bob.core
bob.io.base bob.io.base
bob.io.matlab \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment