From 115d420f9ace6134ea671405dcb5f32bef8190c7 Mon Sep 17 00:00:00 2001 From: Pedro TOME <pedro.tome@idiap.ch> Date: Mon, 9 Mar 2015 13:39:10 +0100 Subject: [PATCH] fixed travis error --- bob/fingervein/__init__.py | 21 +++++++++++++++++++++ buildout.cfg | 11 ++++++++++- setup.py | 5 ++--- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/bob/fingervein/__init__.py b/bob/fingervein/__init__.py index 4ae6cf7..a60a22b 100644 --- a/bob/fingervein/__init__.py +++ b/bob/fingervein/__init__.py @@ -10,3 +10,24 @@ import script #import utils +def get_config(): + """Returns a string containing the configuration information. + """ + + import pkg_resources + + packages = pkg_resources.require(__name__) + this = packages[0] + deps = packages[1:] + + retval = "%s: %s (%s)\n" % (this.key, this.version, this.location) + retval += " - python dependencies:\n" + for d in deps: retval += " - %s: %s (%s)\n" % (d.key, d.version, d.location) + + return retval.strip() + + +# gets sphinx autodoc done right - don't remove it +__all__ = [_ for _ in dir() if not _.startswith('_')] + + diff --git a/buildout.cfg b/buildout.cfg index dac6942..af24d0d 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -28,9 +28,18 @@ verbose = true newest = false [sources] -bob.db.vera = git https://github.com/bioidiap/bob.db.vera.git facereclib = git https://github.com/idiap/facereclib.git +bob.db.vera = git https://github.com/bioidiap/bob.db.vera.git bob.db.utfvp = git https://github.com/bioidiap/bob.db.utfvp.git +bob.blitz = git https://github.com/bioidiap/bob.blitz +bob.core = git https://github.com/bioidiap/bob.core +bob.io.base = git https://github.com/bioidiap/bob.io.base +bob.io.image = git https://github.com/bioidiap/bob.io.image +bob.ip.base = git https://github.com/bioidiap/bob.ip.base +bob.sp = git https://github.com/bioidiap/bob.sp +bob.io.matlab = git https://github.com/bioidiap/bob.io.matlab + + [scripts] recipe = bob.buildout:scripts diff --git a/setup.py b/setup.py index 0b1a0f1..4725165 100644 --- a/setup.py +++ b/setup.py @@ -69,13 +69,12 @@ setup( install_requires=[ 'setuptools', 'bob.io.base', + 'bob.io.image', 'bob.core', 'bob.ip.base', 'bob.sp', 'bob.io.matlab', - 'facereclib', - 'bob.db.vera', - 'bob.db.utfvp', + 'facereclib', ], -- GitLab