From 734379ec9c7b46e3580c16264e4f3689390d8d36 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Sat, 22 Aug 2009 17:50:57 -0700 Subject: [PATCH] Move data files to common directory. --- scikits/image/__init__.py | 4 ++++ scikits/image/filter/tests/test_lpi_filter.py | 3 +-- scikits/image/{filter => }/tests/data/camera.png | Bin 3 files changed, 5 insertions(+), 2 deletions(-) rename scikits/image/{filter => }/tests/data/camera.png (100%) diff --git a/scikits/image/__init__.py b/scikits/image/__init__.py index e69de29b..b5250bd4 100644 --- a/scikits/image/__init__.py +++ b/scikits/image/__init__.py @@ -0,0 +1,4 @@ +import os.path + +data_dir = os.path.join(os.path.dirname(__file__), 'tests/data') + diff --git a/scikits/image/filter/tests/test_lpi_filter.py b/scikits/image/filter/tests/test_lpi_filter.py index 818cfa56..13f8fd2f 100644 --- a/scikits/image/filter/tests/test_lpi_filter.py +++ b/scikits/image/filter/tests/test_lpi_filter.py @@ -3,11 +3,10 @@ import os.path import numpy as np from numpy.testing import * +from scikits.image import data_dir from scikits.image.io import * from scikits.image.filter import * -data_dir = os.path.join(os.path.dirname(__file__), './data/') - class TestLPIFilter2D(): img = imread(os.path.join(data_dir, 'camera.png'), flatten=True)[:-101,:-100] diff --git a/scikits/image/filter/tests/data/camera.png b/scikits/image/tests/data/camera.png similarity index 100% rename from scikits/image/filter/tests/data/camera.png rename to scikits/image/tests/data/camera.png