From 56d62ee1e5247fbaec5de2d0a087398ebd34ea68 Mon Sep 17 00:00:00 2001
From: Manuel Guenther <manuel.guenther@idiap.ch>
Date: Wed, 7 Jan 2015 12:06:12 +0100
Subject: [PATCH] Fixed bootstrap.py
---
.travis.yml | 5 ++---
MANIFEST.in | 2 +-
bob/ip/flandmark/__init__.py | 3 +++
bootstrap.py => bootstrap-buildout.py | 0
4 files changed, 6 insertions(+), 4 deletions(-)
rename bootstrap.py => bootstrap-buildout.py (100%)
diff --git a/.travis.yml b/.travis.yml
index 0c72656..cb24807 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,11 +20,10 @@ before_install:
- 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
- if [ -n "${NUMPYSPEC}" ]; then sudo apt-get install -qq --force-yes libatlas-dev libatlas-base-dev liblapack-dev gfortran; fi
-- if [ -n "${NUMPYSPEC}" ]; then pip install --upgrade pip setuptools; fi
- if [ -n "${NUMPYSPEC}" ]; then pip install --find-links http://wheels.astropy.org/ --find-links http://wheels2.astropy.org/ --use-wheel numpy$NUMPYSPEC; fi
-- pip install --find-links http://wheels.astropy.org/ --find-links http://wheels2.astropy.org/ --use-wheel matplotlib==1.3.0 sphinx nose==1.3.0 jinja2==2.6 cpp-coveralls pygments==1.6 setuptools==8.0
+- pip install --find-links http://wheels.astropy.org/ --find-links http://wheels2.astropy.org/ --use-wheel matplotlib==1.3.0 sphinx nose==1.3.0 jinja2==2.6 cpp-coveralls pygments==1.6
install:
-- python bootstrap.py
+- python bootstrap-buildout.py
- CFLAGS=-coverage ./bin/buildout
script:
- ./bin/python -c 'from bob.ip.flandmark import get_config; print(get_config())'
diff --git a/MANIFEST.in b/MANIFEST.in
index ebd5e97..a369e1e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
-include LICENSE README.rst bootstrap.py buildout.cfg requirements.txt version.txt
+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
diff --git a/bob/ip/flandmark/__init__.py b/bob/ip/flandmark/__init__.py
index 0b6f605..c632bd4 100644
--- a/bob/ip/flandmark/__init__.py
+++ b/bob/ip/flandmark/__init__.py
@@ -1,3 +1,6 @@
+# import Libraries of other lib packages
+import bob.io.base
+
from ._library import *
from . import version
from .version import module as __version__
diff --git a/bootstrap.py b/bootstrap-buildout.py
similarity index 100%
rename from bootstrap.py
rename to bootstrap-buildout.py
--
GitLab