From 0deba46d26adeb241350bc8ac1fc00e1ce458195 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Wed, 8 Feb 2012 22:38:46 -0500 Subject: [PATCH] Minor fixes to build process. * Fix name error when running setup.py from within main package. * Change `make clean` so that it removes hash files. * Remove unused import. --- Makefile | 2 +- skimage/setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 151dd498..d29d9961 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ all: git update-index --assume-unchanged skimage/version.py clean: - find . -name "*.so" -o -name "*.pyc" | xargs rm -f + find . -name "*.so" -o -name "*.pyc" -o -name "*.pyx.md5" | xargs rm -f test: nosetests skimage diff --git a/skimage/setup.py b/skimage/setup.py index f4b09a56..c26014f8 100644 --- a/skimage/setup.py +++ b/skimage/setup.py @@ -22,7 +22,7 @@ def configuration(parent_package='', top_path=None): config.add_data_dir(dirname) # Add test directories - from os.path import isdir, dirname, join, abspath + from os.path import isdir, dirname, join rel_isdir = lambda d: isdir(join(curpath, d)) curpath = join(dirname(__file__), './') @@ -35,6 +35,6 @@ def configuration(parent_package='', top_path=None): if __name__ == "__main__": from numpy.distutils.core import setup - config = Configuration(top_path='').todict() + config = configuration(top_path='').todict() setup(**config)