From a41e6bda3ca152b7913c785767d90249f8fa41eb Mon Sep 17 00:00:00 2001
From: Manuel Guenther <manuel.guenther@idiap.ch>
Date: Fri, 19 Jun 2015 11:08:38 +0200
Subject: [PATCH] Trial to get opencv running on travis
---
.travis.yml | 3 +--
doc/conf.py | 10 +++++-----
setup.py | 2 +-
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 186ee7d..b7f292b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ before_install:
- sudo apt-get install -qq --force-yes libatlas-dev libatlas-base-dev liblapack-dev gfortran
- sudo apt-get install -qq --force-yes python-opencv libcv-dev libcvaux-dev libopencv-dev
- sudo apt-get install -qq --force-yes python-numpy python-scipy python-matplotlib
-- pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel sphinx nose numpy scipy matplotlib coverage
+- pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel pillow sphinx nose numpy scipy matplotlib coverage
- pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel --pre -r requirements.txt coveralls
install:
- python bootstrap-buildout.py
@@ -33,7 +33,6 @@ script:
- ./bin/sphinx-build -b html doc sphinx
after_success:
- coveralls
-- coveralls
- wget https://raw.githubusercontent.com/bioidiap/bob.extension/master/scripts/upload-{sphinx,wheel}.sh
- chmod a+x upload-sphinx.sh upload-wheel.sh
- ./upload-sphinx.sh
diff --git a/doc/conf.py b/doc/conf.py
index 67a89df..d52a8b3 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -59,12 +59,12 @@ source_suffix = '.rst'
master_doc = 'index'
# General information about the project.
-project = u'Wrapper classes to use the CSU tools with the FaceRecLib'
+project = u'Wrapper classes to use the CSU tools with bob.bio'
import time
copyright = u'%s, Idiap Research Institute' % time.strftime('%Y')
# Grab the setup entry
-distribution = pkg_resources.require('xfacereclib.extension.CSU')[0]
+distribution = pkg_resources.require('bob.bio.csu')[0]
# The short X.Y version.
version = distribution.version
@@ -184,7 +184,7 @@ html_favicon = ''
#html_file_suffix = None
# Output file base name for HTML help builder.
-htmlhelp_basename = 'xfacereclib_extension_csu_doc'
+htmlhelp_basename = 'bob_bio_csu_doc'
# -- Options for LaTeX output --------------------------------------------------
@@ -233,7 +233,7 @@ rst_epilog = ''
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
- ('index', 'facereclib', u'FaceRecLib Documentation', [u'Idiap Research Institute'], 1)
+ ('index', 'bob.bio.csu', u'Documentation', [u'Idiap Research Institute'], 1)
]
# Default processing flags for sphinx
@@ -243,7 +243,7 @@ autodoc_default_flags = ['members', 'undoc-members', 'inherited-members', 'show-
# For inter-documentation mapping:
from bob.extension.utils import link_documentation
-intersphinx_mapping = link_documentation(['python', 'bob.io.base', 'facereclib'])
+intersphinx_mapping = link_documentation(['python', 'bob.io.base', 'bob.bio.base'])
def setup(app):
diff --git a/setup.py b/setup.py
index 492be75..c9b5c9f 100644
--- a/setup.py
+++ b/setup.py
@@ -70,7 +70,7 @@ setup(
# on the current system will be installed locally and only visible to the
# scripts of this package. Don't worry - You won't need administrative
# privileges when using buildout.
- install_requires = install_requires,
+ install_requires = ['setuptools'],
# Your project should be called something like 'bob.<foo>' or
# 'bob.<foo>.<bar>'. To implement this correctly and still get all your
--
GitLab