diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1515754e0bef52e755e793e05c3400ecf532c4c7..1daa2300fc671ed82d211795f4abe5f019b8d7fe 100644 --- a/.pre-commit-config.yaml +++ b/.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 diff --git a/bob/bio/gmm/algorithm/GMM.py b/bob/bio/gmm/algorithm/GMM.py index 48db4e569e4d98b590bb0553d3da550f4b1f7d2f..aa8ef6252c72f83f16dfb70c35b3a9e5b652756f 100644 --- a/bob/bio/gmm/algorithm/GMM.py +++ b/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 ( diff --git a/bob/bio/gmm/test/test_gmm.py b/bob/bio/gmm/test/test_gmm.py index 2ecde26fa8421750e82e4fbfc0728cbe7b8032b1..d696329cf89b270e3daa035f0e118aa2292b81a5 100644 --- a/bob/bio/gmm/test/test_gmm.py +++ b/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() diff --git a/doc/conf.py b/doc/conf.py index 3c6efbb79fd86d617adc600058b61a150c6d7f86..3729d3848600a589247377d227cca9fcaa51d5f5 100644 --- a/doc/conf.py +++ b/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 --------------------------------------------------------