From 2231a692ce112f60d358d4a652bb1e61160ab8ca Mon Sep 17 00:00:00 2001
From: Tiago Freitas Pereira <tiagofrepereira@gmail.com>
Date: Tue, 24 Mar 2020 20:22:35 +0100
Subject: [PATCH] Moved some transformers from mixins to transformers module
---
bob/bio/base/mixins/__init__.py | 2 --
bob/bio/base/test/{test_mixins.py => test_transformers.py} | 4 ++--
bob/bio/base/transformers/__init__.py | 2 ++
bob/bio/base/{mixins => transformers}/linearize.py | 0
bob/bio/base/{mixins => transformers}/pca.py | 0
5 files changed, 4 insertions(+), 4 deletions(-)
rename bob/bio/base/test/{test_mixins.py => test_transformers.py} (93%)
create mode 100644 bob/bio/base/transformers/__init__.py
rename bob/bio/base/{mixins => transformers}/linearize.py (100%)
rename bob/bio/base/{mixins => transformers}/pca.py (100%)
diff --git a/bob/bio/base/mixins/__init__.py b/bob/bio/base/mixins/__init__.py
index 729af155..e69de29b 100644
--- a/bob/bio/base/mixins/__init__.py
+++ b/bob/bio/base/mixins/__init__.py
@@ -1,2 +0,0 @@
-from .linearize import Linearize, SampleLinearize, CheckpointSampleLinearize
-from .pca import CheckpointSamplePCA, SamplePCA
diff --git a/bob/bio/base/test/test_mixins.py b/bob/bio/base/test/test_transformers.py
similarity index 93%
rename from bob/bio/base/test/test_mixins.py
rename to bob/bio/base/test/test_transformers.py
index 27701f9d..97d29075 100644
--- a/bob/bio/base/test/test_mixins.py
+++ b/bob/bio/base/test/test_transformers.py
@@ -8,7 +8,7 @@ import numpy
import tempfile
from sklearn.utils.validation import check_is_fitted
-from bob.bio.base.mixins import Linearize, SampleLinearize, CheckpointSampleLinearize
+from bob.bio.base.transformers import Linearize, SampleLinearize, CheckpointSampleLinearize
def test_linearize_processor():
## Test the transformer only
@@ -32,7 +32,7 @@ def test_linearize_processor():
assert os.path.exists(os.path.join(d, "1.h5"))
-from bob.bio.base.mixins import SamplePCA, CheckpointSamplePCA
+from bob.bio.base.transformers import SamplePCA, CheckpointSamplePCA
def test_pca_processor():
## Test wrapped in to a Sample
diff --git a/bob/bio/base/transformers/__init__.py b/bob/bio/base/transformers/__init__.py
new file mode 100644
index 00000000..729af155
--- /dev/null
+++ b/bob/bio/base/transformers/__init__.py
@@ -0,0 +1,2 @@
+from .linearize import Linearize, SampleLinearize, CheckpointSampleLinearize
+from .pca import CheckpointSamplePCA, SamplePCA
diff --git a/bob/bio/base/mixins/linearize.py b/bob/bio/base/transformers/linearize.py
similarity index 100%
rename from bob/bio/base/mixins/linearize.py
rename to bob/bio/base/transformers/linearize.py
diff --git a/bob/bio/base/mixins/pca.py b/bob/bio/base/transformers/pca.py
similarity index 100%
rename from bob/bio/base/mixins/pca.py
rename to bob/bio/base/transformers/pca.py
--
GitLab