diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3cfc4da7b25811e7cf5cb2e6d5779217b1bd91d6
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,49 @@
+py27-linux:
+  variables:
+    BOB_UPLOAD_WHEEL="--python-tag py27"
+  script:
+    - git clean -ffdx
+    - source /idiap/group/torch5spro/conda/bin/activate `cat /idiap/group/torch5spro/conda/envs/latest-devel-2.7.txt`
+    - python bootstrap-buildout.py
+    - ./bin/buildout
+    - ./bin/python -c 'from bob.extension import get_config; print(get_config())'
+    - ./bin/coverage run --source=bob.extension ./bin/nosetests -sv
+    - ./bin/sphinx-build -b doctest doc sphinx
+    - ./bin/sphinx-build -b html doc sphinx
+  after_script:
+    - ./scripts/upload-sphinx.sh
+    - ./scripts/upload-wheel.sh
+  tags:
+    - lidiap2015
+
+py34-linux:
+  script:
+    - git clean -ffdx
+    - source /idiap/group/torch5spro/conda/bin/activate `cat /idiap/group/torch5spro/conda/envs/latest-devel-3.4.txt`
+    - python bootstrap-buildout.py
+    - ./bin/buildout
+    - ./bin/python -c 'from bob.extension import get_config; print(get_config())'
+    - ./bin/coverage run --source=bob.extension ./bin/nosetests -sv
+    - ./bin/sphinx-build -b doctest doc sphinx
+    - ./bin/sphinx-build -b html doc sphinx
+  tags:
+    - lidiap2015
+
+
+py35-linux:
+  variables:
+    BOB_DOCUMENTATION_SERVER=https://www.idiap.ch/software/bob/docs/latest/bioidiap/%s/master
+    BOB_UPLOAD_WHEEL="--python-tag py3"
+  script:
+    - git clean -ffdx
+    - source /idiap/group/torch5spro/conda/bin/activate `cat /idiap/group/torch5spro/conda/envs/latest-devel-3.5.txt`
+    - python bootstrap-buildout.py
+    - ./bin/buildout
+    - ./bin/python -c 'from bob.extension import get_config; print(get_config())'
+    - ./bin/coverage run --source=bob.extension ./bin/nosetests -sv
+    - ./bin/sphinx-build -b doctest doc sphinx
+    - ./bin/sphinx-build -b html doc sphinx
+  after_script:
+    - ./scripts/upload-wheel.sh
+  tags:
+    - lidiap2015
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 4de21c77c5610b1f1ab49ce88a10bd050d8e6f2e..0000000000000000000000000000000000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-language: python
-env:
-  global:
-  - secure: bCrXmS1k8aIOE8Ba6XuHyjUoQQPpYEC8kpTcMi9pNhyXRQyGEPLp85VgyfXga2Oxb73QcW1aW4AxGUxiR1OZjB4rBmKK2uKij2G2qq9uhcXkDqCzqqxslhtm3o8cxHEFNJWRhuSVVjS0m0RvaFuGRicdz7QdyHCLl29+Gqdkacs=
-  - secure: W81QkyB8I87JT6kqaW/eBYBngbtcpHXWXIQsBkjy06Z8V9gUGbUD5oWwCn6NKQ1hE1ZR/qELxsTtrfgvfiegCW9wci4qZzatq34DWvzKK20jacqn9hs0BnXCyI/+iQRf6vam1KAnvc4qmWzF/CfsuZqCku8TtU5ZtKk05D/K//0=
-matrix:
-  include:
-  - python: 2.7
-    env:
-    - BOB_DOCUMENTATION_SERVER=https://www.idiap.ch/software/bob/docs/latest/bioidiap/%s/master
-    - BOB_UPLOAD_WHEEL="--python-tag py27"
-  - python: 3.3
-    env:
-    - BOB_UPLOAD_WHEEL="--python-tag py3"
-  - 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 libfreetype6-dev libboost-all-dev libblitz1-dev libatlas-dev libatlas-base-dev liblapack-dev texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
-- pip install --upgrade pip
-- pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel sphinx nose --pre coverage==3.7.1 coveralls bob.blitz
-install:
-- python bootstrap-buildout.py
-- ./bin/buildout buildout:prefer-final=true
-script:
-- ./bin/python -c 'from bob.extension import get_config; print(get_config())'
-- ./bin/coverage run --source=bob.extension ./bin/nosetests -sv
-- ./bin/sphinx-build -b doctest doc sphinx
-- ./bin/sphinx-build -b html doc sphinx
-after_success:
-- coveralls
-- ./scripts/upload-sphinx.sh
-- ./scripts/upload-wheel.sh
diff --git a/README.rst b/README.rst
index a4ca8571af0b50c1ee5a668c98df3d8f072e63eb..e01bcce9cbcafc4cf83f8d2a5d53b53352b45f9b 100644
--- a/README.rst
+++ b/README.rst
@@ -1,6 +1,5 @@
 .. vim: set fileencoding=utf-8 :
-.. Andre Anjos <andre.anjos@idiap.ch>
-.. Thu 30 Jan 08:46:53 2014 CET
+.. Thu 04 Aug 2016 16:39:57 CEST
 
 .. image:: http://img.shields.io/badge/docs-stable-yellow.png
    :target: http://pythonhosted.org/bob.extension/index.html
@@ -21,18 +20,32 @@
  Python/C++ Bob Extension Building Support
 ===========================================
 
-This package is part of the signal-processing and machine learning toolbox Bob_.
-It provides a simple mechanism for using Bob_, or extending Bob_ by building packages using either a pure Python API, or even a mix of C++ and python.
+This package is part of the signal-processing and machine learning toolbox
+Bob_.  It provides a simple mechanism for using Bob_, or extending Bob_ by
+building packages using either a pure Python API, or even a mix of C++ and
+python.
 
 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.
+
+Follow our `binary installation`_ instructions.  Then, using the Python
+interpreter inside that distribution, bootstrap and buildout this package::
+
+  $ python bootstrap-buildout.py
+  $ ./bin/buildout
+
 
 Documentation
 -------------
-For further documentation on this package, please read the `Stable Version <http://pythonhosted.org/bob.extension/index.html>`_ or the `Latest Version <https://www.idiap.ch/software/bob/docs/latest/bioidiap/bob.extension/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.
 
+For further documentation on this package, please read the `Stable Version`_ or
+the `Latest Version`_ 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
+.. _binary installation: https://gitlab.idiap.ch/bob/bob/wikis/Binary-Installation
+.. _stable version: http://pythonhosted.org/bob.extension/index.html
+.. _latest version: https://www.idiap.ch/software/bob/docs/latest/bioidiap/bob.extension/master/index.html
diff --git a/bob/extension/scripts/new_version.py b/bob/extension/scripts/new_version.py
index a6556772d8c84ff71fba61ee5ca3e79d92b18de1..96b033830ca116c8512e33148de63808234d43d3 100755
--- a/bob/extension/scripts/new_version.py
+++ b/bob/extension/scripts/new_version.py
@@ -7,9 +7,9 @@ GitHub and PyPI, and update the new version of the package to the given
 
 It assumes that you are in the main directory of the package and have
 successfully ran bootstrap, and that you have submitted all changes that should
-go into the new version. Preferably, the build on Travis passed. For database 
-packages, it also assumes that the '.sql3' file has been generated (if any). 
-Further, it assumes that the 'stable' version has not yet been uploaded to 
+go into the new version. Preferably, the build on Travis passed. For database
+packages, it also assumes that the '.sql3' file has been generated (if any).
+Further, it assumes that the 'stable' version has not yet been uploaded to
 PyPI, and that no GitHub tag with this version exists.
 
 The 'stable' version (i.e., what will be downloadable from PyPI) can be
@@ -18,8 +18,8 @@ current version of the package, but not lower than that.
 The 'latest' version (i.e., what will be the new master branch on GitHub)
 must be higher than the current and than the stable version.
 
-By default, both versions can be automatically computed from the 'current' 
-version, which is read from the 'version.txt' file. In this case, the 
+By default, both versions can be automatically computed from the 'current'
+version, which is read from the 'version.txt' file. In this case, the
 'stable' version will be the 'current' version without the trailing beta
 indicator, and the 'latest' version will be 1 patch level above the 'current'
 version, with the beta indicator 0, for example:
@@ -60,12 +60,12 @@ Examples:
 
 
   Print out, what would be done using the '--dry-run' option:
-  
+
     %(prog)s -q
 
 
   Do everything automatically (assumes a proper version.txt file):
-  
+
     %(prog)s -vv
 """
 
@@ -208,12 +208,12 @@ def main(command_line_options = None):
     if args.stable_version is not None and Version(args.stable_version) > Version(current_version):
       print ("\nReplacing branch tag in README.rst to '%s'"%('v'+args.stable_version))
       _update_readme(args.stable_version)
-      # update stable version on github
+      # update stable version on git
       run_commands(args.stable_version, ['git', 'add', 'version.txt', 'README.rst'], ['git', 'commit', '-m', 'Increased stable version to %s' % args.stable_version])
     else:
       # assure that we have the current version
       args.stable_version = current_version
-    # add a github tag
+    # add a git tag
     print ("\nTagging version '%s'" % args.stable_version)
     run_commands(None, ['git', 'tag', 'v%s' % args.stable_version], ['git', 'push', '--tags'])
 
@@ -233,7 +233,7 @@ def main(command_line_options = None):
 
   if 'pypi' in args.steps:
     print ("\nUploading version '%s' to PyPI" % args.stable_version)
-    # update version on github and add a tag
+    # update version on git and add a tag
     run_commands(None, [python_cmd, 'setup.py', 'register'], [python_cmd, 'setup.py', 'sdist', '--formats', 'zip', 'upload'])
 
 
diff --git a/bob/extension/test_extensions.py b/bob/extension/test_extensions.py
index cad524f62cd94a1752a1854079accd1775947762..46ea54b77dcb2055631ce200ecdd0fbc5663abe4 100644
--- a/bob/extension/test_extensions.py
+++ b/bob/extension/test_extensions.py
@@ -20,7 +20,7 @@ def _run(package, run_call):
   if os.path.exists(local_file):
     example_url = 'file://' + local_file
   else:
-    example_url = "https://github.com/bioidiap/bob.extension/raw/master/examples/bob.example.%s.tar.bz2"%package
+    example_url = "https://gitlab.idiap.ch/bob/bob.extension/raw/master/examples/bob.example.%s.tar.bz2"%package
   temp_dir = tempfile.mkdtemp(prefix="bob_test")
   local_archive = os.path.join(temp_dir, "bob.example.%s.tar.bz2"%package)
   print ("Downloading package '%s'" % example_url)
diff --git a/buildout.cfg b/buildout.cfg
index c5e7f37c148ae400a4460bda18da33750caa8d14..1d9d9ec339449596530c15b7648394c4a0d90b65 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -1,5 +1,4 @@
 ; vim: set fileencoding=utf-8 :
-; Andre Anjos <andre.anjos@idiap.ch>
 ; Mon 16 Apr 08:29:18 2012 CEST
 
 [buildout]
diff --git a/doc/extension.rst b/doc/extension.rst
index a013946cef3b64a89833c5e9855fdf70cdab32e0..a67c9944f380d38fdbb134162923d792e9f1462c 100644
--- a/doc/extension.rst
+++ b/doc/extension.rst
@@ -23,7 +23,7 @@ You can check it out by:
 
 .. code-block:: sh
 
-  $ wget https://github.com/bioidiap/bob.extension/raw/master/examples/bob.example.extension.tar.bz2
+  $ wget https://gitlab.idiap.ch/bo/bob.extension/raw/master/examples/bob.example.extension.tar.bz2
   $ tar -xjf bob.example.extension.tar.bz2
   $ cd bob.example.extension
 
@@ -187,7 +187,7 @@ Again, a complete example can be downloaded via:
 
 .. code-block:: sh
 
-  $ wget https://github.com/bioidiap/bob.extension/raw/master/examples/bob.example.library.tar.bz2
+  $ wget https://gitlab.idiap.ch/bob/bob.extension/raw/master/examples/bob.example.library.tar.bz2
   $ tar -xjf bob.example.library.tar.bz2
   $ cd bob.example.library
 
@@ -259,7 +259,7 @@ No worries, if the library is not used in the extension, the linker should be ab
 
 You can also export your Python bindings to be used in other libraries.
 Unfortunately, this is an extremely tedious process and is not explained in detail here.
-As an example, you might want (or maybe not) to have a look into `bob.blitz/bob/blitz/include/bob.blitz/capi.h <https://github.com/bioidiap/bob.blitz/blob/master/bob/blitz/include/bob.blitz/capi.h>`_.
+As an example, you might want (or maybe not) to have a look into `bob.blitz/bob/blitz/include/bob.blitz/capi.h <https://gitlab.idiap.ch/bob/bob.blitz/blob/master/bob/blitz/include/bob.blitz/capi.h>`_.
 
 
 Compiling your Library and Extension
diff --git a/doc/guide.rst b/doc/guide.rst
index cb93a44360896db89662c2ae19c1700f95564bfd..bf7660227d625287b0ba0f228db7cd2f9b3747a7 100644
--- a/doc/guide.rst
+++ b/doc/guide.rst
@@ -35,7 +35,7 @@ Fire-up a shell window and than do this:
 
 .. code-block:: sh
 
-  $ wget https://github.com/bioidiap/bob.extension/raw/master/examples/bob.example.project.tar.bz2
+  $ wget https://gitlab.idiap.ch/bob/bob.extension/raw/master/examples/bob.example.project.tar.bz2
   $ tar -xjf bob.example.project.tar.bz2
   $ cd bob.example.project
 
@@ -145,7 +145,7 @@ Here is how to go from nothing to everything:
   If you just want to get things rolling, using ``python bootstrap-buildout.py`` will, in most cases, do the right thing.
 
 .. note::
-   When you have installed an older version of |project| -- i.e. |project| v1.x, you might need to uninstall it first, see https://github.com/idiap/bob/wiki/Installation.
+   When you have installed an older version of |project| -- i.e. |project| v1.x, you might need to uninstall it first, see https://gitlab.idiap.ch/bob/bob/wikis/Installation.
 
 
 
@@ -261,7 +261,7 @@ It can be simply set up:
              .
 
    [sources]
-   bob.blitz = git https://github.com/bioidiap/bob.blitz
+   bob.blitz = git https://gitlab.idiap.ch/bob/bob.blitz
 
    ...
 
@@ -503,7 +503,7 @@ Here is a set of steps we recommend you follow when releasing a new version of y
 
    In this fictitious representation, the ``master`` branch continue under development, but one can see older branches don't receive much attention anymore.
 
-   Here is an example for creating a branch at github (many of our satellite packages are hosted there).
+   Here is an example for creating a branch at gitlab (many of our satellite packages are hosted there).
    Let's create a branch called ``1.1``::
 
    .. code-block:: sh
@@ -513,7 +513,7 @@ Here is a set of steps we recommend you follow when releasing a new version of y
      $ git push origin 1.1
 
 3. When you decide to release something publicly, we recommend you **tag** the version of the package on your repository, so you have a marker to what code you actually published on PyPI.
-   Tagging on github would go like this::
+   Tagging on gitlab would go like this::
 
    .. code-block:: sh
 
diff --git a/doc/links.rst b/doc/links.rst
index 127373004148c497c31e66e22a05c62f22e6c64b..95ddbd6907813de19f4b5a03bc928b86d7b434d8 100644
--- a/doc/links.rst
+++ b/doc/links.rst
@@ -9,14 +9,14 @@
 .. _c++: http://www2.research.att.com/~bs/C++.html
 .. _distutils: http://docs.python.org/distutils/
 .. _git: http://git-scm.com/
-.. _github: http://github.com/
+.. _gitlab: http://gitlab.idiap.ch/
 .. _idiap: http://www.idiap.ch
 .. _ipython: http://ipython.scipy.org
 .. _nose: https://nose.readthedocs.org/en/latest/
 .. _pep 386: http://www.python.org/dev/peps/pep-0386/
 .. _python: http://www.python.org
 .. _pypi: http://pypi.python.org
-.. _satellite packages: https://github.com/idiap/bob/wiki/Packages
+.. _satellite packages: https://gitlab.idiap.ch/bob/bob/wikis/Packages
 .. _setuptools: http://trac.edgewall.org/wiki/setuptools
 .. _sphinx: http://sphinx.pocoo.org
 .. _zc.buildout: http://pypi.python.org/pypi/zc.buildout/
diff --git a/examples/bob.example.extension/README.rst b/examples/bob.example.extension/README.rst
index 92335dac2ab1a8d17ba3d542dae576bb846e9be1..86c0220ca0c790188ed1ba3875957549e313dc14 100644
--- a/examples/bob.example.extension/README.rst
+++ b/examples/bob.example.extension/README.rst
@@ -13,16 +13,18 @@ Installation
 .. note::
 
   To follow these instructions locally you will need a local copy of this
-  package. For that, you can use the github tarball API to download the package::
+  package. For that, you can use the github tarball API to download the
+  package::
 
-    $ wget --no-check-certificate https://github.com/idiap/bob.project.example/tarball/master -O- | tar xz 
+    $ wget --no-check-certificate https://gitlab.idiap.ch/bob/bob.project.example/tarball/master -O- | tar xz
     $ mv idiap-bob.project* bob.project.example
 
 Documentation and Further Information
 -------------------------------------
 
 Please refer to the latest Bob user guide, accessing from the `Bob website
-<http://idiap.github.com/bob/>`_ for how to create your own packages based on
-this example. In particular, the Section entitled `Organize Your Work in
-Satellite Packages <http://www.idiap.ch/software/bob/docs/releases/last/sphinx/html/OrganizeYourCode.html>`_ 
+<http://www.idiap.ch/software/bob>`_ for how to create your own packages based
+on this example. In particular, the Section entitled `Organize Your Work in
+Satellite Packages
+<http://www.idiap.ch/software/bob/docs/releases/last/sphinx/html/OrganizeYourCode.html>`_
 contains details on how to setup, build and roll out your code.
diff --git a/examples/bob.example.extension/setup.py b/examples/bob.example.extension/setup.py
index 51a8b1d41dfe29daee9425afaa813c6262abffa7..2762ad8d5f96029ce66ecc3c7f646c840f81364e 100644
--- a/examples/bob.example.extension/setup.py
+++ b/examples/bob.example.extension/setup.py
@@ -63,7 +63,7 @@ setup(
     version = version,
     description = 'Example for using Bob inside a C++ extension of a buildout project',
 
-    url = 'https://www.github.com/<YourInstitution>/<YourPackage>',
+    url = 'https://github.com/<YourInstitution>/<YourPackage>',
     license = 'GPLv3',
     author = '<YourName>',
     author_email='<YourEmail>',
diff --git a/examples/bob.example.library/README.rst b/examples/bob.example.library/README.rst
index 92335dac2ab1a8d17ba3d542dae576bb846e9be1..452f88586cd8a2a97e89513603422b3bebf21356 100644
--- a/examples/bob.example.library/README.rst
+++ b/examples/bob.example.library/README.rst
@@ -13,16 +13,18 @@ Installation
 .. note::
 
   To follow these instructions locally you will need a local copy of this
-  package. For that, you can use the github tarball API to download the package::
+  package. For that, you can use the gitlab tarball API to download the
+  package::
 
-    $ wget --no-check-certificate https://github.com/idiap/bob.project.example/tarball/master -O- | tar xz 
+    $ wget --no-check-certificate https://gitlab.idiap.ch/bob/bob.project.example/tarball/master -O- | tar xz
     $ mv idiap-bob.project* bob.project.example
 
 Documentation and Further Information
 -------------------------------------
 
 Please refer to the latest Bob user guide, accessing from the `Bob website
-<http://idiap.github.com/bob/>`_ for how to create your own packages based on
-this example. In particular, the Section entitled `Organize Your Work in
-Satellite Packages <http://www.idiap.ch/software/bob/docs/releases/last/sphinx/html/OrganizeYourCode.html>`_ 
+<http://www.idiap.ch/software/bob>`_ for how to create your own packages based
+on this example. In particular, the Section entitled `Organize Your Work in
+Satellite Packages
+<http://www.idiap.ch/software/bob/docs/releases/last/sphinx/html/OrganizeYourCode.html>`_
 contains details on how to setup, build and roll out your code.
diff --git a/examples/bob.example.library/setup.py b/examples/bob.example.library/setup.py
index 69a73afe5a49e2f88a0bbaea7b3efc534f93be31..69ccc08f1ca15fc5b032e93966fd1027cff625b3 100644
--- a/examples/bob.example.library/setup.py
+++ b/examples/bob.example.library/setup.py
@@ -61,7 +61,7 @@ setup(
     version = version,
     description = 'Example for using Bob inside a C++ extension of a buildout project',
 
-    url = 'https://www.github.com/<YourInstitution>/<YourPackage>',
+    url = 'https://github.com/<YourInstitution>/<YourPackage>',
     license = 'GPLv3',
     author = '<YourName>',
     author_email='<YourEmail>',
diff --git a/examples/bob.example.project/README.rst b/examples/bob.example.project/README.rst
index 4be01aeb69276e8a8623cfded4f7b8a535dcafcb..1747417afba3d699eba49f3715e143e47d44d9f1 100644
--- a/examples/bob.example.project/README.rst
+++ b/examples/bob.example.project/README.rst
@@ -13,16 +13,17 @@ Installation
 .. note::
 
   To follow these instructions locally you will need a local copy of this
-  package. For that, you can use the github tarball API to download the package::
+  package. For that, you can use the gitlab tarball API to download the
+  package::
 
-    $ wget --no-check-certificate https://github.com/idiap/bob.project.example/tarball/master -O- | tar xz
+    $ wget --no-check-certificate https://gitlab.idiap.ch/bob/bob.project.example/tarball/master -O- | tar xz
     $ mv idiap-bob.project* bob.project.example
 
 Documentation and Further Information
 -------------------------------------
 
 Please refer to the latest Bob user guide, accessing from the `Bob website
-<http://idiap.github.com/bob/>`_ for how to create your own packages based on
+<http://www.idiap.ch/software/bob/>`_ for how to create your own packages based on
 this example. In particular, the Section entitled `Organize Your Work in
 Satellite Packages <http://www.idiap.ch/software/bob/docs/releases/last/sphinx/html/OrganizeYourCode.html>`_
 contains details on how to setup, build and roll out your code.
diff --git a/examples/bob.example.project/setup.py b/examples/bob.example.project/setup.py
index 392212b356c23d9b580a8debdfd98516c715b4b7..a95214de9178d255e72304d43844e583c1f7ff19 100644
--- a/examples/bob.example.project/setup.py
+++ b/examples/bob.example.project/setup.py
@@ -50,7 +50,7 @@ setup(
     version = open("version.txt").read().rstrip(),
     description = 'Example for using Bob inside a buildout project',
 
-    url = 'https://www.github.com/<YourInstitution>/<YourPackage>',
+    url = 'https://github.com/<YourInstitution>/<YourPackage>',
     license = 'GPLv3',
     author = '<YourName>',
     author_email = '<YourEmail>',
diff --git a/scripts/upload-sphinx.sh b/scripts/upload-sphinx.sh
index ad41b8fcbd689f52d472cd2ed283295bf76b23bb..47d47ef9bf52ae5e56a75ddfdf8d3e43df0ecaa1 100755
--- a/scripts/upload-sphinx.sh
+++ b/scripts/upload-sphinx.sh
@@ -1,11 +1,5 @@
 #!/usr/bin/env bash
 
-# some checks
-if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then
-  echo "This is a pull request - not uploading documentation";
-  exit 0
-fi
-
 if [ -z "${DOCUSER}" ] || [ -z "${DOCPASS}" ] || [ -z "${BOB_DOCUMENTATION_SERVER}" ]; then
   echo "Server username and/or password undefined - not uploading documentation";
   exit 0
@@ -20,17 +14,17 @@ fi
 
 echo "Detected branch '$branch' to be master branch -- uploading wheel to Idiap servers"
 
-info=sphinx/.travis.info
-codename=$(basename ${TRAVIS_REPO_SLUG})-${TRAVIS_COMMIT}
+info=sphinx/.gitlab-ci.info
+codename=$(basename ${CI_PROJECT_NAME})-${CI_BUILD_REF}
 server=https://${DOCUSER}:${DOCPASS}@www.idiap.ch/software/bob/docs-upload/
 
 # annotate
-echo "repo=${TRAVIS_REPO_SLUG}"   >> ${info}
-echo "branch=${TRAVIS_BRANCH}"    >> ${info}
-echo "tag=${TRAVIS_TAG}"          >> ${info}
-echo "build=${TRAVIS_JOB_NUMBER}" >> ${info}
-echo "commit=${TRAVIS_COMMIT}"    >> ${info}
-echo "os=${TRAVIS_OS_NAME}"       >> ${info}
+echo "repo=${CI_PROJECT_PATH}" >> ${info}
+echo "branch=${CI_BUILD_REF_NAME}" >> ${info}
+echo "tag=${CI_BUILD_TAG}" >> ${info}
+echo "build=${CI_BUILD_ID}" >> ${info}
+echo "commit=${CI_BUILD_REF}" >> ${info}
+echo "runner=${CI_RUNNER_DESCRIPTION}" >> ${info}
 
 # compress
 tar cfj ${codename}.tar.bz2 sphinx
diff --git a/scripts/upload-wheel.sh b/scripts/upload-wheel.sh
index db7b3db7d167048e168ee8d9afcc394a2ed2b0bf..fe562424a3ffb02b5a585a8469e67c649e2769b4 100755
--- a/scripts/upload-wheel.sh
+++ b/scripts/upload-wheel.sh
@@ -1,11 +1,5 @@
 #!/usr/bin/env bash
 
-# some checks
-if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then
-  echo "This is a pull request - not uploading wheel";
-  exit 0
-fi
-
 if [ -z "${DOCUSER}" ] || [ -z "${DOCPASS}" ] || [ -z "${BOB_UPLOAD_WHEEL}" ]; then
   echo "Server username and/or password undefined - not uploading wheel";
   exit 0
@@ -28,9 +22,9 @@ bin/python setup.py bdist_wheel -d wheel $WHEEL_OPTION
 
 # uplaod wheel
 wheel=`find wheel -name "*.whl"`
-server=https://${DOCUSER}:${DOCPASS}@www.idiap.ch/software/bob/wheels-upload/travis/
+server=https://${DOCUSER}:${DOCPASS}@www.idiap.ch/software/bob/wheels-upload/${CI_RUNNER_TAGS}/
 
-echo -e "\n\nUploading wheel $wheel to server https://www.idiap.ch/software/bob/wheels-upload/travis/"
+echo -e "\n\nUploading wheel $wheel to server https://www.idiap.ch/software/bob/wheels-upload/${CI_RUNNER_TAGS}/"
 
 # send
 curl --silent --insecure --upload-file $wheel ${server}
diff --git a/setup.py b/setup.py
index 75a1c729ceef9b9dcb237caf6cd191b51a2f923a..4f96474a18e9ecb07c0f40ae1b9a2a21ff860855 100644
--- a/setup.py
+++ b/setup.py
@@ -11,17 +11,17 @@ from setuptools import setup, find_packages
 # Define package version
 version = open("version.txt").read().rstrip()
 
-requiries = ['setuptools']
+requires = ['setuptools']
 import sys
 if sys.version_info[0] == 2 and sys.version_info[1] <= 6:
-  requiries.append('importlib')
+  requires.append('importlib')
 
 setup(
 
     name="bob.extension",
     version=version,
     description="Building of Python/C++ extensions for Bob",
-    url='http://github.com/bioidiap/bob.extension',
+    url='http://gitlab.idiap.ch/bob/bob.extension',
     license="BSD",
     author='Andre Anjos',
     author_email='andre.anjos@idiap.ch',
@@ -33,7 +33,7 @@ setup(
 
 
 
-    install_requires=requiries,
+    install_requires=requires,
 
     entry_points = {
       'console_scripts': [