Merge branch 'gevent' into 'master'

Gevent

Remove threading support, use gevent.

See merge request !7

.gitlab-ci.yml

@@ -2,12 +2,10 @@ py27-linux:
   script:
   - git clean -ffdx
   - export TMPDIR=/var/tmp
-  - /idiap/project/beat/environments/staging/usr/bin/python bootstrap-buildout.py
+  - /idiap/project/beat/environments/staging/usr/bin/python bootstrap-buildout.py --setuptools-version=`/idiap/project/beat/environments/staging/usr/bin/python -c 'import setuptools; print(setuptools.__version__)'`
   - ./bin/buildout
   - ./bin/python --version
   - unset TMPDIR
-  - cd src/cpulimit && make && cd -
-  - cd bin && ln -s ../src/cpulimit/src/cpulimit . && cd -
   - export NOSE_WITH_COVERAGE=1
   - export NOSE_COVER_PACKAGE=beat.cmdline
   - ./bin/nosetests -sv
@@ -19,11 +17,9 @@ py27-linux:
 py27-macosx:
   script:
   - git clean -ffdx
-  - /Users/buildbot/work/environments/beat/py27/bin/python bootstrap-buildout.py
+  - /Users/buildbot/work/environments/beat/py27/bin/python bootstrap-buildout.py --setuptools-version=`/Users/buildbot/work/environments/beat/py27/bin/python -c 'import setuptools; print(setuptools.__version__)'`
   - ./bin/buildout
   - ./bin/python --version
-  - cd src/cpulimit && make && cd -
-  - cd bin && ln -s ../src/cpulimit/src/cpulimit . && cd -
   - export NOSE_WITH_COVERAGE=1
   - export NOSE_COVER_PACKAGE=beat.cmdline
   - ./bin/nosetests -sv

README.rst

@@ -28,6 +28,24 @@
 This package contains the source code for a python-based command-line client
 for the BEAT platform.
 
+Dependence Status
+-----------------
+
+Before checking-out sources, make sure of the project health as per table
+below:
+
+.. |beat.cmdline-status| image:: https://gitlab.idiap.ch/ci/projects/5/status.png?ref=master
+   :target: https://gitlab.idiap.ch/ci/projects/5?ref=master
+
+.. |beat.core-status| image:: https://gitlab.idiap.ch/ci/projects/2/status.png?ref=master
+   :target: https://gitlab.idiap.ch/ci/projects/2?ref=master
+
+============================= ========================
+      Package                  Status (master branch)
+============================= ========================
+ beat.core                     |beat.core-status|
+ beat.cmdline (this package)   |beat.cmdline-status|
+============================= ========================
 
 Installation
 ------------

beat/cmdline/experiments.py

@@ -293,7 +293,6 @@ def caches(configuration, name, ls, delete, checksum):
 
     if ls:
       for g in glob.glob(k + '.*'): logger.info(g)
-      return 0
 
     if delete:
 
@@ -302,12 +301,12 @@ def caches(configuration, name, ls, delete, checksum):
         os.unlink(g)
 
       common.recursive_rmdir_if_empty(os.path.dirname(k), configuration.cache)
-      return 0
 
     if checksum:
       assert load_data_index(configuration.cache, k + '.data')
       logger.info("index for `%s' can be loaded and checksums", k)
-      return 0
+
+  return 0
 
 
 def pull(webapi, prefix, names, force, indentation, format_cache):

buildout.cfg

@@ -3,7 +3,7 @@
 ; Tue 02 Jun 2015 13:05:59 CEST
 
 [buildout]
-parts = scripts
+parts = scripts cpulimit
 extensions = mr.developer
 auto-checkout = *
 develop = .
@@ -17,5 +17,13 @@ beat.core = git git@gitlab.idiap.ch:beat/beat.core
 beat.backend.python = git git@gitlab.idiap.ch:beat/beat.backend.python
 cpulimit = git https://github.com/opsengine/cpulimit rev=v0.2 egg=false
 
+[cpulimit]
+recipe = collective.recipe.cmd
+cmds = make -C src/cpulimit
+       cd bin && ln -s ../src/cpulimit/src/cpulimit && cd ..
+uninstall_cmds = rm -f bin/cpulimit
+on_install = true
+on_update = true
+
 [scripts]
 recipe = bob.buildout:scripts

doc/conf.py

@@ -56,7 +56,6 @@ extensions = [
     'sphinx.ext.graphviz',
     'sphinx.ext.napoleon',
     'sphinx.ext.viewcode',
-    'sphinx_numfig',
     'sphinxcontrib.ansi',
     'sphinxcontrib.programoutput',
 
@@ -65,6 +64,9 @@ extensions = [
 # Always includes todos
 todo_include_todos = True
 
+# Create numbers on figures with captions
+numfig = True
+
 # Generates auto-summary automatically
 autosummary_generate = True
 

setup.py

@@ -36,7 +36,7 @@ from setuptools import setup, find_packages
 setup(
 
     name='beat.cmdline',
-    version='1.0.0',
+    version='1.0.1rc2',
     description='Biometrics Evaluation and Testing Platform (Command-Line Client)',
     url='https://gitlab.idiap.ch/beat/beat.cmdline',
     license='AGPLv3',
@@ -61,7 +61,7 @@ setup(
       "oset",
       "termcolor",
       "sphinx",
-      "sphinx-numfig",
+      "sphinx-rtd-theme",
       "sphinxcontrib-ansi",
       "sphinxcontrib-programoutput",
     ],