Skip to content
Snippets Groups Projects
Commit b894250b authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

Merge branch 'numpy-1.18' into 'master'

Remove usage of numpy.testing.decorators

Closes #132

See merge request !183
parents 33b527af 66954ff4
No related branches found
No related tags found
1 merge request!183Remove usage of numpy.testing.decorators
Pipeline #38004 passed
...@@ -4,8 +4,6 @@ ...@@ -4,8 +4,6 @@
import os import os
import abc import abc
import six import six
# Nose is detecting a function as a test function, while it is not...
from numpy.testing.decorators import setastest
import bob.db.base import bob.db.base
...@@ -64,6 +62,10 @@ class BioDatabase(six.with_metaclass(abc.ABCMeta, bob.db.base.FileDatabase)): ...@@ -64,6 +62,10 @@ class BioDatabase(six.with_metaclass(abc.ABCMeta, bob.db.base.FileDatabase)):
The arguments of the `Database` base class constructor. The arguments of the `Database` base class constructor.
""" """
# tell test runners (such as nose and pytest) that this class is not a test class
___test___ = False
def __init__( def __init__(
self, self,
name, name,
...@@ -436,7 +438,6 @@ class BioDatabase(six.with_metaclass(abc.ABCMeta, bob.db.base.FileDatabase)): ...@@ -436,7 +438,6 @@ class BioDatabase(six.with_metaclass(abc.ABCMeta, bob.db.base.FileDatabase)):
else: else:
return files return files
@setastest(False)
def test_files(self, groups=['dev']): def test_files(self, groups=['dev']):
"""test_files(groups = ['dev']) -> files """test_files(groups = ['dev']) -> files
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment