Skip to content

Commit

Permalink
Based get_config on bob.extension
Browse files Browse the repository at this point in the history
  • Loading branch information
Manuel Guenther committed May 20, 2015
1 parent 552c422 commit 81eb5af
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 14 deletions.
15 changes: 1 addition & 14 deletions bob/ip/base/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,8 @@
def get_config():
"""Returns a string containing the configuration information.
"""
return bob.extension.get_config(__name__, version.externals, version.api)

import pkg_resources
from .version import externals

packages = pkg_resources.require(__name__)
this = packages[0]
deps = packages[1:]

retval = "%s: %s (%s)\n" % (this.key, this.version, this.location)
retval += " - c/c++ dependencies:\n"
for k in sorted(externals): retval += " - %s: %s\n" % (k, externals[k])
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('_')]
2 changes: 2 additions & 0 deletions bob/ip/base/version.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <bob.io.base/config.h>
#include <bob.sp/config.h>
#include <bob.math/config.h>
#include <bob.ip.base/config.h>

static int dict_set(PyObject* d, const char* key, const char* value) {
PyObject* v = Py_BuildValue("s", value);
Expand Down Expand Up @@ -190,6 +191,7 @@ static PyObject* create_module (void) {
auto m_ = make_safe(m); ///< protects against early returns

/* register version numbers and constants */
if (PyModule_AddIntConstant(m, "api", BOB_IP_BASE_API_VERSION) < 0) return 0;
if (PyModule_AddStringConstant(m, "module", BOB_EXT_MODULE_VERSION) < 0) return 0;

PyObject* externals = build_version_dictionary();
Expand Down

0 comments on commit 81eb5af

Please sign in to comment.