From dbda336d29ee2cc20dc3344918cd3a07c34f0c13 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Tue, 16 Aug 2016 15:11:01 +0200
Subject: [PATCH] Standardise
---
.gitlab-ci.yml | 254 ++++++++++++++++
.travis.yml | 33 ---
COPYING | 674 ------------------------------------------
LICENSE | 27 ++
MANIFEST.in | 4 +-
README.rst | 65 ++--
bootstrap-buildout.py | 51 +++-
buildout.cfg | 44 +--
develop.cfg | 52 ++++
doc/conf.py | 183 +++++-------
doc/img/logo.png | Bin 11280 -> 6266 bytes
requirements.txt | 19 +-
setup.py | 39 +--
test-requirements.txt | 3 +
14 files changed, 481 insertions(+), 967 deletions(-)
create mode 100644 .gitlab-ci.yml
delete mode 100644 .travis.yml
delete mode 100644 COPYING
create mode 100644 LICENSE
create mode 100644 develop.cfg
create mode 100644 test-requirements.txt
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 00000000..f26a01e9
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,254 @@
+# 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:
+ - ./bin/buildout
+ - if [ -x ./bin/bob_dbmanage.py ]; then ./bin/bob_dbmanage.py all download --force; fi
+ - ./bin/sphinx-build doc sphinx
+ - ./bin/python setup.py bdist_wheel --python-tag ${WHEEL_TAG}
+ 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, tests, uploads wheel
+build_linux_27:
+ <<: *linux_build_job
+ variables: &linux_27_build_variables
+ <<: *linux_build_variables
+ PYTHON_VER: "2.7"
+ WHEEL_TAG: "py27"
+ 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"
+ WHEEL_TAG: "py3"
+ tags:
+ - conda-linux
+
+test_linux_34:
+ <<: *test_job
+ variables: *linux_34_build_variables
+ dependencies:
+ - build_linux_34
+ tags:
+ - conda-linux
+
+
+# Linux + Python 3.5: Builds, tests, uploads wheel
+build_linux_35:
+ <<: *linux_build_job
+ variables: &linux_35_build_variables
+ <<: *linux_build_variables
+ PYTHON_VER: "3.5"
+ WHEEL_TAG: "py3"
+ 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 and tests
+build_macosx_27:
+ <<: *macosx_build_job
+ variables: &macosx_27_build_variables
+ <<: *macosx_build_variables
+ PYTHON_VER: "2.7"
+ WHEEL_TAG: "py27"
+ tags:
+ - conda-macosx
+
+test_macosx_27:
+ <<: *test_job
+ variables: *macosx_27_build_variables
+ 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"
+ WHEEL_TAG: "py3"
+ tags:
+ - conda-macosx
+
+test_macosx_34:
+ <<: *test_job
+ variables: *macosx_34_build_variables
+ dependencies:
+ - build_macosx_34
+ tags:
+ - conda-macosx
+
+
+# Mac OSX + Python 3.5: Builds and tests
+build_macosx_35:
+ <<: *macosx_build_job
+ variables: &macosx_35_build_variables
+ <<: *macosx_build_variables
+ PYTHON_VER: "3.5"
+ WHEEL_TAG: "py3"
+ tags:
+ - conda-macosx
+
+test_macosx_35:
+ <<: *test_job
+ variables: *macosx_35_build_variables
+ 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 0bdb952d..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-language: python
-matrix:
- include:
- - python: 2.7
- env:
- - secure: Ghi03teJBFaPPMiuJ9Q+SxK98VjjB92loJJARjqo0jrTLYiHchssgsMMatgaHhMCso1LjSC2ylAMERB1crONyFDbyiZ3DipSE+WolEMVuNu4OfV8Ny2vcQy8m49mXKWKBviXmeu0vuFOD09pEg4y5EAjlhZ028dKyP8if4oM25Wt33RjAPb2M4y1rUmxqFZvXRyVuPVDZq4RdyaoYOPO6S/j3sEGsY3L/tVgW3zC2fRuKxXhnNiRe6/rh/avCqavFC9B3m9bQwUV6DoHv0NfsYnzjUbAw1KG32FppGDlbe+7TmqxQBWkt+TO8aerMDswMvOzhpKbmjbqAKTGEEa5VlNa+H2fj2qhsJhKMuoH7q72MA22mNnDm2W+Dx4mXWklq5t8RIgI02woxTEUYYwmzWUH2pWU9JuCsYj6FK5zvCWdhWMwvWpQaidk2AduohWXcilNp7cr3P8RZJeP+uUlWFS8iFpJS9C4IL/mg8guq95ha4jffgsEdvJG6FYrmM8Z7tscaCZ9t5GX79U0wjDndpOwUaBDNSZRNEBfopJ8HWMVDOiKCIvSr6UJ6F1ViJXxmsbeZCENhDrECY4UxqErgxzKRPqGG6RKzl/JEZh55xuu5rrvXmBc8I9tKExd4yWZNwwl4WrIAvG7aG4SYjCuZ6iN3bfirWRV85zdlw1CXq4=
- - secure: P3Ax20L1CSQrYd/VCiYuI1sLUSWTnKrQ/VV9Zt8Px2t4FV5GXmbf8NRV1peLD0/yNSBBu1871F441YZqI7N7RQGZEcgjRqd41dPPFaZDXUUVaOvHx2Rq1y2d/2TwGkwsxZpgD5WNW1fOTKPFqJf49xzhAqUr8mJsGehN4KPHONDgf0zFwJx+vkW92Csnm7GDwIPcYRjeL5umKyEJlVxFNkIJdAxAIP0uCOAuqnrj6Vs9mGXIujaMerledHiGozJaXvksgSX4rs2EtTht8NUdm1u3zC3SzzEDe1MEjI/pb5t6BMuBZUa7b61kijrf0jiSAAhWw4TREGS0mg6XnZeZJSdlqMfglFKmPACMaq1GE5IEmjyGPHnO5vrxkDRnzmao5PfaJGNWNnfGdtMnd1JqjDpio9dUFWUa4AJieocZ7GbhFS9ZLWS1xM8vlnttjETxww5zbqC/QL4+xeVMoW3Cq7yeTIE2ELjKc3K+zT2KMb1iusbtOBwB7KfINEjcoIsQnlxrve+4//GuBrZ+Uq+8IhzKj1GTErkEEWaxlNdgf0YJ5uOkKOFIylUPM4cAqXnqSNjcRhUKBd5G4xC5w4vNWCzl1Yn7T0gmK2pOLDh8Ygs1CkquLLZodtjWOmIAE2vgFCeigiNtrhD9eKTCfXH5fYFKXCgCUDgPhh2yrPWJWYc=
- - BOB_DOCUMENTATION_SERVER=https://www.idiap.ch/software/bob/docs/latest/bioidiap/%s/master
- - BOB_UPLOAD_WHEEL="--universal"
- - 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 libjpeg8-dev libnetpbm10-dev libpng12-dev libtiff4-dev libgif-dev libboost-all-dev libblitz1-dev libhdf5-serial-dev libvl-dev dvipng texlive-latex-base texlive-latex-extra texlive-math-extra texlive-latex-recommended texlive-fonts-recommended libatlas-dev libatlas-base-dev liblapack-dev gfortran
-- pip install --upgrade pip
-- 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 --pre -r requirements.txt coveralls
-install:
-- python bootstrap-buildout.py
-- ./bin/buildout buildout:develop=. buildout:extensions=bob.buildout buildout:auto-checkout=
-script:
-- ./bin/python -c 'import pkg_resources; from bob.bio.base import get_config; print(get_config())'
-- ./bin/coverage run --source=bob.bio.base ./bin/nosetests -sv
-- ./bin/sphinx-build -b doctest doc sphinx
-- ./bin/sphinx-build -b html doc sphinx
-after_success:
-- 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
-- ./upload-wheel.sh
diff --git a/COPYING b/COPYING
deleted file mode 100644
index 94a9ed02..00000000
--- a/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- 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, either version 3 of the License, or
- (at your option) any later version.
-
- 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/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- <program> Copyright (C) <year> <name of author>
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..bd46ce15
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,27 @@
+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:
+
+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
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+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.
\ No newline at end of file
diff --git a/MANIFEST.in b/MANIFEST.in
index c0106740..cd4ceb77 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
-include README.rst bootstrap-buildout.py buildout.cfg COPYING version.txt requirements.txt
+include README.rst bootstrap-buildout.py buildout.cfg develop.cfg COPYING version.txt requirements.txt
recursive-include doc *.py *.rst
-recursive-include bob/bio/base/test/data *.lst *.hdf5 *-dev
+recursive-include bob/bio/base/test/data *.lst *.hdf5 *-dev
diff --git a/README.rst b/README.rst
index c7d4a09f..0558ff22 100644
--- a/README.rst
+++ b/README.rst
@@ -1,63 +1,50 @@
.. vim: set fileencoding=utf-8 :
-.. Andre Anjos <andre.anjos@idiap.ch>
-.. Thu 30 Jan 08:46:53 2014 CET
+.. Tue 16 Aug 15:00:20 CEST 2016
.. image:: http://img.shields.io/badge/docs-stable-yellow.png
:target: http://pythonhosted.org/bob.bio.base/index.html
.. image:: http://img.shields.io/badge/docs-latest-orange.png
:target: https://www.idiap.ch/software/bob/docs/latest/bioidiap/bob.bio.base/master/index.html
-.. image:: http://travis-ci.org/bioidiap/bob.bio.base.svg?branch=master
- :target: https://travis-ci.org/bioidiap/bob.bio.base?branch=master
-.. image:: https://coveralls.io/repos/bioidiap/bob.bio.base/badge.svg?branch=master
- :target: https://coveralls.io/r/bioidiap/bob.bio.base?branch=master
-.. image:: https://img.shields.io/badge/github-master-0000c0.png
- :target: https://github.com/bioidiap/bob.bio.base/tree/master
+.. image:: https://gitlab.idiap.ch/bob/bob.bio.base/badges/master/build.svg
+ :target: https://gitlab.idiap.ch/bob/bob.bio.base/commits/master
+.. image:: https://img.shields.io/badge/gitlab-project-0000c0.svg
+ :target: https://gitlab.idiap.ch/bob/bob.bio.base
.. image:: http://img.shields.io/pypi/v/bob.bio.base.png
:target: https://pypi.python.org/pypi/bob.bio.base
.. image:: http://img.shields.io/pypi/dm/bob.bio.base.png
:target: https://pypi.python.org/pypi/bob.bio.base
-==================================================
- Scripts to run biometric recognition experiments
-==================================================
-This package is part of the ``bob.bio`` packages, which allow to run comparable and reproducible biometric recognition experiments on publicly available databases.
+================================================
+ Tools to run biometric recognition experiments
+================================================
-This package contains basic functionality to run biometric recognition experiments.
-It provides a generic ``./bin/verify.py`` script that takes several parameters, including:
+This package is part of the signal-processing and machine learning toolbox
+Bob_. It provides tools to run comparable and reproducible biometric
+recognition experiments on publicly available databases.
-* A database and its evaluation protocol
-* A data preprocessing algorithm
-* A feature extraction algorithm
-* A biometric recognition algorithm
+The `User Guide`_ provides installation and usage instructions.
-All these steps of the biometric recognition system are given as configuration files.
-
-In this base class implementation, only a few algorithms (such as PCA, LDA, PLDA, BIC) are implemented, while most algorithms that are more specialized are provided by other packages, which are usually in the ``bob.bio`` namespace, such as:
-
-* `bob.bio.spear <http://pypi.python.org/pypi/bob.bio.spear>`__ for speaker recognition recognition databases, features and algorithms
-* `bob.bio.face <http://pypi.python.org/pypi/bob.bio.face>`__ for face recognition databases, features and algorithms
-* `bob.bio.video <http://pypi.python.org/pypi/bob.bio.video>`__ for video-based databases and algorithms
-* `bob.bio.gmm <http://pypi.python.org/pypi/bob.bio.gmm>`__ for Gaussian-mixture-model-based algorithms
-* `bob.bio.csu <http://pypi.python.org/pypi/bob.bio.csu>`__ for wrapper classes of the `CSU Face Recognition Resources <http://www.cs.colostate.edu/facerec>`__ (see `Installation Instructions <http://pythonhosted.org/bob.bio.csu/installation.html>`__ of ``bob.bio.csu``).
+Installation
+------------
-Moreover, a script for score fusion ``./bin/fusion_llr.py`` is provided to do score-level fusion using Logistic regression to combine outputs from different systems.
+Follow our `installation`_ instructions. Then, using the Python interpreter
+provided by the distribution, bootstrap and buildout this package::
-Additionally, a generic script ``./bin/evaluate.py`` is provided that can generate several types of plots (such as ROC, DET and CMC curves) and compute several measures (such as HTER, Cllr) to evaluate your experiments.
+ $ python bootstrap-buildout.py
+ $ ./bin/buildout
-Installation
-------------
-To create your own working package using one or more of the ``bob.bio`` packages, please follow the `Installation Instructions <http://pythonhosted.org/bob.bio.base/installation.html>`__ of the ``bob.bio`` packages.
+Contact
+-------
-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.
+For questions or reporting issues to this software package, contact our
+development `mailing list`_.
-Documentation
--------------
-For further documentation on this package, please read the `Stable Version <http://pythonhosted.org/bob.bio.base/index.html>`_ or the `Latest Version <https://www.idiap.ch/software/bob/docs/latest/bioidiap/bob.bio.base/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.
+.. 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
+.. _user guide: http://pythonhosted.org/bob.bio.base
diff --git a/bootstrap-buildout.py b/bootstrap-buildout.py
index a6295667..a4599211 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 e77e863a..3a6d45fd 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -1,51 +1,13 @@
; vim: set fileencoding=utf-8 :
-; Manuel Guenther <manuel.guenther@idiap.ch>
-; Thu Oct 9 16:51:06 CEST 2014
+; Tue 16 Aug 15:00:20 CEST 2016
[buildout]
parts = scripts
+develop = .
eggs = bob.bio.base
- gridtk
-
extensions = bob.buildout
- mr.developer
-auto-checkout = *
-develop = src/bob.extension
- src/bob.blitz
- src/bob.core
- src/bob.io.base
- src/bob.learn.activation
- src/bob.math
- src/bob.learn.linear
- src/bob.sp
- src/bob.learn.em
- src/bob.measure
- src/bob.db.base
- src/bob.bio.db
- src/bob.db.atnt
- src/bob.io.image
- .
-
-; options for bob.buildout
-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
-bob.learn.activation = git https://github.com/bioidiap/bob.learn.activation
-bob.math = git https://github.com/bioidiap/bob.math
-bob.sp = git https://github.com/bioidiap/bob.sp
-bob.learn.linear = git https://github.com/bioidiap/bob.learn.linear
-bob.learn.em = git https://github.com/bioidiap/bob.learn.em
-bob.measure = git https://github.com/bioidiap/bob.measure
-bob.db.base = git https://github.com/bioidiap/bob.db.base
-bob.bio.db = git https://gitlab.idiap.ch/biometric/bob.bio.db
-bob.db.atnt = git https://github.com/bioidiap/bob.db.atnt
-bob.io.image = git https://github.com/bioidiap/bob.io.image
+verbose = true
[scripts]
recipe = bob.buildout:scripts
diff --git a/develop.cfg b/develop.cfg
new file mode 100644
index 00000000..93d727bb
--- /dev/null
+++ b/develop.cfg
@@ -0,0 +1,52 @@
+; vim: set fileencoding=utf-8 :
+; Manuel Guenther <manuel.guenther@idiap.ch>
+; Thu Oct 9 16:51:06 CEST 2014
+
+[buildout]
+parts = scripts
+eggs = bob.bio.base
+ gridtk
+
+extensions = bob.buildout
+ mr.developer
+auto-checkout = *
+develop = src/bob.extension
+ src/bob.blitz
+ src/bob.core
+ src/bob.io.base
+ src/bob.learn.activation
+ src/bob.math
+ src/bob.learn.linear
+ src/bob.sp
+ src/bob.learn.em
+ src/bob.measure
+ src/bob.db.base
+ src/bob.bio.db
+ src/bob.db.atnt
+ src/bob.io.image
+ .
+
+; options for bob.buildout
+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
+bob.learn.activation = git https://gitlab.idiap.ch/bob/bob.learn.activation
+bob.math = git https://gitlab.idiap.ch/bob/bob.math
+bob.sp = git https://gitlab.idiap.ch/bob/bob.sp
+bob.learn.linear = git https://gitlab.idiap.ch/bob/bob.learn.linear
+bob.learn.em = git https://gitlab.idiap.ch/bob/bob.learn.em
+bob.measure = git https://gitlab.idiap.ch/bob/bob.measure
+bob.db.base = git https://gitlab.idiap.ch/bob/bob.db.base
+bob.bio.db = git https://gitlab.idiap.ch/biometric/bob.bio.db
+bob.db.atnt = git https://gitlab.idiap.ch/bob/bob.db.atnt
+bob.io.image = git https://gitlab.idiap.ch/bob/bob.io.image
+
+[scripts]
+recipe = bob.buildout:scripts
+dependent-scripts = true
diff --git a/doc/conf.py b/doc/conf.py
index 22958db4..c4202fa5 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -1,46 +1,47 @@
#!/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-2014 Idiap Research Institute, Martigny, Switzerland
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
@@ -58,12 +59,12 @@ source_suffix = '.rst'
master_doc = 'index'
# General information about the project.
-project = u'Bobs interface for running biometric recognition experiments'
+project = u'bob.bio.base'
import time
copyright = u'%s, Idiap Research Institute' % time.strftime('%Y')
# Grab the setup entry
-distribution = pkg_resources.require('bob.bio.base')[0]
+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
@@ -108,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'Tools for running biometric recognition experiments'
+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
@@ -122,14 +128,14 @@ 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.
@@ -187,105 +193,48 @@ html_favicon = 'img/favicon.ico'
#html_file_suffix = None
# Output file base name for HTML help builder.
-htmlhelp_basename = 'bob_bio_base_doc'
-
-
-# -- 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'
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
- ('index', 'bob_bio_base.tex', u'Bob',
- u'Biometrics Group, Idiap Research Institute', 'manual'),
-]
+htmlhelp_basename = project_variable + u'_doc'
-# 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.bio.base', u'Base tools to run biometric recognition experiments', [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', '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', 'bob.bio.face', 'bob.bio.speaker', 'bob.bio.gmm', 'bob.bio.video', 'bob.bio.csu', 'bob.bio.spear', 'gridtk', 'bob.db.youtube'])
-
-
-def skip(app, what, name, obj, skip, options):
- # Do not skip the __call__ and the __str__ functions as we have special implementations for them.
- if name in ("__str__", "__call__"):
- return False
- return skip
-
-# getting dictionaries printed nicely.
-# see: http://stackoverflow.com/questions/7250659/python-code-to-generate-part-of-sphinx-documentation-is-it-possible/18143318#18143318
-try:
- from StringIO import StringIO
-except ImportError:
- from io import StringIO
-
-from sphinx.util.compat import Directive
-from docutils import nodes, statemachine
-
-class ExecDirective(Directive):
- """Execute the specified python code and insert the output into the document"""
- has_content = True
-
- def run(self):
- oldStdout, sys.stdout = sys.stdout, StringIO()
-
- tab_width = self.options.get('tab-width', self.state.document.settings.tab_width)
- source = self.state_machine.input_lines.source(self.lineno - self.state_machine.input_offset - 1)
-
- try:
- exec('\n'.join(self.content))
- text = sys.stdout.getvalue()
- lines = statemachine.string2lines(text, tab_width, convert_whitespace=True)
- self.state_machine.insert_input(lines, source)
- return []
- except Exception:
- return [nodes.error(None, nodes.paragraph(text = "Unable to execute python code at %s:%d:" % (os.path.basename(source), self.lineno)), nodes.paragraph(text = str(sys.exc_info()[1])))]
- finally:
- sys.stdout = oldStdout
+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):
- app.connect("autodoc-skip-member", skip)
- app.add_directive('exec', ExecDirective)
+ app.connect('autodoc-skip-member', member_function_test)
diff --git a/doc/img/logo.png b/doc/img/logo.png
index b9dd573a01019afd1af58a881996930e5212699d..b60858a7068bf45c1ed8e3da12fe244ccdcfe85d 100644
GIT binary patch
literal 6266
zcmV-=7=`DFP)<h;3K|Lk000e1NJLTq006rH003kN1ONa4bn%HB00002VoOIv0RM-N
z%)bBt010qNS#tmY0+;{*0+<0d(?{O`000McNliru;0Ox~6aXI@MOFX+7z;^6K~#9!
z?VWj?Tve6Ff9KU+UDa!PNvAstS%44(41^`fW|R>aSyTcdvdo780Z~DQ5oDr##sPKY
z1A-zThL3ziHU*JQ1OkFWSdu_UA|Wfiq?7J+*S^1d=8vlCdiCnwSFgJ|fu2vQK1o%*
z<(~Jx_uO;OJ?Gxn#Mt+m$QRY26$6~IK1$mMYC@s6ed(HWZpD$+j&trqHDSp8o%>yV
zN9WNweQTKdc+)=Ydjopw85bXRMPoPM!pWy@{3rdIcUv62&$dqha&P;Luin|Y*zGHB
z*}CPn@8fZ`h2Mw0cIZ=1JMZxCG|ez>6Z*=P4_(i%>@zZZ2DzuH>#94uj`R3Uo{Hnp
zL$_W?{rurR>=O^Y<>a#$UE4eh5CAB@t+3DMx3cj2jLdkEyMxot`+4^Xo&Ze9Y4n(F
zTW-G*f0SAHeb~nbz4@fm7v0c2+pxui93Tk&t(A{RE&N_KGE`?dbW3t>5+HZ_IxoJh
zYl$zYmqC|+cPuz`>qRmPzgMx-TpVDrTVMq~;n;~V?a0p_^Zn-8L;}{j4iG&4lTO{Z
zh3@B%J~kt>bpG_Gb#J-6(l4gS+WSx8>?a$0oBNA*w|~*oOiJWb(E@g?`}sBemyb!?
ziN3u&Fp~|a%PSzd`_&si>Ck~oF4DWQujd2+uj@FMN2TqA@JFt9H2{Qq&smO-txLW1
z`YAU#97Wt_sk;8pJD#|jKk@xLQSlnDe5(0WGx8GlMC6sPzVY<O9+UaPwE5p8hbZ9Y
z3T@xD?uj4pByg&V*LcCX9iJ6y%PxAKTKT+HIeQ8F%-^~@^fKdOWE>xP{Tm#fJnrKW
z^+)|k^XgD}?8BQMyvo{O?iK78T+({1D1&W8FZ7;=HoP&Jy!KDs>z}38^;C5Abym^G
zy@dVP=0m;@w_f4B6hC)=@Z|L@CJ*$pmvo$>OOR8+4DI;K8&6d$V=rKz_Z!c2VS--z
zKN))G3Jy&k=(9Xa?sNu3g@;~zg||L_d3BF$k7HkYM(gK<$(EO(v%cf;b$^>o24?Z?
zzInRDz~sMW;_Gfm58CjE_N@DGVBImR>*lh=PtX4feemGXJTiHppSrN~1y7^Oab)g)
z@(*Worg}MhIEDS`U-;$<l-~O2TR<QYdH-9J2|8)b_c<GjSFcyxRcQP3m)U{7hmFkX
zi(AiBxs41KJD+;*g~?=KzWm?b1wuJ4&BQm|6dABtfqTx#w7O1SRkuLajTSneO^+SP
z!;=U4@w2DD?rBx|>cGxt{&W_n?Ul6$wf*>?c<1X<4+a1-ku6tDCg?!>1FlxJuE)0h
z<KOH;H({q1cqi&251)3x`9dr2LW}4L%sXCPwU(w$9_Xi>+q|&okyS?5v&j$c8cb0G
za!9d0CL=Sy?tuIC1~ysX%HS1OfRz1i*e@`<2)VScxIZ23|A!l_ReCsPDb=@DGm~U{
ztJRS$hxpoLzB++Hi0xee@UD%!2a&`u29ZDx8HCjpV8H&h-!`Am2B<8-&eC7TGYZ<Q
zs4O1U7nY7#QPJ^Qgr&ynhuGRj((NVPW@#pg0O+Y~GMC6kGm*^juJs#M^JZ*AQa%(M
z#eU}E)@R)HT!yb47E8=U@n0oq;}N9jR9T9T$AG@tF*K&?An7?|aTH0bfxsfMJKD45
z#m(<vC5Aboz)sHdSJfSC)>>H=l-dEAs>67OwZ6;41Xk#4*Y#@EP#rlb0|I3D$Dq;g
zdN$m*>A8(BU?uv?qfQ0vXa8^0cSvK2d6B`ksswqI(cDI?@Ur4_ycIw;_mkpyk|0-s
zFRug!LC=JH);u)u2W&7-+#m+9WdE+eyIbVuMP3E@Uvkvu@2u!_<voNN`9zN}$O65r
z>$Icm@+wG%H$3^la=cSAHpBqVeZB4|nRy{e$69GzWV&zeX6<-IW9wLXf=rBcXKIDq
zc&51$%vF$0Z2$W^cj0-CkNWLrT-S8CQ0lfEwi>lveYfgZ<-qrbw#&YeE%Tz*bpqh<
z&pg2qd^3tdFvNLUQ~gzN3MKC1cVW|!tZWI@EdJQEo%aH8Ks61caw|#no@6b<)p_Xb
zi)agP0RU&q-MS|;q}Fx0_b%T`KCKQ)d#@)Eher#J#i!9zoQ65`#N;Q7(X^gKN(+$7
zE`9=#OHc};0&>0PCZ*ZYBb3#G<R+!wm;chdb58DGMfY$NAUF|(J`s&}R@0m}U2Sq>
z!VvndU%YqYocgwf&ZDWDrqO(@wYpCe?|*k$+v8b>aeu?y;M0zVeESm>Z9rs3mc{OC
z>hK<;Euao<Djh_P`S`Y0fS`>c(V!K6MK-Vg4qh%(cs}%u#(Oo7%BE+-o6iZYoHr|Q
zw04lA15+Ifw1CXKlvlvehp+uRzYI7zhY5;!pZK7&O-OAz1Bie4-ZG9Lf?oUy0FIgO
zx=lMC?o$6yipulo|9WfPv3(D7)F@}p6UhekRixJR-NA7TVr~BS%z5r*bP6@X!kB2_
zPXD6Bv&I>ib6vh0*rQC|apbQ(FK`YcSe4&!+#>f4+7iuAl1eI7KzczT6-!UDg?
zoL2X!=2dm4+341#J<poYIpPv=H64&o7%+6H^-ga7=rT4$<!4^*zD;dF^x=UevDN0S
zbN_{Ir+L;kKDM^+>%6A)d-gAV-yk@kL4yPNZ;sJ3Qrq7>Dp3(zKj|XvhgvsPbiQQJ
z`Tmuwmh$!q$}V*{Tt6YNG20@H85oYd)GJA7ymfEli0C^Bq>)8#RO7kq?d<S;#t_4A
zaQp{c#{FfvD?R>5d`+dC51+#c;-3ujyVSZEo-T)BS!35cZD|f!q>w-i5ri>}-Pny`
zgb_nDIq=hjB%$%ra{gkjPanN+z3l4pzXQ{8_=F|(X8qW8K&22J86*+IVDEZGHhn`3
zUlLnciacM6R@ZPWjjCncue2HEQjBM0HV<4cpIf$Z2Vbo35|U~yN^&#>4cJ}xQFHlz
zhCmi+BoM{Ws%^iKb9iwLU!9AYksH5zTbdV65cUP#t_yT37M$0SFh&a65ls*NEYq(#
z_k->DC9@29@w?W9!pfk|Bk5Ebw)|U<MgCKrnceg{{#dEwMv3m}#p<1Ykz<ir4NBj$
zyM`{~q)N_;NBFPCK1w%L0NkwyOc3_q{o0fqQiv5`hY&#m>4M=%uHJR8)!E`UeVtjy
zjX<al?EpaJ{3Qj|rXsZ>{Iq54<_58|@;rl_LiM)z9XG;lhF$zFa*2mx?_0?U|5qfE
zK*j{Tr1PFO(k1}=f-k2Rk6;8L#E?L`P|KqYe`x43PFS74DTg<$%nbR^4FH|jX@{7t
zdFhO7@6Z+2S^F)+{Ju=fi`yuG4gm1qNwehbPCy{@;lMI$9&6r@ZH{0V!w4aUByuJn
zjRL5zIhWe(Y55=Bqly{|J^4`Ly{ggjKC7`PdC>$+Y4LrN9V)*|q!YJid#cLWUMia^
zM#SVpD>io=>^X}^Q+GfqLk0kPBy?@{Ic)q99|mNRMH+wuPB`I&tKbQdAAy>&H{R-)
zE0iJI%!dR2Reb`rSY;LFVh3`7`#037E-1Tt<SrY@ke*5z2K)|W0O!5bP#T(1Ie1RL
z6nWkTl#h&8nnNxhmnooULb^um)8_fkVP%9o7q#l-3<y?oJinMs23BOSvwewc2`gie
zVt4rRVr<V+&T9t6m9!Z2O})~!P)PNh0pxmzuC%k_gtr#YGm6V0hctk60+AZAd+yVk
zSsC6+uLwVDr<CnGx<^o_3WkX^1|7@cR|drN)T602cI1e+5v6)r<q-gp@G)J>&dU7-
zgsH@B**-gR_*DqCvyzE(ZQ4HLeAgniu4k%tat0vKl&KDpY`uaGWMytCw`t@Cn=3(b
z>QV?IR)3o|olWMYly1+g8M)iu-Biw(F>1XYu5o&jc5U9#k_EFwCVp?W*IqeYPWV|l
zMS~O0b68WQIXE7_$?h~KZfBn=M8Mz-eL<B_A?U-QZ`m<q0KjvgsjXSIw<hd!rqLXA
zBt5$$bdTMVxV4Bwrtw+>rmB@W*OPeCww!LbSb-IAbWmf-<d~1kZcMMTEoZjHK0Vb_
z6ZYJ<H6JSy7mVyW9<Y6xGvQ%n3WMsQbR5B%mpNuz&H_~^i~#{3OH4v>4nX2z`zypn
zw>oVu(wTKNVdoQBnWPZ$$UXK;5@(X8av(*_YKE8?iH$|hF`Cj*6(bZhbf4zP=FY@p
zV~}&OCbjASkR8shtO5J1Mw-XUG+nkg^U4@1aG}M%gw~=qG5R)MKL$Amvogm7qK1lr
zTFG_XfIhoYrW4QOiVk@c`zG|&fStdNpxnFwK<4eStViN`q!=mzAUISWJ?p7w?a#7p
zYd|+kObi2n;5au+Oi%tZ8Gpe3s#$R`+Sr79bY5I0_Iu_ULSZ}_w?J8p17PU!$g}oK
zYW+NQ7|(~HL_IDx%eEI{B%$OA`*QS4(4Z<y4~gBf?ZxCt=B+WvxuTR2Fqf7cia!I?
zpzWfaph`Y-O6(j%QQys9h0Mp$cWSJj9VSxf8H1vn%N0YQQTL$F=~EdPK*X`b_PCu;
zF`h1Ier{9VSdClTMMt@Y8+Aob*|&skK^)FyGZl=1R`Dh`lxtoY$T8q(UO@9r<AKs!
z*PlYLT*u4qE{dpa|L$y>QQ0o@<%mq;*Lf`(f8e*p*oevniG+O|`VXl|p0)r)fBbvJ
zj!yO#5!iPge+X}-gks06-^&5{H2@3|8pCqs%i*Y;Ia&x#uZumA-#-2>mCTNqK_8=t
z*efOA^L$02$>3b(f!wxcP1)IkN9=ZV!7k^CT;abIt~;5&#g|}*x?9g}w@YQpG0uf7
zl|m4a=(WW;5aajT!*b*dKu_4!4%e;JrJCy~HpXuO%!480G5Vn0i`DKy6HBZ%0OVFD
zAM~Y><T{m?le29ywOdhV>_3bnfy|1;s8c<D>?7*w|KufawP!j5K(O8YWi!fBtR;OD
zhXDDLHws5J+0^wTwc}JnAu*i#HYb3lIHsT?G(Z5LX)QK&eW~LxV@$JbIMyG!sx;0W
zzikgy&VC<760irvaSx`Ldxp`t;v1<a0DwlIu(<%WkPWpVC*4tu=2w)%`qSBW0DvQA
z2eR~Cn`!HAeE30ex|Nv?XVc5GhUbNi-*4Y3N6rAqi>~S=)L*DAfx>$b+tZik2SU6<
z?z3~gdRwc@sar;esVYw2khmsq5UCfC`!aymLN-<~Hs0;nUq%A}a&LuxTxN{Mt?iE@
zs}e$9%&B&|f426cV(P+tvtnoFYnjc3QeTx<41<9>98^`#V!DEzGXI1jwx!Mzh5mt8
z%aH>N)LTB$FAx2E?X04kVWy(54}Yb6LgDzaza_TIkTV$6>^_!!mJL7PdRXg(^hS9k
zb5-)S(L)~*yHy@FwP;6?<sCR%wdH7%kAcNN`n=2sqj&IoPO-wsINE7ZmCBvtxP|KE
zW>;*Bo^GBeG;ZuWnBJ8k2LN(=Pr$(z&>MpHX@`~HTCoHX&)$?WMEk-KS`VqW%|O8Q
zuh`E*PK*0d%#{ZO#BlcV^gj%8-seq_R1N@8ljjVwFlWwA?_*jgOBWl7fyB~e#Uu1<
znJ2RxX;dK3e>$hqiPWZm(Hyv6I}@68sFljymHb7y`^kUId*?FiOf&FVQgq*1yZ3QA
zR&Jg+np>8B!gRv(az$V;x#nXD1?6(wGlS3MXYiOQ0Q&CarLi|93~HJ2+x|R0hl(g<
zA@sW`atoehlV?qSY7X4*IKh~>Fx+55Jdn8BJeet=;cXnI7%~a{{q)Uv&K&QgAhmiQ
zp-;;)YXlC9pQUaw&jAPqu$tzWqmYGfxy+l%pWsFFD1sVXGwL33>|cKLsMkM~y)L|5
zHl(W!`(l2Uf~tiunN87~@f=b}aRMMeT=09&@LaAPRO)(+=y_25DDf*<Ah+&f+yjSv
z$ONIU&D@MvkVcYI0QuoYz;%J+LYgCwt#hBaD*dD^R}}mKmZ?@RaW?x#@~3zcX(TyK
z1V7xU_h0E=s&&g3m5D8x3!|^e$I&&;Z*RK~7ZqmiNI>ScWu8vI&AYG#UQBf#=s8cD
zUwoKE#S)rL*$Y#DS2}^u;bhgyCg@_5{-pjc2C)r6bT|)poK15|9<(W@xHk8d><5Za
zg@;z)=t|^;Hj>rXW&WI9k6q|N6FPj0U1vJ>gG0KsOxIV&&q*ueqqSn!_!&CcV#TT8
zs2CO@tpN=bG!7=pK6U-|^tm~Uc?Nzz{)UC>MP(2i=G}-<BN`|Gmm-6d;lE@q7DE;>
zqIO=P9VpZG!e>r|d5BWfNDUMuhx|B>i-$s2vqfC0=G7c+el`K&F@A~=Ka{wRs|3${
zU09JH4X9^_NpG-p+%EoA_Q%%KV1dA)cnZ_h%Ourn_D0Q7Z|<hZZ>_Ul6R?P;wTU0b
zNk!W`Hs~VGEA^|>>+EFZz5C(!SR_ZymcRjoc!juD-(n|X88`y>;oxe(<=}acpGjPw
z?ynlKn3%OoEjQC;XsopHmg`SbVvYX2)a&-Mp<XBM;ibhz2DYy}hBw4_^>y|qTm=01
z9ZrLDY~T?RucW`5+H9w4Cv3@B%V%&s79%M0Y9xz;N3c=<S@P*>O}_Hw`4X<=BjK}!
zo-u^=yi9+?e$|e4;+N7z_;hh`S{3kuck#Q~?<LmSt=b8FL|fyhv>R{~brz>@O5h6~
z;0^pz_IH_qv7;D`(jQOP@IrJz{q&_A`mr9*h{t$n{7;3iJBu#EA=C;|YIp{{yq5oz
zd@480V_4lg;ZMf%J6(&l)3HCMaR5Ge;o=nHh$74*7#1(4p4EpZ;)%WvADx6#Fc<9z
zz|S5ykVFCzgfN0({8_w=@I*YC+|%IvJT0L)+(rTT;2{kO#1W+shB2r=8h?u;V=r}&
zJ&=$HZa7_jM<5dtKpM$C^L%#F;D(dx;NuYxGGjMeHsv_rg3}!!PdWrb%1#<*uVW`C
z8qkC$c;JF7KaCLS!aI(^+Ai84$Au;|p#dJa;LJZhpdclKC<g6L^sXw$gC;bg9&We_
zqk?QfN*ZAdjrA|+&>nbP$P`RRW0i*%MKOpWj@Hzg+R=^rDqU(ALm09<L0X~ZQ_+RG
zDso0Jh#~vRG@;lD=s-98wogc72YOi_2l8p?g2(m=N%UgJ*o_=H(2Y*GY@ZNA4|eh1
z#ZE5FwVPBnyt3%Qz*vxw7yBbHW;rQ*gu$`gE!E+GaXgMRj_uXgYfTt-3PKWovW=t{
zyX{>GHDf<G#wjO(9=lUwsU6eDosEc~$9mTN1YxHD=GuDbq7{-Y)jL3Hw8|#gM6#`V
z2T1Lx^+CA9_(<(2PY8B$V~)j)8yyM6kO0984}!`zp<{a$9r0tfMdjuYM;r+_;DrbE
z$}7rXyZV^{06-0xVQCiQh$9Inyzrnw*(Orhrc$H{z)l+WvoJ3)^cXES5gO5|M6y%;
zH(bbNX<kOKgUhd~87+$A8U5-%I7D8|vZ&l$JY?#2r=UrJUPrIoi<$`REoiYY9etJE
zB@w15JKrdF${QzjSh$N346w`-X;*f>BN$R-e!8Ka^)Sps(osr>(tjJ0ts|@%J2}v;
zY-VZnt9%q{M6=Qe?5K1q$!#&^DUO}29!1nE-AaiEMLtYb$_cC5A`#k@zJ09HsjMA)
z6M_~EGG*BftHJLy1EDDv<AHvwPLdiez*o4G)S)z(j6RD_5@=C^kD6V|8W+D4;8FgK
z(;O^EZ5$&gfM{r<VKzrzRC3bRo(YGD6+m2QK-gq1G^HHNdCUyj4OaO1KFXFm3$;FB
z!wCV^#l)(%q!^qE-EtyWwt~WC@ds?HFD;0`p}12I)s=O6ZVNe8LJSNFp;=*Y{ggAd
z{MxbSEQbE5dZA&Z1Lh*1!OgRhQ`OsNrZDOi-ie2DhRDA|DTk}a?O9MrY0&(nmrAG=
zyJmsIMpT`dVoICsqTJ|(k_8SM-4p8+Q~D<!((`7D@}^NWs<83m9L1HfA}{GhGgT{g
zQ5z0`bCgnEg_ClHQq-o*X3B)K<WPECF3LZ9gDl|M4cMijDZPGI(E`+pT~}U?eHSTf
zajXU%ARt>yn;He;w2&hT*HWV#2Bp=5I?@WW>1%Ny$?{JD*pDg_S=ymVCdayzd@(c$
k{u1*4!<V)X!N>9XKYrHF6~+H2b^rhX07*qoM6N<$g7`X0ivR!s
literal 11280
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
diff --git a/requirements.txt b/requirements.txt
index 73661d79..97c85746 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,17 +1,14 @@
-setuptools
-scipy
-bob.extension
+bob.bio.db
bob.blitz
bob.core
+bob.db.base
+bob.extension
bob.io.base
bob.learn.activation
-bob.math
-bob.learn.linear
-bob.sp
bob.learn.em
+bob.learn.linear
+bob.math
bob.measure
-bob.db.base
-bob.bio.db
-bob.db.atnt # for test purposes
-bob.io.image # for test purposes
-matplotlib # for plotting
+bob.sp
+scipy
+setuptools
diff --git a/setup.py b/setup.py
index 92304c24..f10b8155 100644
--- a/setup.py
+++ b/setup.py
@@ -1,37 +1,6 @@
#!/usr/bin/env python
# vim: set fileencoding=utf-8 :
-# Andre Anjos <andre.anjos@idiap.ch>
# Mon 16 Apr 08:18:08 2012 CEST
-#
-# Copyright (C) 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/>.
-
-# This file contains the python (distutils/setuptools) instructions so your
-# package can be installed on **any** host system. It defines some basic
-# information like the package name for instance, or its homepage.
-#
-# It also defines which other packages this python package depends on and that
-# are required for this package's operation. The python subsystem will make
-# sure all dependent packages are installed or will install them for you upon
-# the installation of this package.
-#
-# The 'buildout' system we use here will go further and wrap this package in
-# such a way to create an isolated python working environment. Buildout will
-# make sure that dependencies which are not yet installed do get installed, but
-# **without** requiring administrative privileges on the host system. This
-# allows you to test your package with new python dependencies w/o requiring
-# administrative interventions.
from setuptools import setup, dist
dist.Distribution(dict(setup_requires=['bob.extension']))
@@ -47,10 +16,10 @@ setup(
# information before releasing code publicly.
name = 'bob.bio.base',
version = open("version.txt").read().rstrip(),
- description = 'Basic tools for running biometric recognition experiments',
+ description = 'Tools for running biometric recognition experiments',
- url = 'https://www.github.com/bioidiap/bob.bio.base',
- license = 'GPLv3',
+ url = 'https://www.gitlab.idiap.ch/bob/bob.bio.base',
+ license = 'BSD',
author = 'Manuel Gunther',
author_email = 'siebenkopf@googlemail.com',
keywords = 'bob, biometric recognition, evaluation',
@@ -157,7 +126,7 @@ setup(
'Framework :: Bob',
'Development Status :: 3 - Alpha',
'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',
diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 00000000..75e7615d
--- /dev/null
+++ b/test-requirements.txt
@@ -0,0 +1,3 @@
+bob.db.atnt
+bob.io.image
+matplotlib
--
GitLab