diff --git a/.travis.yml b/.travis.yml index 07dd2ac880833b95d0ab7b6f6da35623e70a0036..9e480d6e67bc09556195afdd5bb87df90c1629e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,9 +15,8 @@ matrix: before_install: - sudo add-apt-repository -y ppa:biometrics/bob - sudo apt-get update -qq -- sudo apt-get install -qq --force-yes libboost-all-dev libblitz1-dev libhdf5-serial-dev texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended +- sudo apt-get install -qq --force-yes libboost-all-dev libblitz1-dev libatlas-dev libatlas-base-dev liblapack-dev libhdf5-serial-dev libvl-dev texlive-latex-base texlive-latex-extra texlive-math-extra texlive-latex-recommended texlive-fonts-recommended - sudo apt-get install -qq --force-yes libjpeg8-dev libnetpbm10-dev libpng12-dev libtiff4-dev libgif-dev -- sudo apt-get install -qq --force-yes python-opencv libcv-dev libcvaux-dev libopencv-dev - pip install --upgrade pip - pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel sphinx nose numpy matplotlib coverage cpp-coveralls - pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel --pre -r requirements.txt coveralls diff --git a/MANIFEST.in b/MANIFEST.in index a369e1efe190a803a329b0c13544ea25b3e8c8a7..c856a9baccf06bd1fd2aebebc13138bfe14468f9 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,3 @@ include LICENSE README.rst bootstrap-buildout.py buildout.cfg requirements.txt version.txt recursive-include doc *.rst *.py -recursive-include bob *.cpp *.h *.dat *.xml *.jpg +recursive-include bob *.cpp *.h *.dat *.jpg diff --git a/bob/ip/flandmark/version.cpp b/bob/ip/flandmark/version.cpp index 254e0167c14620742e9f79e1c61a011e6f900f7a..14632602ce2a30731dd4e9e760507ad17c749cbb 100644 --- a/bob/ip/flandmark/version.cpp +++ b/bob/ip/flandmark/version.cpp @@ -11,6 +11,8 @@ #include <bob.blitz/cleanup.h> #include <bob.core/config.h> #include <bob.io.base/config.h> +#include <bob.sp/config.h> +#include <bob.ip.base/config.h> static PyObject* build_version_dictionary() { @@ -28,6 +30,8 @@ static PyObject* build_version_dictionary() { if (!dict_steal(retval, "bob.blitz", bob_blitz_version())) return 0; if (!dict_steal(retval, "bob.core", bob_core_version())) return 0; if (!dict_steal(retval, "bob.io.base", bob_io_base_version())) return 0; + if (!dict_steal(retval, "bob.sp", bob_sp_version())) return 0; + if (!dict_steal(retval, "bob.ip.base", bob_ip_base_version())) return 0; return Py_BuildValue("O", retval); } diff --git a/buildout.cfg b/buildout.cfg index 787dfca275f87401c8098603c3f7ac039807bd6a..5df9cc7639b2efd7cbb0d031b179c253984e9818 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -13,6 +13,9 @@ develop = src/bob.extension src/bob.core src/bob.io.base src/bob.io.image + src/bob.math + src/bob.sp + src/bob.ip.base src/bob.ip.color src/bob.ip.draw . @@ -27,6 +30,9 @@ bob.extension = git https://github.com/bioidiap/bob.extension 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.math = git https://github.com/bioidiap/bob.math +bob.sp = git https://github.com/bioidiap/bob.sp +bob.ip.base = git https://github.com/bioidiap/bob.ip.base ; For test and documentation generation only: bob.io.image = git https://github.com/bioidiap/bob.io.image bob.ip.color = git https://github.com/bioidiap/bob.ip.color diff --git a/requirements.txt b/requirements.txt index 2298a2348d4fff8615446b414ddb1e2a3e074bdd..038a176bf94020a88b789b3acbd9185f27c4e62f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,9 @@ bob.extension bob.blitz bob.core bob.io.base +bob.math +bob.sp +bob.ip.base # For tests bob.io.image