Merge branch 'pipeline-rename' into 'master'

Fixes due to API changes in bob.bio.base

See merge request !33

.pre-commit-config.yaml

@@ -2,12 +2,12 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/timothycrosley/isort
-    rev: 5.9.3
+    rev: 5.10.1
     hooks:
       - id: isort
         args: [--settings-path, "pyproject.toml"]
   - repo: https://github.com/psf/black
-    rev: 21.7b0
+    rev: 22.3.0
     hooks:
       - id: black
   - repo: https://gitlab.com/pycqa/flake8
@@ -15,7 +15,7 @@ repos:
     hooks:
       - id: flake8
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.1.0
     hooks:
       - id: check-ast
       - id: check-case-conflict

bob/bio/gmm/algorithm/GMM.py

@@ -21,7 +21,7 @@ import numpy as np
 from h5py import File as HDF5File
 from sklearn.base import BaseEstimator
 
-from bob.bio.base.pipelines.vanilla_biometrics import BioAlgorithm
+from bob.bio.base.pipelines import BioAlgorithm
 from bob.learn.em import GMMMachine, GMMStats, KMeansMachine, linear_scoring
 
 logger = logging.getLogger(__name__)
@@ -111,6 +111,7 @@ class GMM(BioAlgorithm, BaseEstimator):
         scoring_function
             Function returning a score from a model, a UBM, and a probe.
         """
+        super().__init__(**kwargs)
 
         # Copy parameters
         self.number_of_gaussians = number_of_gaussians
@@ -140,8 +141,6 @@ class GMM(BioAlgorithm, BaseEstimator):
 
         self.ubm = None
 
-        super().__init__(**kwargs)
-
     def _check_feature(self, feature):
         """Checks that the features are appropriate"""
         if (

bob/bio/gmm/test/test_gmm.py

@@ -44,7 +44,7 @@ def test_class():
     assert isinstance(gmm1, GMM)
     assert isinstance(
         gmm1,
-        bob.bio.base.pipelines.vanilla_biometrics.abstract_classes.BioAlgorithm,
+        bob.bio.base.pipelines.BioAlgorithm,
     )
     assert gmm1.number_of_gaussians == 512
     assert "bob_fit_supports_dask_array" in gmm1._get_tags()

doc/conf.py

@@ -77,9 +77,9 @@ source_suffix = ".rst"
 master_doc = "index"
 
 # General information about the project.
-project = u"bob.bio.gmm"
+project = "bob.bio.gmm"
 
-copyright = u"%s, Idiap Research Institute" % time.strftime("%Y")
+copyright = "%s, Idiap Research Institute" % time.strftime("%Y")
 
 # Grab the setup entry
 distribution = pkg_resources.require(project)[0]
@@ -129,8 +129,8 @@ pygments_style = "sphinx"
 
 # Some variables which are useful for generated material
 project_variable = project.replace(".", "_")
-short_description = u"Tools for running biometric recognition experiments using GMM-based approximation"
-owner = [u"Idiap Research Institute"]
+short_description = "Tools for running biometric recognition experiments using GMM-based approximation"
+owner = ["Idiap Research Institute"]
 
 
 # -- Options for HTML output ---------------------------------------------------
@@ -210,7 +210,7 @@ html_favicon = "img/favicon.ico"
 # html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = project_variable + u"_doc"
+htmlhelp_basename = project_variable + "_doc"
 
 
 # -- Post configuration --------------------------------------------------------