From 124e29800380ef9ff9e3d38cf1393a413c8b5b44 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Mon, 15 Aug 2016 10:08:23 +0200
Subject: [PATCH] Standardise
---
.gitlab-ci.yml | 275 ++++++++++++++++++++++++++++++++++++++++++
.travis.yml | 36 ------
LICENSE | 23 ++--
MANIFEST.in | 2 +-
README.rst | 44 ++++---
bootstrap-buildout.py | 51 +++++---
buildout.cfg | 24 +---
develop.cfg | 29 +++++
doc/conf.py | 170 ++++++++++++--------------
doc/img/favicon.ico | Bin 0 -> 4286 bytes
doc/img/logo.png | Bin 0 -> 6266 bytes
setup.py | 6 +-
12 files changed, 462 insertions(+), 198 deletions(-)
create mode 100644 .gitlab-ci.yml
delete mode 100644 .travis.yml
create mode 100644 develop.cfg
create mode 100644 doc/img/favicon.ico
create mode 100644 doc/img/logo.png
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..293eb7b
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,275 @@
+# This build file is defined in two parts: 1) a generic set of instructions you
+# probably **don't** need to change and 2) a part you may have to tune to your
+# project. It heavily uses template features from YAML to help you in only
+# changing a minimal part of it and avoid code duplication to a maximum while
+# still providing a nice pipeline display on your package.
+
+
+# 1) Generic instructions (only change if you know what you're doing)
+# -------------------------------------------------------------------
+
+# Definition of our build pipeline
+stages:
+ - build
+ - test
+ - docs
+ - wheels
+
+
+# Global variables
+variables:
+ CONDA_PREFIX: env
+
+
+# Template for the build stage
+# Needs to run on all supported architectures, platforms and python versions
+.build_template: &build_job
+ stage: build
+ before_script:
+ - git clean -ffdx
+ - curl --silent https://gitlab.idiap.ch/bob/bob/snippets/7/raw | tr -d '\r' > bootstrap-conda.sh
+ - chmod 755 ./bootstrap-conda.sh
+ - ./bootstrap-conda.sh ${CONDA_FOLDER} ${PYTHON_VER} ${CONDA_PREFIX}
+ variables: &build_variables
+ BOB_DOCUMENTATION_SERVER: "http://www.idiap.ch/software/bob/docs/latest/bob/%s/master/"
+ script:
+ - BOB_PREFIX_PATH=${CONDA_FOLDER}/envs/`cat ${CONDA_FOLDER}/envs/latest-devel-${PYTHON_VER}.txt` ./bin/buildout
+ - ./bin/sphinx-build doc sphinx
+ - ./bin/python setup.py bdist_wheel
+ after_script:
+ - rm -rf ${CONDA_PREFIX}
+ artifacts:
+ expire_in: 1 day
+ paths:
+ - bootstrap-conda.sh
+ - dist/
+ - sphinx/
+
+
+# Template for building on a Linux machine
+.build_linux_template: &linux_build_job
+ <<: *build_job
+ variables: &linux_build_variables
+ <<: *build_variables
+ CONDA_FOLDER: "/local/conda"
+ CFLAGS: "-D_GLIBCXX_USE_CXX11_ABI=0 -coverage"
+ CXXFLAGS: "-D_GLIBCXX_USE_CXX11_ABI=0 -coverage"
+
+
+# Template for building on a Mac OSX machine
+.build_mac_template: &macosx_build_job
+ <<: *build_job
+ variables: &macosx_build_variables
+ <<: *build_variables
+ CONDA_FOLDER: "/opt/conda"
+ MACOSX_DEPLOYMENT_TARGET: "10.9"
+ CFLAGS: "-pthread -coverage"
+ CXXFLAGS: "-pthread -coverage"
+ LDFLAGS: "-lpthread"
+
+
+# Template for the test stage - re-install from uploaded wheels
+# Needs to run on all supported architectures, platforms and python versions
+.test_template: &test_job
+ stage: test
+ before_script:
+ - ./bootstrap-conda.sh ${CONDA_FOLDER} ${PYTHON_VER} ${CONDA_PREFIX}
+ - source ${CONDA_FOLDER}/bin/activate ${CONDA_PREFIX}
+ - pip install --use-wheel --no-index --pre dist/*.whl
+ script:
+ - cd ${CONDA_PREFIX}
+ - python -c "from ${CI_PROJECT_NAME} import get_config; print(get_config())"
+ - coverage run --source=${CI_PROJECT_NAME} ./bin/nosetests -sv ${CI_PROJECT_NAME}
+ - coverage report
+ - sphinx-build -b doctest ../doc ../sphinx
+ after_script:
+ - rm -rf ${CONDA_PREFIX}
+
+
+# Template for the wheel uploading stage
+# Needs to run against one combination of python 2.x and 3.x if it is a python
+# only package, otherwise, needs to run in both pythons to all supported
+# architectures (Linux and Mac OSX 64-bit)
+.wheels_template: &wheels_job
+ stage: wheels
+ only:
+ - master
+ - tags
+ before_script:
+ - curl --silent https://gitlab.idiap.ch/bob/bob/snippets/8/raw | tr -d '\r' > upload-wheel.sh
+ - chmod 755 upload-wheel.sh
+ script:
+ - ./upload-wheel.sh
+
+
+# Template for (latest) documentation upload stage
+# Only one real job needs to do this
+.docs_template: &docs_job
+ stage: docs
+ only:
+ - master
+ before_script:
+ - curl --silent https://gitlab.idiap.ch/bob/bob/snippets/9/raw | tr -d '\r' > upload-sphinx.sh
+ - chmod 755 upload-sphinx.sh
+ script:
+ - ./upload-sphinx.sh
+
+
+# 2) Package specific instructions (you may tune this if needed)
+# --------------------------------------------------------------
+
+# Linux + Python 2.7: Builds and tests
+build_linux_27:
+ <<: *linux_build_job
+ variables: &linux_27_build_variables
+ <<: *linux_build_variables
+ PYTHON_VER: "2.7"
+ tags:
+ - conda-linux
+
+test_linux_27:
+ <<: *test_job
+ variables: *linux_27_build_variables
+ dependencies:
+ - build_linux_27
+ tags:
+ - conda-linux
+
+wheels_linux_27:
+ <<: *wheels_job
+ dependencies:
+ - build_linux_27
+ tags:
+ - conda-linux
+
+
+# Linux + Python 3.4: Builds and tests
+build_linux_34:
+ <<: *linux_build_job
+ variables: &linux_34_build_variables
+ <<: *linux_build_variables
+ PYTHON_VER: "3.4"
+ tags:
+ - conda-linux
+
+test_linux_34:
+ <<: *test_job
+ variables: *linux_34_build_variables
+ dependencies:
+ - build_linux_34
+ tags:
+ - conda-linux
+
+wheels_linux_34:
+ <<: *wheels_job
+ dependencies:
+ - build_linux_34
+ tags:
+ - conda-linux
+
+
+# Linux + Python 3.5: Builds and tests
+build_linux_35:
+ <<: *linux_build_job
+ variables: &linux_35_build_variables
+ <<: *linux_build_variables
+ PYTHON_VER: "3.5"
+ tags:
+ - conda-linux
+
+test_linux_35:
+ <<: *test_job
+ variables: *linux_35_build_variables
+ dependencies:
+ - build_linux_35
+ tags:
+ - conda-linux
+
+wheels_linux_35:
+ <<: *wheels_job
+ dependencies:
+ - build_linux_35
+ tags:
+ - conda-linux
+
+docs_linux_35:
+ <<: *docs_job
+ dependencies:
+ - build_linux_35
+ tags:
+ - conda-linux
+
+
+# Mac OSX + Python 2.7: Builds, tests and uploads the wheel
+build_macosx_27:
+ <<: *macosx_build_job
+ variables: &macosx_27_build_variables
+ <<: *macosx_build_variables
+ PYTHON_VER: "2.7"
+ tags:
+ - conda-macosx
+
+test_macosx_27:
+ <<: *test_job
+ variables: *macosx_27_build_variables
+ dependencies:
+ - build_macosx_27
+ tags:
+ - conda-macosx
+
+wheels_macosx_27:
+ <<: *wheels_job
+ dependencies:
+ - build_macosx_27
+ tags:
+ - conda-macosx
+
+
+# Mac OSX + Python 3.4: Builds and tests
+build_macosx_34:
+ <<: *macosx_build_job
+ variables: &macosx_34_build_variables
+ <<: *macosx_build_variables
+ PYTHON_VER: "3.4"
+ tags:
+ - conda-macosx
+
+test_macosx_34:
+ <<: *test_job
+ variables: *macosx_34_build_variables
+ dependencies:
+ - build_macosx_34
+ tags:
+ - conda-macosx
+
+wheels_macosx_34:
+ <<: *wheels_job
+ dependencies:
+ - build_macosx_34
+ tags:
+ - conda-macosx
+
+
+# Mac OSX + Python 3.5: Builds, tests, uploads the wheel and the latest docs
+build_macosx_35:
+ <<: *macosx_build_job
+ variables: &macosx_35_build_variables
+ <<: *macosx_build_variables
+ PYTHON_VER: "3.5"
+ tags:
+ - conda-macosx
+
+test_macosx_35:
+ <<: *test_job
+ variables: *macosx_35_build_variables
+ dependencies:
+ - build_macosx_35
+ tags:
+ - conda-macosx
+
+wheels_macosx_35:
+ <<: *wheels_job
+ dependencies:
+ - build_macosx_35
+ tags:
+ - conda-macosx
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 0a217d5..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-language: python
-env:
- global:
- - secure: IrUGhi6wLNjZTcVmyvlUW4S8gvbsjd1KGTONBBFJLe2SsczfuTIp0UrwPYAu3O2mEh04ivdgpjy/sKKH+atd+mx1WGYpyc7telS+6pzzGhW+utLnknETJYN0diK1Th62GFDhbwtvjoLcn2VMT22Agh94Ob4JvD0tzlDcZpEOOEs=
- - secure: YV9GTtTddGgvvaW/o0esSY5ov8qIZJI77+mapAR138JrUi4opSXPzVk9XzHXCRR6K1IPBJ/PZfF+optX6SGWiD634A8T1vvrt8X/RrvV0Lbu3V33Qxi7UQgVRTGbR61RlzSEe1WjVXUKdZGMz+O07hwzS/MVkY88K48h/3Gtej8=
- - BOB_UPLOAD_WHEEL=1
-matrix:
- include:
- - python: 2.7
- env:
- - BOB_DOCUMENTATION_SERVER=https://www.idiap.ch/software/bob/docs/latest/bioidiap/%s/master
- - python: 3.3
- - python: 3.4
- - python: 3.5
-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 libatlas-dev libatlas-base-dev liblapack-dev libhdf5-serial-dev texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended gfortran
-- pip install --upgrade pip
-- pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel 'sphinx<1.3.4' nose numpy scipy matplotlib coverage cpp-coveralls
-- pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel --pre -r requirements.txt coveralls
-install:
-- python bootstrap-buildout.py
-- CPPFLAGS=--coverage LDFLAGS=--coverage ./bin/buildout buildout:debug=false buildout:develop=. buildout:extensions=bob.buildout buildout:auto-checkout= buildout:newest=false
-script:
-- ./bin/python -c 'import pkg_resources; from bob.learn.boosting import get_config; print(get_config())'
-- ./bin/coverage run --source=bob.learn.boosting ./bin/nosetests -sv
-- ./bin/sphinx-build -b doctest doc sphinx
-- ./bin/sphinx-build -b html doc sphinx
-after_success:
-- cpp-coveralls --build-root=`pwd` --exclude=src --exclude-pattern=".*Compiler.*" --dump=cpp_cov.json
-- coveralls --merge=cpp_cov.json
-- 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
-- ./upload-wheel.sh
diff --git a/LICENSE b/LICENSE
index 2b54dbe..bd46ce1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,16 +1,19 @@
-Copyright (c) 2014, Manuel Guenther - Idiap Research Institute
-All rights reserved.
+Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+Written by Andre Anjos <andre.anjos@idiap.ch>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
-Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer. Redistributions in binary
-form must reproduce the above copyright notice, this list of conditions and the
-following disclaimer in the documentation and/or other materials provided with
-the distribution. Neither the name of the Idiap Research Institute nor the
-names of its contributors may be used to endorse or promote products derived
-from this software without specific prior written permission.
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -21,4 +24,4 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/MANIFEST.in b/MANIFEST.in
index b5c2e30..e6e9440 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
-include LICENSE README.rst bootstrap-buildout.py buildout.cfg requirements.txt version.txt
+include LICENSE README.rst bootstrap-buildout.py buildout.cfg develop.cfg requirements.txt version.txt
recursive-include doc *.py *.rst
recursive-include bob/learn/boosting *.h *.cpp
recursive-include bob/learn/boosting/data *.hdf5 *.tar.bz2
diff --git a/README.rst b/README.rst
index a8e166d..a79547e 100644
--- a/README.rst
+++ b/README.rst
@@ -1,37 +1,47 @@
.. vim: set fileencoding=utf-8 :
-.. Manuel Guenther <manuel.guenther@idiap.ch>
-.. Thu Sep 4 10:53:22 CEST 2014
+.. Mon 15 Aug 2016 10:05:43 CEST
.. image:: http://img.shields.io/badge/docs-stable-yellow.png
:target: http://pythonhosted.org/bob.learn.boosting/index.html
.. image:: http://img.shields.io/badge/docs-latest-orange.png
:target: https://www.idiap.ch/software/bob/docs/latest/bioidiap/bob.learn.boosting/master/index.html
-.. image:: https://travis-ci.org/bioidiap/bob.learn.boosting.svg?branch=master
- :target: https://travis-ci.org/bioidiap/bob.learn.boosting?branch=master
-.. image:: https://coveralls.io/repos/bioidiap/bob.learn.boosting/badge.svg?branch=master
- :target: https://coveralls.io/r/bioidiap/bob.learn.boosting?branch=master
-.. image:: https://img.shields.io/badge/github-master-0000c0.png
- :target: https://github.com/bioidiap/bob.learn.boosting/tree/master
+.. image:: https://gitlab.idiap.ch/bob/bob.learn.boosting/badges/master/build.svg
+ :target: https://gitlab.idiap.ch/bob/bob.learn.boosting/commits/master
+.. image:: https://img.shields.io/badge/gitlab-project-0000c0.svg
+ :target: https://gitlab.idiap.ch/bob/bob.learn.boosting
.. image:: http://img.shields.io/pypi/v/bob.learn.boosting.png
:target: https://pypi.python.org/pypi/bob.learn.boosting
.. image:: http://img.shields.io/pypi/dm/bob.learn.boosting.png
:target: https://pypi.python.org/pypi/bob.learn.boosting
+
=============================
- Bob's extension to boosting
+ Boosted Learning Algorithms
=============================
-The package implements a generalized boosting framework, which incorporates different boosting approaches.
+This package is part of the signal-processing and machine learning toolbox
+Bob_. It implements a generalized boosting framework, which incorporates
+different boosting approaches.
+
Installation
------------
-To install this package -- alone or together with other `Packages of Bob <https://github.com/idiap/bob/wiki/Packages>`_ -- please read the `Installation Instructions <https://github.com/idiap/bob/wiki/Installation>`_.
-For Bob_ to be able to work properly, some dependent packages are required to be installed.
-Please make sure that you have read the `Dependencies <https://github.com/idiap/bob/wiki/Dependencies>`_ for your operating system.
-Documentation
--------------
-For further documentation on this package, please read the `Stable Version <http://pythonhosted.org/bob.learn.boosting/index.html>`_ or the `Latest Version <https://www.idiap.ch/software/bob/docs/latest/bioidiap/bob.learn.boosting/master/index.html>`_ of the documentation.
-For a list of tutorials on this or the other packages ob Bob_, or information on submitting issues, asking questions and starting discussions, please visit its website.
+Follow our `installation`_ instructions. Then, using the Python interpreter
+provided by the distribution, bootstrap and buildout this package::
+
+ $ python bootstrap-buildout.py
+ $ ./bin/buildout
+
+
+Contact
+-------
+
+For questions or reporting issues to this software package, contact our
+development `mailing list`_.
+
+.. Place your references here:
.. _bob: https://www.idiap.ch/software/bob
+.. _installation: https://gitlab.idiap.ch/bob/bob/wikis/Installation
+.. _mailing list: https://groups.google.com/forum/?fromgroups#!forum/bob-devel
diff --git a/bootstrap-buildout.py b/bootstrap-buildout.py
index a629566..a459921 100644
--- a/bootstrap-buildout.py
+++ b/bootstrap-buildout.py
@@ -25,7 +25,10 @@ import tempfile
from optparse import OptionParser
-tmpeggs = tempfile.mkdtemp()
+__version__ = '2015-07-01'
+# See zc.buildout's changelog if this version is up to date.
+
+tmpeggs = tempfile.mkdtemp(prefix='bootstrap-')
usage = '''\
[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
@@ -40,8 +43,9 @@ this script from going over the network.
'''
parser = OptionParser(usage=usage)
-parser.add_option("-v", "--version", help="use a specific zc.buildout version")
-
+parser.add_option("--version",
+ action="store_true", default=False,
+ help=("Return bootstrap.py version."))
parser.add_option("-t", "--accept-buildout-test-releases",
dest='accept_buildout_test_releases',
action="store_true", default=False,
@@ -59,25 +63,33 @@ parser.add_option("-f", "--find-links",
parser.add_option("--allow-site-packages",
action="store_true", default=False,
help=("Let bootstrap.py use existing site packages"))
+parser.add_option("--buildout-version",
+ help="Use a specific zc.buildout version")
parser.add_option("--setuptools-version",
- help="use a specific setuptools version")
-
+ help="Use a specific setuptools version")
+parser.add_option("--setuptools-to-dir",
+ help=("Allow for re-use of existing directory of "
+ "setuptools versions"))
options, args = parser.parse_args()
+if options.version:
+ print("bootstrap.py version %s" % __version__)
+ sys.exit(0)
+
######################################################################
# load/install setuptools
try:
- if options.allow_site_packages:
- import setuptools
- import pkg_resources
from urllib.request import urlopen
except ImportError:
from urllib2 import urlopen
ez = {}
-exec(urlopen('https://bootstrap.pypa.io/ez_setup.py').read(), ez)
+if os.path.exists('ez_setup.py'):
+ exec(open('ez_setup.py').read(), ez)
+else:
+ exec(urlopen('https://bootstrap.pypa.io/ez_setup.py').read(), ez)
if not options.allow_site_packages:
# ez_setup imports site, which adds site packages
@@ -88,12 +100,19 @@ if not options.allow_site_packages:
# We can't remove these reliably
if hasattr(site, 'getsitepackages'):
for sitepackage_path in site.getsitepackages():
- sys.path[:] = [x for x in sys.path if sitepackage_path not in x]
+ # Strip all site-packages directories from sys.path that
+ # are not sys.prefix; this is because on Windows
+ # sys.prefix is a site-package directory.
+ if sitepackage_path != sys.prefix:
+ sys.path[:] = [x for x in sys.path
+ if sitepackage_path not in x]
setup_args = dict(to_dir=tmpeggs, download_delay=0)
if options.setuptools_version is not None:
setup_args['version'] = options.setuptools_version
+if options.setuptools_to_dir is not None:
+ setup_args['to_dir'] = options.setuptools_to_dir
ez['use_setuptools'](**setup_args)
import setuptools
@@ -110,7 +129,12 @@ for path in sys.path:
ws = pkg_resources.working_set
+setuptools_path = ws.find(
+ pkg_resources.Requirement.parse('setuptools')).location
+
+# Fix sys.path here as easy_install.pth added before PYTHONPATH
cmd = [sys.executable, '-c',
+ 'import sys; sys.path[0:0] = [%r]; ' % setuptools_path +
'from setuptools.command.easy_install import main; main()',
'-mZqNxd', tmpeggs]
@@ -123,11 +147,8 @@ find_links = os.environ.get(
if find_links:
cmd.extend(['-f', find_links])
-setuptools_path = ws.find(
- pkg_resources.Requirement.parse('setuptools')).location
-
requirement = 'zc.buildout'
-version = options.version
+version = options.buildout_version
if version is None and not options.accept_buildout_test_releases:
# Figure out the most recent final version of zc.buildout.
import setuptools.package_index
@@ -167,7 +188,7 @@ if version:
cmd.append(requirement)
import subprocess
-if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=setuptools_path)) != 0:
+if subprocess.call(cmd) != 0:
raise Exception(
"Failed to execute command:\n%s" % repr(cmd)[1:-1])
diff --git a/buildout.cfg b/buildout.cfg
index d836ed1..62efab3 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -1,29 +1,13 @@
; vim: set fileencoding=utf-8 :
-; Manuel Guenther <manuel.guenther@idiap.ch>
-; Wed Aug 27 14:46:14 CEST 2014
+; Mon 15 Aug 2016 10:05:42 CEST
[buildout]
parts = scripts
+develop = .
eggs = bob.learn.boosting
extensions = bob.buildout
- mr.developer
-auto-checkout = *
-develop = src/bob.extension
- src/bob.blitz
- src/bob.core
- src/bob.io.base
- .
-
-; options for bob.buildout extension
-debug = true
-verbose = true
newest = false
-
-[sources]
-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
+verbose = true
[scripts]
-recipe = bob.buildout:scripts
+recipe = bob.buildout:scripts
\ No newline at end of file
diff --git a/develop.cfg b/develop.cfg
new file mode 100644
index 0000000..720f3e1
--- /dev/null
+++ b/develop.cfg
@@ -0,0 +1,29 @@
+; vim: set fileencoding=utf-8 :
+; Manuel Guenther <manuel.guenther@idiap.ch>
+; Wed Aug 27 14:46:14 CEST 2014
+
+[buildout]
+parts = scripts
+eggs = bob.learn.boosting
+extensions = bob.buildout
+ mr.developer
+auto-checkout = *
+develop = src/bob.extension
+ src/bob.blitz
+ src/bob.core
+ src/bob.io.base
+ .
+
+; options for bob.buildout extension
+debug = true
+verbose = true
+newest = false
+
+[sources]
+bob.extension = git https://gitlab.idiap.ch/bob/bob.extension
+bob.blitz = git https://gitlab.idiap.ch/bob/bob.blitz
+bob.core = git https://gitlab.idiap.ch/bob/bob.core
+bob.io.base = git https://gitlab.idiap.ch/bob/bob.io.base
+
+[scripts]
+recipe = bob.buildout:scripts
diff --git a/doc/conf.py b/doc/conf.py
index ec8a5e3..d0e4077 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -1,62 +1,53 @@
#!/usr/bin/env python
# vim: set fileencoding=utf-8 :
-# Andre Anjos <andre.anjos@idiap.ch>
-# Mon 13 Aug 2012 12:38:15 CEST
-#
-# Copyright (C) 2011-2012 Idiap Research Institute, Martigny, Switzerland
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import sys, os
+import os
+import sys
+import glob
import pkg_resources
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
# -- General configuration -----------------------------------------------------
# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+needs_sphinx = '1.3'
# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = [
- 'sphinx.ext.todo',
- 'sphinx.ext.coverage',
- 'sphinx.ext.pngmath',
- 'sphinx.ext.ifconfig',
- 'sphinx.ext.autodoc',
- 'sphinx.ext.autosummary',
- 'sphinx.ext.doctest',
- 'sphinx.ext.intersphinx',
- ]
+ 'sphinx.ext.todo',
+ 'sphinx.ext.coverage',
+ 'sphinx.ext.ifconfig',
+ 'sphinx.ext.autodoc',
+ 'sphinx.ext.autosummary',
+ 'sphinx.ext.doctest',
+ 'sphinx.ext.graphviz',
+ 'sphinx.ext.intersphinx',
+ 'sphinx.ext.napoleon',
+ 'sphinx.ext.viewcode',
+ ]
-# The viewcode extension appeared only on Sphinx >= 1.0.0
import sphinx
-if sphinx.__version__ >= "1.0":
- extensions.append('sphinx.ext.viewcode')
+if sphinx.__version__ >= "1.4.1":
+ extensions.append('sphinx.ext.imgmath')
+else:
+ extensions.append('sphinx.ext.pngmath')
# Always includes todos
todo_include_todos = True
+# Generates auto-summary automatically
+autosummary_generate = True
+
+# Create numbers on figures with captions
+numfig = True
+
# If we are on OSX, the 'dvipng' path maybe different
dvipng_osx = '/opt/local/libexec/texlive/binaries/dvipng'
if os.path.exists(dvipng_osx): pngmath_dvipng = dvipng_osx
# Add any paths that contain templates here, relative to this directory.
-#templates_path = ['_templates']
+templates_path = ['_templates']
# The suffix of source filenames.
source_suffix = '.rst'
@@ -68,11 +59,12 @@ source_suffix = '.rst'
master_doc = 'index'
# General information about the project.
-project = u'Boosting extension for Bob'
+project = u'bob.learn.boosting'
import time
copyright = u'%s, Idiap Research Institute' % time.strftime('%Y')
-distribution = pkg_resources.require('bob.learn.boosting')[0]
+# Grab the setup entry
+distribution = pkg_resources.require(project)[0]
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
@@ -95,7 +87,7 @@ release = distribution.version
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
-#exclude_patterns = ['**/links.rst']
+exclude_patterns = ['links.rst']
# The reST default role (used for this markup: `text`) to use for all documents.
#default_role = None
@@ -117,13 +109,18 @@ pygments_style = 'sphinx'
# A list of ignored prefixes for module index sorting.
#modindex_common_prefix = []
+# Some variables which are useful for generated material
+project_variable = project.replace('.', '_')
+short_description = u'Boosting framework for Bob'
+owner = [u'Idiap Research Institute']
+
# -- Options for HTML output ---------------------------------------------------
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
-if sphinx.__version__ >= "1.0":
- html_theme = 'nature'
+import sphinx_rtd_theme
+html_theme = 'sphinx_rtd_theme'
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
@@ -131,23 +128,23 @@ if sphinx.__version__ >= "1.0":
#html_theme_options = {}
# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
+html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
#html_title = None
# A shorter title for the navigation bar. Default is the same as html_title.
-#html_short_title = 'bob'
+#html_short_title = project_variable
# The name of an image file (relative to this directory) to place at the top
# of the sidebar.
-html_logo = ''
+html_logo = 'img/logo.png'
# The name of an image file (within the static path) to use as favicon of the
# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
# pixels large.
-html_favicon = ''
+html_favicon = 'img/favicon.ico'
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
@@ -196,67 +193,48 @@ html_favicon = ''
#html_file_suffix = None
# Output file base name for HTML help builder.
-htmlhelp_basename = 'bobdbdoc'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-# The paper size ('letter' or 'a4').
-latex_paper_size = 'a4'
-
-# The font size ('10pt', '11pt' or '12pt').
-latex_font_size = '10pt'
+htmlhelp_basename = project_variable + u'_doc'
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
- ('index', 'example_man.tex', u'Bob',
- u'Biometrics Group, Idiap Research Institute', 'manual'),
-]
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-latex_logo = ''
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
+# -- Post configuration --------------------------------------------------------
# Included after all input documents
-rst_epilog = ''
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
- ('index', 'bob.project.example', u'Bob Project Example Documentation', [u'Idiap Research Institute'], 1)
-]
+rst_epilog = """
+.. |project| replace:: Bob
+.. |version| replace:: %s
+.. |current-year| date:: %%Y
+""" % (version,)
# Default processing flags for sphinx
-autoclass_content = 'both'
+autoclass_content = 'class'
autodoc_member_order = 'bysource'
-autodoc_default_flags = ['members', 'undoc-members', 'inherited-members', 'show-inheritance']
+autodoc_default_flags = [
+ 'members',
+ 'undoc-members',
+ 'inherited-members',
+ 'show-inheritance',
+ ]
# For inter-documentation mapping:
from bob.extension.utils import link_documentation
-intersphinx_mapping = link_documentation(['python', 'numpy', 'scipy'])
-
+intersphinx_mapping = link_documentation()
+
+# We want to remove all private (i.e. _. or __.__) members
+# that are not in the list of accepted functions
+accepted_private_functions = ['__array__']
+
+def member_function_test(app, what, name, obj, skip, options):
+ # test if we have a private function
+ if len(name) > 1 and name[0] == '_':
+ # test if this private function should be allowed
+ if name not in accepted_private_functions:
+ # omit privat functions that are not in the list of accepted private functions
+ return skip
+ else:
+ # test if the method is documented
+ if not hasattr(obj, '__doc__') or not obj.__doc__:
+ return skip
+ return False
def setup(app):
- pass
+ app.connect('autodoc-skip-member', member_function_test)
diff --git a/doc/img/favicon.ico b/doc/img/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..4cc3264302627d40868261add69eb755856611b6
GIT binary patch
literal 4286
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
I|NnpX0RF|L5C8xG
literal 0
HcmV?d00001
diff --git a/doc/img/logo.png b/doc/img/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b60858a7068bf45c1ed8e3da12fe244ccdcfe85d
GIT binary patch
literal 6266
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
JWt~$(69D)+N{avh
literal 0
HcmV?d00001
diff --git a/setup.py b/setup.py
index db7301f..ca1a8a5 100644
--- a/setup.py
+++ b/setup.py
@@ -44,8 +44,8 @@ setup(
version=version,
description='Boosting framework for Bob',
- url='https://github.com/bioidiap/bob.learn.boosting',
- license='GPLv3',
+ url='https://gitlab.idiap.ch/bob/bob.learn.boosting',
+ license='BSD',
author='Manuel Guenther (with help of Rakesh Mehta)',
author_email='manuel.guenther@idiap.ch',
@@ -140,7 +140,7 @@ setup(
'Framework :: Bob',
'Development Status :: 4 - Beta',
'Intended Audience :: Developers',
- 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
+ 'License :: OSI Approved :: BSD License',
'Natural Language :: English',
'Programming Language :: Python',
'Topic :: Scientific/Engineering :: Artificial Intelligence',
--
GitLab