From df5a723713a0c04cfb728671d519ff74107644ac Mon Sep 17 00:00:00 2001
From: Amir Mohammadi <183.amir@gmail.com>
Date: Sat, 14 Jan 2017 19:37:48 +0100
Subject: [PATCH] update links and use svg badges [skip ci] [nightlies release]
---
README.rst | 6 +++---
doc/implementation.rst | 2 +-
doc/installation.rst | 8 ++++----
doc/links.rst | 2 +-
setup.py | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/README.rst b/README.rst
index 0558ff22..ed7ed84b 100644
--- a/README.rst
+++ b/README.rst
@@ -1,9 +1,9 @@
.. vim: set fileencoding=utf-8 :
.. Tue 16 Aug 15:00:20 CEST 2016
-.. image:: http://img.shields.io/badge/docs-stable-yellow.png
+.. image:: http://img.shields.io/badge/docs-stable-yellow.svg
:target: http://pythonhosted.org/bob.bio.base/index.html
-.. image:: http://img.shields.io/badge/docs-latest-orange.png
+.. image:: http://img.shields.io/badge/docs-latest-orange.svg
:target: https://www.idiap.ch/software/bob/docs/latest/bioidiap/bob.bio.base/master/index.html
.. image:: https://gitlab.idiap.ch/bob/bob.bio.base/badges/master/build.svg
:target: https://gitlab.idiap.ch/bob/bob.bio.base/commits/master
@@ -45,6 +45,6 @@ development `mailing list`_.
.. Place your references here:
.. _bob: https://www.idiap.ch/software/bob
-.. _installation: https://gitlab.idiap.ch/bob/bob/wikis/Installation
+.. _installation: https://www.idiap.ch/software/bob/install
.. _mailing list: https://groups.google.com/forum/?fromgroups#!forum/bob-devel
.. _user guide: http://pythonhosted.org/bob.bio.base
diff --git a/doc/implementation.rst b/doc/implementation.rst
index 0230be9a..dc7c35af 100644
--- a/doc/implementation.rst
+++ b/doc/implementation.rst
@@ -218,7 +218,7 @@ Verification Database Interface
For most of the data sets, we rely on the database interfaces from Bob_.
-Particularly, all databases that are derived from the :py:class:`bob.bio.base.database.BioDatabase` (click `here <https://gitlab.idiap.ch/bob/bob/wikis/Packages>`_ for a list of implemented databases) are supported by a special derivation of the databases from above.
+Particularly, all databases that are derived from the :py:class:`bob.bio.base.database.BioDatabase` (click `here <https://www.idiap.ch/software/bob/packages>`_ for a list of implemented databases) are supported by a special derivation of the databases from above.
For these databases, the special :py:class:`bob.bio.base.database.BioDatabase` interface is provided, which wraps the actual Bob_ databases with all their specificities.
Several such databases are defined in the according packages, i.e., :ref:`bob.bio.spear <bob.bio.spear>`, :ref:`bob.bio.face <bob.bio.face>` and :ref:`bob.bio.video <bob.bio.video>`.
For Bob_'s ZT-norm databases, we provide the :py:class:`bob.bio.base.database.ZTBioDatabase` interface.
diff --git a/doc/installation.rst b/doc/installation.rst
index 3552bfd6..dca271a3 100644
--- a/doc/installation.rst
+++ b/doc/installation.rst
@@ -9,7 +9,7 @@ Installation Instructions
=========================
As noted before, this package is part of the ``bob.bio`` packages, which in turn are part of the signal-processing and machine learning toolbox Bob_.
-To install `Packages of Bob <https://gitlab.idiap.ch/bob/bob/wikis/Packages>`_, please read the `Installation Instructions <https://gitlab.idiap.ch/bob/bob/wikis/Installation>`_.
+To install `Packages of Bob <https://www.idiap.ch/software/bob/packages>`_, please read the `Installation Instructions <https://www.idiap.ch/software/bob/install>`_.
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://gitlab.idiap.ch/bob/bob/wikis/Dependencies>`_ for your operating system.
@@ -21,7 +21,7 @@ Installation via pip
----------------------
The most simple and most convenient way to use the ``bob.bio`` tools is to install it using `pip`.
-After setting up your python environment (you can find the instructions `here <https://gitlab.idiap.ch/bob/bob/wikis/Installation>`_), use the sequence of commands to
+After setting up your python environment (you can find the instructions `here <https://www.idiap.ch/software/bob/install>`_), use the sequence of commands to
first search the ``bob.bio`` packages and then install it.
.. code-block:: sh
@@ -33,7 +33,7 @@ first search the ``bob.bio`` packages and then install it.
Installation via zc.buildout
----------------------------
-Another convenient way to use the ``bob.bio`` tools is to use a ``zc.buildout`` package, as explained in more detail `here <https://gitlab.idiap.ch/bob/bob/wikis/Installation#using-zcbuildout-for-production>`__.
+Another convenient way to use the ``bob.bio`` tools is to use a ``zc.buildout`` package, as explained in more detail `here <https://www.idiap.ch/software/bob/install#using-zcbuildout-for-production>`__.
There, in the ``eggs`` section of the ``buildout.cfg`` file, simply list the ``bob.bio`` packages that you want, like:
.. code-block:: python
@@ -63,7 +63,7 @@ Databases
With ``bob.bio`` you will run biometric recognition experiments using some default biometric recognition databases.
Though the verification protocols are implemented in ``bob.bio``, the original data are **not included**.
To download the original data of the databases, please refer to the according Web-pages.
-For a list of supported databases including their download URLs, please refer to the `verification_databases <https://gitlab.idiap.ch/bob/bob/wikis/Packages>`_.
+For a list of supported databases including their download URLs, please refer to the `verification_databases <https://www.idiap.ch/software/bob/packages>`_.
After downloading the original data for the databases, you will need to tell ``bob.bio``, where these databases can be found.
For this purpose, we have decided to implement a special file, where you can set your directories.
diff --git a/doc/links.rst b/doc/links.rst
index 33d69de6..2a415bd8 100644
--- a/doc/links.rst
+++ b/doc/links.rst
@@ -8,7 +8,7 @@
.. _bob: http://www.idiap.ch/software/bob
.. _idiap at gitlab: http://gitlab.idiap.ch/bob
.. _at&t database: http://www.cl.cam.ac.uk/research/dtg/attarchive/facedatabase.html
-.. _gridtk: http://gitlab.idiap.ch/bob/gridtk
+.. _gridtk: https://pypi.python.org/pypi/gridtk
.. _buildout: http://www.buildout.org
.. _setuptools: http://trac.edgewall.org/wiki/setuptools
.. _nist: http://www.nist.gov/itl/iad/ig/focs.cfm
diff --git a/setup.py b/setup.py
index ecf073d7..21e016e4 100644
--- a/setup.py
+++ b/setup.py
@@ -49,7 +49,7 @@ setup(
#
# Our database packages are good examples of namespace implementations
# using several layers. You can check them out here:
- # https://gitlab.idiap.ch/bob/bob/wikis/Packages
+ # https://www.idiap.ch/software/bob/packages
# This entry defines which scripts you will have inside the 'bin' directory
--
GitLab