From 7e16736fd3bf16f57f28a0f5a3c2b659440fade8 Mon Sep 17 00:00:00 2001
From: Manuel Guenther <manuel.guenther@idiap.ch>
Date: Fri, 29 Aug 2014 13:18:04 +0200
Subject: [PATCH] Re-ordered test files to fit to other packages.
---
MANIFEST.in | 2 +-
.../faceverify/{tests => data}/dct_feature.hdf5 | Bin
.../faceverify/{tests => data}/dct_model.hdf5 | Bin
.../faceverify/{tests => data}/dct_probe.hdf5 | Bin
bob/example/faceverify/{tests => data}/dct_ubm.hdf5 | Bin
.../faceverify/{tests => data}/gabor_model.hdf5 | Bin
.../faceverify/{tests => data}/gabor_probe.hdf5 | Bin
.../faceverify/{tests => data}/pca_model.hdf5 | Bin
.../faceverify/{tests => data}/pca_probe.hdf5 | Bin
.../faceverify/{tests => data}/pca_projector.hdf5 | Bin
.../faceverify/{tests/__init__.py => tests.py} | 6 +++---
11 files changed, 4 insertions(+), 4 deletions(-)
rename bob/example/faceverify/{tests => data}/dct_feature.hdf5 (100%)
rename bob/example/faceverify/{tests => data}/dct_model.hdf5 (100%)
rename bob/example/faceverify/{tests => data}/dct_probe.hdf5 (100%)
rename bob/example/faceverify/{tests => data}/dct_ubm.hdf5 (100%)
rename bob/example/faceverify/{tests => data}/gabor_model.hdf5 (100%)
rename bob/example/faceverify/{tests => data}/gabor_probe.hdf5 (100%)
rename bob/example/faceverify/{tests => data}/pca_model.hdf5 (100%)
rename bob/example/faceverify/{tests => data}/pca_probe.hdf5 (100%)
rename bob/example/faceverify/{tests => data}/pca_projector.hdf5 (100%)
rename bob/example/faceverify/{tests/__init__.py => tests.py} (98%)
diff --git a/MANIFEST.in b/MANIFEST.in
index 7102944..6ad42f1 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,5 +2,5 @@ include README.rst
include bootstrap.py
include buildout.cfg
recursive-include doc *.rst *.png conf.py
-recursive-include bob/example/faceverify/tests *.hdf5
+recursive-include bob/example/faceverify/data *.hdf5
diff --git a/bob/example/faceverify/tests/dct_feature.hdf5 b/bob/example/faceverify/data/dct_feature.hdf5
similarity index 100%
rename from bob/example/faceverify/tests/dct_feature.hdf5
rename to bob/example/faceverify/data/dct_feature.hdf5
diff --git a/bob/example/faceverify/tests/dct_model.hdf5 b/bob/example/faceverify/data/dct_model.hdf5
similarity index 100%
rename from bob/example/faceverify/tests/dct_model.hdf5
rename to bob/example/faceverify/data/dct_model.hdf5
diff --git a/bob/example/faceverify/tests/dct_probe.hdf5 b/bob/example/faceverify/data/dct_probe.hdf5
similarity index 100%
rename from bob/example/faceverify/tests/dct_probe.hdf5
rename to bob/example/faceverify/data/dct_probe.hdf5
diff --git a/bob/example/faceverify/tests/dct_ubm.hdf5 b/bob/example/faceverify/data/dct_ubm.hdf5
similarity index 100%
rename from bob/example/faceverify/tests/dct_ubm.hdf5
rename to bob/example/faceverify/data/dct_ubm.hdf5
diff --git a/bob/example/faceverify/tests/gabor_model.hdf5 b/bob/example/faceverify/data/gabor_model.hdf5
similarity index 100%
rename from bob/example/faceverify/tests/gabor_model.hdf5
rename to bob/example/faceverify/data/gabor_model.hdf5
diff --git a/bob/example/faceverify/tests/gabor_probe.hdf5 b/bob/example/faceverify/data/gabor_probe.hdf5
similarity index 100%
rename from bob/example/faceverify/tests/gabor_probe.hdf5
rename to bob/example/faceverify/data/gabor_probe.hdf5
diff --git a/bob/example/faceverify/tests/pca_model.hdf5 b/bob/example/faceverify/data/pca_model.hdf5
similarity index 100%
rename from bob/example/faceverify/tests/pca_model.hdf5
rename to bob/example/faceverify/data/pca_model.hdf5
diff --git a/bob/example/faceverify/tests/pca_probe.hdf5 b/bob/example/faceverify/data/pca_probe.hdf5
similarity index 100%
rename from bob/example/faceverify/tests/pca_probe.hdf5
rename to bob/example/faceverify/data/pca_probe.hdf5
diff --git a/bob/example/faceverify/tests/pca_projector.hdf5 b/bob/example/faceverify/data/pca_projector.hdf5
similarity index 100%
rename from bob/example/faceverify/tests/pca_projector.hdf5
rename to bob/example/faceverify/data/pca_projector.hdf5
diff --git a/bob/example/faceverify/tests/__init__.py b/bob/example/faceverify/tests.py
similarity index 98%
rename from bob/example/faceverify/tests/__init__.py
rename to bob/example/faceverify/tests.py
index 7437dff..199dd0c 100644
--- a/bob/example/faceverify/tests/__init__.py
+++ b/bob/example/faceverify/tests.py
@@ -25,15 +25,15 @@ import unittest
from nose.plugins.skip import SkipTest
import bob.io.base
+import bob.io.base.test_utils
import bob.learn.linear
import bob.ip.gabor
import bob.learn.misc
-import numpy, numpy.linalg
+import numpy
import bob.db.atnt
-import pkg_resources
import bob.example.faceverify
@@ -64,7 +64,7 @@ class FaceVerifyExampleTest(unittest.TestCase):
shutil.rmtree(self.m_temp_dir)
def resource(self, f):
- return pkg_resources.resource_filename('bob.example.faceverify.tests', f)
+ return bob.io.base.test_utils.datafile(f, 'bob.example.faceverify')
def test00_database(self):
--
GitLab