Commit 9a993948 authored by Manuel Günther's avatar Manuel Günther

Based get_config on bob.extension

parent d14dec98
...@@ -13,21 +13,8 @@ from .version import module as __version__ ...@@ -13,21 +13,8 @@ from .version import module as __version__
def get_config(): def get_config():
"""Returns a string containing the configuration information. """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 # gets sphinx autodoc done right - don't remove it
__all__ = [_ for _ in dir() if not _.startswith('_')] __all__ = [_ for _ in dir() if not _.startswith('_')]
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <bob.blitz/cleanup.h> #include <bob.blitz/cleanup.h>
#include <bob.core/config.h> #include <bob.core/config.h>
#include <bob.sp/config.h> #include <bob.sp/config.h>
#include <bob.ap/config.h>
static int dict_steal(PyObject* d, const char* key, PyObject* value) { static int dict_steal(PyObject* d, const char* key, PyObject* value) {
if (!value) return 0; if (!value) return 0;
...@@ -155,8 +156,8 @@ static PyObject* create_module (void) { ...@@ -155,8 +156,8 @@ static PyObject* create_module (void) {
auto m_ = make_safe(m); ///< protects against early returns auto m_ = make_safe(m); ///< protects against early returns
/* register version numbers and constants */ /* register version numbers and constants */
if (PyModule_AddStringConstant(m, "module", BOB_EXT_MODULE_VERSION) < 0) if (PyModule_AddStringConstant(m, "module", BOB_EXT_MODULE_VERSION) < 0) return 0;
return 0; if (PyModule_AddIntConstant(m, "api", BOB_AP_API_VERSION) < 0) return 0;
PyObject* externals = build_version_dictionary(); PyObject* externals = build_version_dictionary();
if (!externals) return 0; if (!externals) return 0;
......
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