Commit 753e8b73 authored by Amir MOHAMMADI's avatar Amir MOHAMMADI

Merge branch 'conda' into 'master'

Conda

Closes #9

See merge request !12
parents ca607c81 e5380c05
Pipeline #18350 passed with stages
in 58 minutes and 59 seconds
......@@ -31,6 +31,11 @@ logger = bob.core.log.setup("bob.db.nist_sre12")
SQLITE_FILE = Interface().files()[0]
try:
basestring
except NameError:
basestring = str
class Database(bob.db.base.SQLiteDatabase):
"""The dataset class opens and maintains a connection opened to the Database.
......@@ -208,10 +213,9 @@ class Database(bob.db.base.SQLiteDatabase):
purposes, "purpose", self.purposes())
groups = self.check_parameters_for_validity(groups, "group", self.groups())
import six
if (model_ids is None):
model_ids = ()
elif (isinstance(model_ids, six.string_types)):
elif (isinstance(model_ids, basestring)):
model_ids = (model_ids,)
# Now query the database
......
......@@ -21,12 +21,15 @@ requirements:
host:
- python {{ python }}
- setuptools {{ setuptools }}
- six {{ six }}
- numpy {{ numpy }}
- scipy {{ scipy }}
- bob.extension
- bob.db.base
run:
- python
- setuptools
- six
- numpy
- scipy
test:
imports:
......
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