diff --git a/.gitignore b/.gitignore index 73f6eebf..5bf732b5 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,6 @@ doc/build source/api build dist -scikits/image/version.py +skimage/version.py *.swp .coverage diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 0cda885d..307379f8 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -25,7 +25,7 @@ - Tony Yu Reading of paletted images; build, bug and doc fixes. - Code to generate scikits-image logo. + Code to generate skimage logo. - Zachary Pincus Tracing of low cost paths, FreeImage I/O plugin @@ -80,4 +80,7 @@ - Neil Yager Skeletonization. - \ No newline at end of file + +- Nelle Varoquaux + Renaming of the package to ``skimage``. + diff --git a/DEVELOPMENT.txt b/DEVELOPMENT.txt index 15c9da92..caebff41 100644 --- a/DEVELOPMENT.txt +++ b/DEVELOPMENT.txt @@ -2,7 +2,7 @@ Development process ------------------- :doc:`Read this overview ` of how to use Git with -``scikits.image``. Here's the long and short of it: +``skimage``. Here's the long and short of it: * Go to `https://github.com/scikits-image/scikits.image `_ and follow the @@ -52,13 +52,13 @@ i.e. statement coverage should be at 100%. $ make coverage -This will print a report with one line for each file in `scikits.image`, +This will print a report with one line for each file in `skimage`, detailing the test coverage:: Name Stmts Exec Cover Missing ------------------------------------------------------------------------------ - scikits/image/color/colorconv 77 77 100% - scikits/image/filter/__init__ 1 1 100% + skimage/color/colorconv 77 77 100% + skimage/filter/__init__ 1 1 100% ... Bugs diff --git a/LICENSE.txt b/LICENSE.txt index 3931ac07..8da77167 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,12 +1,12 @@ Unless otherwise specified by LICENSE.txt files in individual directories, all code is -Copyright (C) 2011, the scikits-image team +Copyright (C) 2011, the Image Scikit team All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are -met: +met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. @@ -14,9 +14,9 @@ met: notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. Neither the name of scikits.image nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. + 3. Neither the name of skimage nor the names of its contributors may be + used to endorse or promote products derived from this software without + specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED diff --git a/MANIFEST.in b/MANIFEST.in index 98f78905..568bc22d 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,8 +3,8 @@ include setup*.py include MANIFEST.in include *.txt include Makefile -recursive-include scikits *.pyx *.pxd *.pxi *.py *.c *.h *.ini -recursive-include scikits/image/data * +recursive-include skimage *.pyx *.pxd *.pxi *.py *.c *.h *.ini +recursive-include skimage/data * include doc/Makefile recursive-include doc/source *.txt diff --git a/Makefile b/Makefile index c69db9da..151dd498 100644 --- a/Makefile +++ b/Makefile @@ -2,13 +2,13 @@ all: python setup.py build_ext --inplace - git update-index --assume-unchanged scikits/image/version.py + git update-index --assume-unchanged skimage/version.py clean: find . -name "*.so" -o -name "*.pyc" | xargs rm -f test: - nosetests scikits/image + nosetests skimage coverage: - nosetests scikits/image --with-coverage --cover-package=scikits.image + nosetests skimage --with-coverage --cover-package=skimage diff --git a/RELEASE.txt b/RELEASE.txt index 899713cb..1f077616 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1,5 +1,5 @@ -How to make a new release of ``scikits.image`` -============================================== +How to make a new release of ``skimage`` +======================================== - Update the version number in setup.py and commit - Update the docs and api, push upstream using "make gh-pages" diff --git a/TASKS.txt b/TASKS.txt index 1d32b373..ff1fe2dd 100644 --- a/TASKS.txt +++ b/TASKS.txt @@ -1,15 +1,15 @@ .. role:: strike -How to contribute to ``scikits.image`` +How to contribute to ``skimage`` ====================================== -Developing Open Source is great fun! Join us on the `scikits-image mailing +Developing Open Source is great fun! Join us on the `skimage mailing list `_ and tell us which of the following challenges you'd like to solve. * Mentoring is available for those new to scientific programming in Python. * The technical detail of the `development process`_ is given below. -* :doc:`How to use GitHub ` when developing scikits.image +* :doc:`How to use GitHub ` when developing skimage .. contents:: :local: diff --git a/doc/examples/plot_hough_transform.py b/doc/examples/plot_hough_transform.py index 8a78b3e9..65364229 100644 --- a/doc/examples/plot_hough_transform.py +++ b/doc/examples/plot_hough_transform.py @@ -59,9 +59,9 @@ References ''' -from scikits.image.transform import hough, probabilistic_hough -from scikits.image.filter import canny -from scikits.image import data +from skimage.transform import hough, probabilistic_hough +from skimage.filter import canny +from skimage import data import numpy as np import matplotlib.pyplot as plt diff --git a/doc/examples/plot_lena_tv_denoise.py b/doc/examples/plot_lena_tv_denoise.py index 700f87d6..41e4f99c 100644 --- a/doc/examples/plot_lena_tv_denoise.py +++ b/doc/examples/plot_lena_tv_denoise.py @@ -19,8 +19,8 @@ the tradeoff between denoising and faithfulness to the original image. import numpy as np import matplotlib.pyplot as plt -from scikits.image import data, color, img_as_ubyte -from scikits.image.filter import tv_denoise +from skimage import data, color, img_as_ubyte +from skimage.filter import tv_denoise l = img_as_ubyte(color.rgb2gray(data.lena())) l = l[230:290, 220:320] diff --git a/doc/examples/plot_radon_transform.py b/doc/examples/plot_radon_transform.py index dee80c5b..f0869ead 100644 --- a/doc/examples/plot_radon_transform.py +++ b/doc/examples/plot_radon_transform.py @@ -20,9 +20,9 @@ input image based on the resulting sinogram. import matplotlib.pyplot as plt -from scikits.image.io import imread -from scikits.image import data_dir -from scikits.image.transform import radon, iradon +from skimage.io import imread +from skimage import data_dir +from skimage.transform import radon, iradon from scipy.ndimage import zoom image = imread(data_dir + "/phantom.png", as_grey=True) diff --git a/doc/examples/plot_watershed.py b/doc/examples/plot_watershed.py index 7927cb90..f6731f98 100644 --- a/doc/examples/plot_watershed.py +++ b/doc/examples/plot_watershed.py @@ -27,7 +27,7 @@ more details on the algorithm. import numpy as np from scipy import ndimage import matplotlib.pyplot as plt -from scikits.image.morphology import watershed, is_local_maximum +from skimage.morphology import watershed, is_local_maximum # Generate an initial image with two overlapping circles x, y = np.indices((80, 80)) diff --git a/doc/logo/scikits_image_logo.py b/doc/logo/scikits_image_logo.py index e96a7f25..de460344 100644 --- a/doc/logo/scikits_image_logo.py +++ b/doc/logo/scikits_image_logo.py @@ -1,5 +1,5 @@ """ -Script to draw scikits.image logo using Scipy logo as stencil. The easiest +Script to draw skimage logo using Scipy logo as stencil. The easiest starting point is the `plot_colorized_logo`; the "if-main" demonstrates its use. Original snake image from pixabay [1]_ @@ -10,8 +10,8 @@ import numpy as np import matplotlib.pyplot as plt import scipy.misc -import scikits.image.io as sio -import scikits.image.filter as imfilt +import skimage.io as sio +import skimage.filter as imfilt import scipy_logo diff --git a/doc/logo/scipy_logo.py b/doc/logo/scipy_logo.py index 985fe77e..c9de053a 100644 --- a/doc/logo/scipy_logo.py +++ b/doc/logo/scipy_logo.py @@ -3,7 +3,7 @@ Code used to trace Scipy logo. """ import numpy as np import matplotlib.pyplot as plt -import scikits.image.io as imgio +import skimage.io as imgio from scipy.misc import lena import matplotlib.nxutils as nx diff --git a/doc/logo/shrink_logo.py b/doc/logo/shrink_logo.py index f9c16e2c..3b7d91ba 100644 --- a/doc/logo/shrink_logo.py +++ b/doc/logo/shrink_logo.py @@ -1,4 +1,4 @@ -from scikits.image import io, transform +from skimage import io, transform s = 0.7 diff --git a/doc/source/conf.py b/doc/source/conf.py index 2732b37e..f8212fc0 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# scikits.image documentation build configuration file, created by +# skimage documentation build configuration file, created by # sphinx-quickstart on Sat Aug 22 13:00:30 2009. # # This file is execfile()d with the current directory set to its containing dir. @@ -48,8 +48,8 @@ source_suffix = '.txt' master_doc = 'index' # General information about the project. -project = u'scikits.image' -copyright = u'2011, scikits-image team' +project = u'skimage' +copyright = u'2011, the Image Scikit team' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -122,7 +122,7 @@ html_theme_path = ['themes'] # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". -html_title = 'scikits.image v%s docs' % version +html_title = 'skimage v%s docs' % version # A shorter title for the navigation bar. Default is the same as html_title. #html_short_title = None @@ -197,7 +197,7 @@ htmlhelp_basename = 'scikitsimagedoc' # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ - ('contents', 'scikitsimage.tex', u'scikits.image Documentation', + ('contents', 'scikitsimage.tex', u'The Image Scikit Documentation', u'SciPy Developers', 'manual'), ] diff --git a/doc/source/index.txt b/doc/source/index.txt index 2ec428ac..7ffda9ce 100644 --- a/doc/source/index.txt +++ b/doc/source/index.txt @@ -1,5 +1,5 @@ **************************** -scikits.image |version| docs +skimage |version| docs **************************** This SciKit_ is an image processing toolbox for SciPy_. @@ -16,15 +16,15 @@ Sections * - `Overview `_ - Introduction to scikits.image. + Introduction to skimage. - `API Reference `_ (`changes `_) - Documentation for the functions included in scikits.image. + Documentation for the functions included in skimage. * - `Installation Steps `_ - How to install scikits.image. + How to install skimage. - `User Guide `_ diff --git a/doc/source/plots/hough_tf.py b/doc/source/plots/hough_tf.py index 663edff1..8b745864 100644 --- a/doc/source/plots/hough_tf.py +++ b/doc/source/plots/hough_tf.py @@ -1,7 +1,7 @@ import numpy as np import matplotlib.pyplot as plt -from scikits.image.transform import hough +from skimage.transform import hough img = np.zeros((100, 150), dtype=bool) img[30, :] = 1 diff --git a/doc/source/plots/show_collection.py b/doc/source/plots/show_collection.py index 4d89de80..c1976c3a 100644 --- a/doc/source/plots/show_collection.py +++ b/doc/source/plots/show_collection.py @@ -3,8 +3,8 @@ import os import matplotlib.pyplot as plt from mpl_toolkits.axes_grid import AxesGrid -from scikits.image.io import MultiImage -from scikits.image import data_dir +from skimage.io import MultiImage +from skimage import data_dir # Load the multi-layer image fname = os.path.join(data_dir, 'multipage.tif') diff --git a/doc/source/user_guide/data_types.txt b/doc/source/user_guide/data_types.txt index 7b94a8c9..f49fdfb4 100644 --- a/doc/source/user_guide/data_types.txt +++ b/doc/source/user_guide/data_types.txt @@ -5,7 +5,7 @@ Image data types and what they mean This is a preliminary design document. -In ``scikits.image``, we assume the following dtype ranges: +In ``skimage``, we assume the following dtype ranges: =========== ================ Data type Range diff --git a/doc/source/user_guide/plugins.txt b/doc/source/user_guide/plugins.txt index c68c5a23..e17b3f59 100644 --- a/doc/source/user_guide/plugins.txt +++ b/doc/source/user_guide/plugins.txt @@ -4,8 +4,8 @@ A plugin consists of two files, the source and the descriptor ``.ini``. Let's say we'd like to provide a plugin for ``imshow`` using ``matplotlib``. We'll call our plugin ``mpl``:: - scikits/image/io/_plugins/mpl.py - scikits/image/io/_plugins/mpl.ini + skimage/io/_plugins/mpl.py + skimage/io/_plugins/mpl.ini The name of the ``.py`` and ``.ini`` files must correspond. Inside the ``.ini`` file, we give the plugin meta-data:: @@ -45,10 +45,10 @@ provide it as follows:: plt.show() Any plugin in the ``_plugins`` directory is automatically examined by -``scikits.image.io`` upon import. You may list all the plugins on your +``skimage.io`` upon import. You may list all the plugins on your system:: - >>> import scikits.image.io as io + >>> import skimage.io as io >>> io.plugins() {'gtk': ['imshow'], 'matplotlib': ['imshow', 'imsave'], @@ -63,7 +63,7 @@ or only those already loaded:: A plugin is loaded using the ``use_plugin`` command:: - >>> import scikits.image.io as io + >>> import skimage.io as io >>> io.use_plugin('pil') # Use all capabilities provided by PIL or diff --git a/doc/tools/apigen.py b/doc/tools/apigen.py index 58a82fda..86791383 100644 --- a/doc/tools/apigen.py +++ b/doc/tools/apigen.py @@ -13,7 +13,7 @@ Previously functions and classes were found by parsing the text of .py files. Extension modules should be discovered and included as well. This is a modified version of a script originally shipped with the PyMVPA -project, then adapted for use first in NIPY and then in scikits.image. PyMVPA +project, then adapted for use first in NIPY and then in skimage. PyMVPA is an MIT-licensed project. """ diff --git a/doc/tools/build_modref_templates.py b/doc/tools/build_modref_templates.py index cf24da63..8dfc6124 100644 --- a/doc/tools/build_modref_templates.py +++ b/doc/tools/build_modref_templates.py @@ -17,7 +17,7 @@ def abort(error): exit() if __name__ == '__main__': - package = 'scikits.image' + package = 'skimage' # Check that the 'image' package is available. If not, the API # documentation is not (re)generated and existing API documentation @@ -26,7 +26,7 @@ if __name__ == '__main__': try: __import__(package) except ImportError, e: - abort("Can not import scikits.image") + abort("Can not import skimage") module = sys.modules[package] diff --git a/scikits/__init__.py b/scikits/__init__.py deleted file mode 100644 index de40ea7c..00000000 --- a/scikits/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__import__('pkg_resources').declare_namespace(__name__) diff --git a/scikits/image/version.py b/scikits/image/version.py deleted file mode 100644 index 4fadcd3a..00000000 --- a/scikits/image/version.py +++ /dev/null @@ -1 +0,0 @@ -version='unbuilt-dev' diff --git a/setup.py b/setup.py index 00398ab5..fbc25f13 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ Please refer to the online documentation at http://scikits-image.org/ """ -DISTNAME = 'scikits.image' +DISTNAME = 'skimage' DESCRIPTION = 'Image processing routines for SciPy' LONG_DESCRIPTION = descr MAINTAINER = 'Stefan van der Walt' @@ -31,8 +31,7 @@ def configuration(parent_package='', top_path=None): if os.path.exists('MANIFEST'): os.remove('MANIFEST') from numpy.distutils.misc_util import Configuration - config = Configuration(None, parent_package, top_path, - namespace_packages=['scikits']) + config = Configuration(None, parent_package, top_path) config.set_options( ignore_setup_xxx_py=True, @@ -40,15 +39,13 @@ def configuration(parent_package='', top_path=None): delegate_options_to_subpackages=True, quiet=True) - config.add_subpackage('scikits') config.add_subpackage(DISTNAME) - config.add_data_files('scikits/__init__.py') - config.add_data_dir('scikits/image/data') + config.add_data_dir('skimage/data') return config -def write_version_py(filename='scikits/image/version.py'): - template = """# THIS FILE IS GENERATED FROM THE SCIKITS.IMAGE SETUP.PY +def write_version_py(filename='skimage/version.py'): + template = """# THIS FILE IS GENERATED FROM THE SKIMAGE SETUP.PY version='%s' """ @@ -92,14 +89,13 @@ if __name__ == "__main__": configuration=configuration, install_requires=[], - namespace_packages=['scikits'], packages=setuptools.find_packages(), include_package_data=True, zip_safe=False, # the package can run out of an .egg file entry_points={ 'console_scripts': [ - 'scivi = scikits.image.scripts.scivi:main'] + 'scivi = skimage.scripts.scivi:main'] }, cmdclass={'build_py': build_py}, diff --git a/scikits/image/__init__.py b/skimage/__init__.py similarity index 93% rename from scikits/image/__init__.py rename to skimage/__init__.py index 8d8d51ec..8acd0977 100644 --- a/scikits/image/__init__.py +++ b/skimage/__init__.py @@ -20,7 +20,7 @@ def _setup_test(): print("Could not load nose. Unit tests not available.") return None else: - return functools.partial(_nose.run, 'scikits.image', argv=args) + return functools.partial(_nose.run, 'skimage', argv=args) test = _setup_test() if test is None: diff --git a/scikits/image/_build.py b/skimage/_build.py similarity index 96% rename from scikits/image/_build.py rename to skimage/_build.py index 3be00d65..40ea962d 100644 --- a/scikits/image/_build.py +++ b/skimage/_build.py @@ -53,7 +53,10 @@ def cython(pyx_files, working_path=''): # if the generated .c file differs from the one provided, # use that one instead shutil.copy(c_file_new, c_file) - os.remove(c_file_new) + try: + os.remove(c_file_new) + except OSError: + pass def same_cython(f0, f1): diff --git a/scikits/image/color/__init__.py b/skimage/color/__init__.py similarity index 100% rename from scikits/image/color/__init__.py rename to skimage/color/__init__.py diff --git a/scikits/image/color/colorconv.py b/skimage/color/colorconv.py similarity index 93% rename from scikits/image/color/colorconv.py rename to skimage/color/colorconv.py index 35a0ec46..c516b847 100644 --- a/scikits/image/color/colorconv.py +++ b/skimage/color/colorconv.py @@ -82,8 +82,8 @@ def convert_colorspace(arr, fromspace, tospace): Examples -------- >>> import os - >>> from scikits.image import data_dir - >>> from scikits.image.io import imread + >>> from skimage import data_dir + >>> from skimage.io import imread >>> lena = imread(os.path.join(data_dir, 'lena.png')) >>> lena_hsv = convert_colorspace(lena, 'RGB', 'HSV') @@ -147,8 +147,8 @@ def rgb2hsv(rgb): Examples -------- >>> import os - >>> from scikits.image import data_dir - >>> from scikits.image.io import imread + >>> from skimage import data_dir + >>> from skimage.io import imread >>> lena = imread(os.path.join(data_dir, 'lena.png')) >>> lena_hsv = color.rgb2hsv(lena) @@ -222,8 +222,8 @@ def hsv2rgb(hsv): Examples -------- >>> import os - >>> from scikits.image import data_dir - >>> from scikits.image.io import imread + >>> from skimage import data_dir + >>> from skimage.io import imread >>> lena = imread(os.path.join(data_dir, 'lena.png')) >>> lena_hsv = rgb2hsv(lena) @@ -345,9 +345,9 @@ def xyz2rgb(xyz): Examples -------- >>> import os - >>> from scikits.image import data_dir - >>> from scikits.image.io import imread - >>> from scikits.image.color import rgb2xyz, xyz2rgb + >>> from skimage import data_dir + >>> from skimage.io import imread + >>> from skimage.color import rgb2xyz, xyz2rgb >>> lena = imread(os.path.join(data_dir, 'lena.png')) >>> lena_xyz = rgb2xyz(lena) @@ -386,8 +386,8 @@ def rgb2xyz(rgb): Examples -------- >>> import os - >>> from scikits.image import data_dir - >>> from scikits.image.io import imread + >>> from skimage import data_dir + >>> from skimage.io import imread >>> lena = imread(os.path.join(data_dir, 'lena.png')) >>> lena_xyz = rgb2xyz(lena) @@ -420,9 +420,9 @@ def rgb2rgbcie(rgb): Examples -------- >>> import os - >>> from scikits.image import data_dir - >>> from scikits.image.io import imread - >>> from scikits.image.color import rgb2rgbcie + >>> from skimage import data_dir + >>> from skimage.io import imread + >>> from skimage.color import rgb2rgbcie >>> lena = imread(os.path.join(data_dir, 'lena.png')) >>> lena_rgbcie = rgb2rgbcie(lena) @@ -455,9 +455,9 @@ def rgbcie2rgb(rgbcie): Examples -------- >>> import os - >>> from scikits.image import data_dir - >>> from scikits.image.io import imread - >>> from scikits.image.color import rgb2rgbcie, rgbcie2rgb + >>> from skimage import data_dir + >>> from skimage.io import imread + >>> from skimage.color import rgb2rgbcie, rgbcie2rgb >>> lena = imread(os.path.join(data_dir, 'lena.png')) >>> lena_rgbcie = rgb2rgbcie(lena) @@ -498,9 +498,9 @@ def rgb2grey(rgb): Examples -------- >>> import os - >>> from scikits.image import data_dir - >>> from scikits.image.io import imread - >>> from scikits.image.color import rgb2grey + >>> from skimage import data_dir + >>> from skimage.io import imread + >>> from skimage.color import rgb2grey >>> lena = imread(os.path.join(data_dir, 'lena.png')) >>> lena_grey = rgb2grey(lena) diff --git a/scikits/image/color/tests/test_colorconv.py b/skimage/color/tests/test_colorconv.py similarity index 98% rename from scikits/image/color/tests/test_colorconv.py rename to skimage/color/tests/test_colorconv.py index e3166781..fef9bb17 100644 --- a/scikits/image/color/tests/test_colorconv.py +++ b/skimage/color/tests/test_colorconv.py @@ -16,8 +16,8 @@ import os.path import numpy as np from numpy.testing import * -from scikits.image.io import imread -from scikits.image.color import ( +from skimage.io import imread +from skimage.color import ( rgb2hsv, hsv2rgb, rgb2xyz, xyz2rgb, rgb2rgbcie, rgbcie2rgb, @@ -25,7 +25,7 @@ from scikits.image.color import ( rgb2grey ) -from scikits.image import data_dir +from skimage import data_dir import colorsys diff --git a/scikits/image/data/__init__.py b/skimage/data/__init__.py similarity index 88% rename from scikits/image/data/__init__.py rename to skimage/data/__init__.py index 728b20dd..3c4d30c5 100644 --- a/scikits/image/data/__init__.py +++ b/skimage/data/__init__.py @@ -5,7 +5,7 @@ import os as _os from ..io import imread -from ...image import data_dir +from skimage import data_dir def load(f): """Load an image file located in the data directory. @@ -18,7 +18,7 @@ def load(f): Returns ------- img : ndarray - Image loaded from scikits.image.data_dir. + Image loaded from skimage.data_dir. """ return imread(_os.path.join(data_dir, f)) diff --git a/scikits/image/data/bw_text.png b/skimage/data/bw_text.png similarity index 100% rename from scikits/image/data/bw_text.png rename to skimage/data/bw_text.png diff --git a/scikits/image/data/bw_text_skeleton.npy b/skimage/data/bw_text_skeleton.npy similarity index 100% rename from scikits/image/data/bw_text_skeleton.npy rename to skimage/data/bw_text_skeleton.npy diff --git a/scikits/image/data/camera.png b/skimage/data/camera.png similarity index 100% rename from scikits/image/data/camera.png rename to skimage/data/camera.png diff --git a/scikits/image/data/chessboard_GRAY.png b/skimage/data/chessboard_GRAY.png similarity index 100% rename from scikits/image/data/chessboard_GRAY.png rename to skimage/data/chessboard_GRAY.png diff --git a/scikits/image/data/chessboard_GRAY_U8.npy b/skimage/data/chessboard_GRAY_U8.npy similarity index 100% rename from scikits/image/data/chessboard_GRAY_U8.npy rename to skimage/data/chessboard_GRAY_U8.npy diff --git a/scikits/image/data/chessboard_GRAY_U8.npz b/skimage/data/chessboard_GRAY_U8.npz similarity index 100% rename from scikits/image/data/chessboard_GRAY_U8.npz rename to skimage/data/chessboard_GRAY_U8.npz diff --git a/scikits/image/data/chessboard_RGB.png b/skimage/data/chessboard_RGB.png similarity index 100% rename from scikits/image/data/chessboard_RGB.png rename to skimage/data/chessboard_RGB.png diff --git a/scikits/image/data/chessboard_RGB_U8.npy b/skimage/data/chessboard_RGB_U8.npy similarity index 100% rename from scikits/image/data/chessboard_RGB_U8.npy rename to skimage/data/chessboard_RGB_U8.npy diff --git a/scikits/image/data/chessboard_RGB_U8.npz b/skimage/data/chessboard_RGB_U8.npz similarity index 100% rename from scikits/image/data/chessboard_RGB_U8.npz rename to skimage/data/chessboard_RGB_U8.npz diff --git a/scikits/image/data/color.png b/skimage/data/color.png similarity index 100% rename from scikits/image/data/color.png rename to skimage/data/color.png diff --git a/scikits/image/data/cvCalibrateCamera2TestData.npz b/skimage/data/cvCalibrateCamera2TestData.npz similarity index 100% rename from scikits/image/data/cvCalibrateCamera2TestData.npz rename to skimage/data/cvCalibrateCamera2TestData.npz diff --git a/scikits/image/data/diamond-bothat-matlab-output.npz b/skimage/data/diamond-bothat-matlab-output.npz similarity index 100% rename from scikits/image/data/diamond-bothat-matlab-output.npz rename to skimage/data/diamond-bothat-matlab-output.npz diff --git a/scikits/image/data/diamond-close-matlab-output.npz b/skimage/data/diamond-close-matlab-output.npz similarity index 100% rename from scikits/image/data/diamond-close-matlab-output.npz rename to skimage/data/diamond-close-matlab-output.npz diff --git a/scikits/image/data/diamond-dilate-matlab-output.npz b/skimage/data/diamond-dilate-matlab-output.npz similarity index 100% rename from scikits/image/data/diamond-dilate-matlab-output.npz rename to skimage/data/diamond-dilate-matlab-output.npz diff --git a/scikits/image/data/diamond-erode-matlab-output.npz b/skimage/data/diamond-erode-matlab-output.npz similarity index 100% rename from scikits/image/data/diamond-erode-matlab-output.npz rename to skimage/data/diamond-erode-matlab-output.npz diff --git a/scikits/image/data/diamond-matlab-output.npz b/skimage/data/diamond-matlab-output.npz similarity index 100% rename from scikits/image/data/diamond-matlab-output.npz rename to skimage/data/diamond-matlab-output.npz diff --git a/scikits/image/data/diamond-open-matlab-output.npz b/skimage/data/diamond-open-matlab-output.npz similarity index 100% rename from scikits/image/data/diamond-open-matlab-output.npz rename to skimage/data/diamond-open-matlab-output.npz diff --git a/scikits/image/data/diamond-tophat-matlab-output.npz b/skimage/data/diamond-tophat-matlab-output.npz similarity index 100% rename from scikits/image/data/diamond-tophat-matlab-output.npz rename to skimage/data/diamond-tophat-matlab-output.npz diff --git a/scikits/image/data/disk-bothat-matlab-output.npz b/skimage/data/disk-bothat-matlab-output.npz similarity index 100% rename from scikits/image/data/disk-bothat-matlab-output.npz rename to skimage/data/disk-bothat-matlab-output.npz diff --git a/scikits/image/data/disk-close-matlab-output.npz b/skimage/data/disk-close-matlab-output.npz similarity index 100% rename from scikits/image/data/disk-close-matlab-output.npz rename to skimage/data/disk-close-matlab-output.npz diff --git a/scikits/image/data/disk-dilate-matlab-output.npz b/skimage/data/disk-dilate-matlab-output.npz similarity index 100% rename from scikits/image/data/disk-dilate-matlab-output.npz rename to skimage/data/disk-dilate-matlab-output.npz diff --git a/scikits/image/data/disk-erode-matlab-output.npz b/skimage/data/disk-erode-matlab-output.npz similarity index 100% rename from scikits/image/data/disk-erode-matlab-output.npz rename to skimage/data/disk-erode-matlab-output.npz diff --git a/scikits/image/data/disk-matlab-output.npz b/skimage/data/disk-matlab-output.npz similarity index 100% rename from scikits/image/data/disk-matlab-output.npz rename to skimage/data/disk-matlab-output.npz diff --git a/scikits/image/data/disk-open-matlab-output.npz b/skimage/data/disk-open-matlab-output.npz similarity index 100% rename from scikits/image/data/disk-open-matlab-output.npz rename to skimage/data/disk-open-matlab-output.npz diff --git a/scikits/image/data/disk-tophat-matlab-output.npz b/skimage/data/disk-tophat-matlab-output.npz similarity index 100% rename from scikits/image/data/disk-tophat-matlab-output.npz rename to skimage/data/disk-tophat-matlab-output.npz diff --git a/scikits/image/data/lena.png b/skimage/data/lena.png similarity index 100% rename from scikits/image/data/lena.png rename to skimage/data/lena.png diff --git a/scikits/image/data/lena_GRAY_U8.npy b/skimage/data/lena_GRAY_U8.npy similarity index 100% rename from scikits/image/data/lena_GRAY_U8.npy rename to skimage/data/lena_GRAY_U8.npy diff --git a/scikits/image/data/lena_GRAY_U8.npz b/skimage/data/lena_GRAY_U8.npz similarity index 100% rename from scikits/image/data/lena_GRAY_U8.npz rename to skimage/data/lena_GRAY_U8.npz diff --git a/scikits/image/data/lena_RGB_U8.npy b/skimage/data/lena_RGB_U8.npy similarity index 100% rename from scikits/image/data/lena_RGB_U8.npy rename to skimage/data/lena_RGB_U8.npy diff --git a/scikits/image/data/lena_RGB_U8.npz b/skimage/data/lena_RGB_U8.npz similarity index 100% rename from scikits/image/data/lena_RGB_U8.npz rename to skimage/data/lena_RGB_U8.npz diff --git a/scikits/image/data/lenagray.png b/skimage/data/lenagray.png similarity index 100% rename from scikits/image/data/lenagray.png rename to skimage/data/lenagray.png diff --git a/scikits/image/data/multi.fits b/skimage/data/multi.fits similarity index 100% rename from scikits/image/data/multi.fits rename to skimage/data/multi.fits diff --git a/scikits/image/data/multipage.tif b/skimage/data/multipage.tif similarity index 100% rename from scikits/image/data/multipage.tif rename to skimage/data/multipage.tif diff --git a/scikits/image/data/palette_color.png b/skimage/data/palette_color.png similarity index 100% rename from scikits/image/data/palette_color.png rename to skimage/data/palette_color.png diff --git a/scikits/image/data/palette_gray.png b/skimage/data/palette_gray.png similarity index 100% rename from scikits/image/data/palette_gray.png rename to skimage/data/palette_gray.png diff --git a/scikits/image/data/phantom.png b/skimage/data/phantom.png similarity index 100% rename from scikits/image/data/phantom.png rename to skimage/data/phantom.png diff --git a/scikits/image/data/simple.fits b/skimage/data/simple.fits similarity index 100% rename from scikits/image/data/simple.fits rename to skimage/data/simple.fits diff --git a/scikits/image/data/tests/test_data.py b/skimage/data/tests/test_data.py similarity index 94% rename from scikits/image/data/tests/test_data.py rename to skimage/data/tests/test_data.py index 9215d0fa..c239d880 100644 --- a/scikits/image/data/tests/test_data.py +++ b/skimage/data/tests/test_data.py @@ -1,4 +1,4 @@ -import scikits.image.data as data +import skimage.data as data from numpy.testing import assert_equal, assert_array_equal import numpy as np diff --git a/scikits/image/draw/__init__.py b/skimage/draw/__init__.py similarity index 100% rename from scikits/image/draw/__init__.py rename to skimage/draw/__init__.py diff --git a/scikits/image/draw/_draw.pyx b/skimage/draw/_draw.pyx similarity index 100% rename from scikits/image/draw/_draw.pyx rename to skimage/draw/_draw.pyx diff --git a/scikits/image/draw/draw.py b/skimage/draw/draw.py similarity index 100% rename from scikits/image/draw/draw.py rename to skimage/draw/draw.py diff --git a/scikits/image/draw/setup.py b/skimage/draw/setup.py similarity index 95% rename from scikits/image/draw/setup.py rename to skimage/draw/setup.py index 3e0cd1a4..75d7b27c 100644 --- a/scikits/image/draw/setup.py +++ b/skimage/draw/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import os -from scikits.image._build import cython +from skimage._build import cython base_path = os.path.abspath(os.path.dirname(__file__)) diff --git a/scikits/image/draw/tests/test_draw.py b/skimage/draw/tests/test_draw.py similarity index 95% rename from scikits/image/draw/tests/test_draw.py rename to skimage/draw/tests/test_draw.py index 06ebaac0..ee323d83 100644 --- a/scikits/image/draw/tests/test_draw.py +++ b/skimage/draw/tests/test_draw.py @@ -1,7 +1,7 @@ from numpy.testing import assert_array_equal import numpy as np -from scikits.image.draw import bresenham +from skimage.draw import bresenham def test_bresenham_horizontal(): img = np.zeros((10, 10)) diff --git a/scikits/image/feature/__init__.py b/skimage/feature/__init__.py similarity index 100% rename from scikits/image/feature/__init__.py rename to skimage/feature/__init__.py diff --git a/scikits/image/feature/hog.py b/skimage/feature/hog.py similarity index 99% rename from scikits/image/feature/hog.py rename to skimage/feature/hog.py index f3256057..01a2208a 100644 --- a/scikits/image/feature/hog.py +++ b/skimage/feature/hog.py @@ -129,7 +129,7 @@ def hog(image, orientations=9, pixels_per_cell=(8, 8), hog_image = np.zeros((sy, sx), dtype=float) if visualise: - from scikits.image import draw + from skimage import draw for x in range(n_cellsx): for y in range(n_cellsy): diff --git a/scikits/image/feature/tests/test_hog.py b/skimage/feature/tests/test_hog.py similarity index 79% rename from scikits/image/feature/tests/test_hog.py rename to skimage/feature/tests/test_hog.py index 6f375cea..a6d10f8f 100644 --- a/scikits/image/feature/tests/test_hog.py +++ b/skimage/feature/tests/test_hog.py @@ -1,10 +1,10 @@ import numpy as np import scipy -from scikits.image.feature import hog +from skimage.feature import hog def test_histogram_of_oriented_gradients(): - # Replace with scikits.image.data.lena() after merge + # Replace with skimage.data.lena() after merge img = scipy.misc.lena().astype(np.int8) fd = hog(img, orientations=9, pixels_per_cell=(8, 8), diff --git a/scikits/image/filter/__init__.py b/skimage/filter/__init__.py similarity index 100% rename from scikits/image/filter/__init__.py rename to skimage/filter/__init__.py diff --git a/scikits/image/filter/_ctmf.pyx b/skimage/filter/_ctmf.pyx similarity index 100% rename from scikits/image/filter/_ctmf.pyx rename to skimage/filter/_ctmf.pyx diff --git a/scikits/image/filter/canny.py b/skimage/filter/canny.py similarity index 100% rename from scikits/image/filter/canny.py rename to skimage/filter/canny.py diff --git a/scikits/image/filter/ctmf.py b/skimage/filter/ctmf.py similarity index 100% rename from scikits/image/filter/ctmf.py rename to skimage/filter/ctmf.py diff --git a/scikits/image/filter/edges.py b/skimage/filter/edges.py similarity index 100% rename from scikits/image/filter/edges.py rename to skimage/filter/edges.py diff --git a/scikits/image/filter/lpi_filter.py b/skimage/filter/lpi_filter.py similarity index 100% rename from scikits/image/filter/lpi_filter.py rename to skimage/filter/lpi_filter.py diff --git a/scikits/image/filter/rank_order.py b/skimage/filter/rank_order.py similarity index 100% rename from scikits/image/filter/rank_order.py rename to skimage/filter/rank_order.py diff --git a/scikits/image/filter/setup.py b/skimage/filter/setup.py similarity index 95% rename from scikits/image/filter/setup.py rename to skimage/filter/setup.py index f905b1fd..d1d3885e 100644 --- a/scikits/image/filter/setup.py +++ b/skimage/filter/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import os -from scikits.image._build import cython +from skimage._build import cython base_path = os.path.abspath(os.path.dirname(__file__)) diff --git a/scikits/image/filter/tests/test_canny.py b/skimage/filter/tests/test_canny.py similarity index 98% rename from scikits/image/filter/tests/test_canny.py rename to skimage/filter/tests/test_canny.py index fd5ac67d..1e406008 100644 --- a/scikits/image/filter/tests/test_canny.py +++ b/skimage/filter/tests/test_canny.py @@ -1,7 +1,7 @@ import unittest import numpy as np from scipy.ndimage import binary_dilation, binary_erosion -import scikits.image.filter as F +import skimage.filter as F class TestCanny(unittest.TestCase): diff --git a/scikits/image/filter/tests/test_ctmf.py b/skimage/filter/tests/test_ctmf.py similarity index 98% rename from scikits/image/filter/tests/test_ctmf.py rename to skimage/filter/tests/test_ctmf.py index 7b269868..a3c23fe4 100644 --- a/scikits/image/filter/tests/test_ctmf.py +++ b/skimage/filter/tests/test_ctmf.py @@ -1,6 +1,6 @@ import numpy as np -from scikits.image.filter import median_filter +from skimage.filter import median_filter def test_00_00_zeros(): diff --git a/scikits/image/filter/tests/test_edges.py b/skimage/filter/tests/test_edges.py similarity index 99% rename from scikits/image/filter/tests/test_edges.py rename to skimage/filter/tests/test_edges.py index fb900d72..88b5f011 100644 --- a/scikits/image/filter/tests/test_edges.py +++ b/skimage/filter/tests/test_edges.py @@ -4,8 +4,8 @@ from numpy.testing import * import numpy as np from scipy.ndimage import binary_dilation, binary_erosion -import scikits.image.filter as F -from scikits.image import data_dir +import skimage.filter as F +from skimage import data_dir class TestSobel(): def test_00_00_zeros(self): diff --git a/scikits/image/filter/tests/test_lpi_filter.py b/skimage/filter/tests/test_lpi_filter.py similarity index 93% rename from scikits/image/filter/tests/test_lpi_filter.py rename to skimage/filter/tests/test_lpi_filter.py index 8f2bf973..1cf7b3ca 100644 --- a/scikits/image/filter/tests/test_lpi_filter.py +++ b/skimage/filter/tests/test_lpi_filter.py @@ -3,9 +3,9 @@ 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 * +from skimage import data_dir +from skimage.io import * +from skimage.filter import * class TestLPIFilter2D(): img = imread(os.path.join(data_dir, 'camera.png'), diff --git a/scikits/image/filter/tests/test_tv_denoise.py b/skimage/filter/tests/test_tv_denoise.py similarity index 96% rename from scikits/image/filter/tests/test_tv_denoise.py rename to skimage/filter/tests/test_tv_denoise.py index 7313eac2..9869d992 100644 --- a/scikits/image/filter/tests/test_tv_denoise.py +++ b/skimage/filter/tests/test_tv_denoise.py @@ -1,8 +1,8 @@ import numpy as np from numpy.testing import run_module_suite -from scikits.image import filter, data, color -from scikits.image import img_as_uint +from skimage import filter, data, color +from skimage import img_as_uint class TestTvDenoise(): diff --git a/scikits/image/filter/tv_denoise.py b/skimage/filter/tv_denoise.py similarity index 100% rename from scikits/image/filter/tv_denoise.py rename to skimage/filter/tv_denoise.py diff --git a/scikits/image/graph/__init__.py b/skimage/graph/__init__.py similarity index 100% rename from scikits/image/graph/__init__.py rename to skimage/graph/__init__.py diff --git a/scikits/image/graph/_mcp.pxd b/skimage/graph/_mcp.pxd similarity index 100% rename from scikits/image/graph/_mcp.pxd rename to skimage/graph/_mcp.pxd diff --git a/scikits/image/graph/_mcp.pyx b/skimage/graph/_mcp.pyx similarity index 100% rename from scikits/image/graph/_mcp.pyx rename to skimage/graph/_mcp.pyx diff --git a/scikits/image/graph/_spath.pyx b/skimage/graph/_spath.pyx similarity index 100% rename from scikits/image/graph/_spath.pyx rename to skimage/graph/_spath.pyx diff --git a/scikits/image/graph/heap.pxd b/skimage/graph/heap.pxd similarity index 100% rename from scikits/image/graph/heap.pxd rename to skimage/graph/heap.pxd diff --git a/scikits/image/graph/heap.pyx b/skimage/graph/heap.pyx similarity index 100% rename from scikits/image/graph/heap.pyx rename to skimage/graph/heap.pyx diff --git a/scikits/image/graph/mcp.py b/skimage/graph/mcp.py similarity index 100% rename from scikits/image/graph/mcp.py rename to skimage/graph/mcp.py diff --git a/scikits/image/graph/setup.py b/skimage/graph/setup.py similarity index 97% rename from scikits/image/graph/setup.py rename to skimage/graph/setup.py index 75d3bfc7..2d7f80cd 100644 --- a/scikits/image/graph/setup.py +++ b/skimage/graph/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -from scikits.image._build import cython +from skimage._build import cython import os.path base_path = os.path.abspath(os.path.dirname(__file__)) diff --git a/scikits/image/graph/spath.py b/skimage/graph/spath.py similarity index 100% rename from scikits/image/graph/spath.py rename to skimage/graph/spath.py diff --git a/scikits/image/graph/tests/test_heap.py b/skimage/graph/tests/test_heap.py similarity index 96% rename from scikits/image/graph/tests/test_heap.py rename to skimage/graph/tests/test_heap.py index 3d4a0c3f..0cc41c92 100644 --- a/scikits/image/graph/tests/test_heap.py +++ b/skimage/graph/tests/test_heap.py @@ -3,7 +3,7 @@ from numpy.testing import * import time import random -import scikits.image.graph.heap as heap +import skimage.graph.heap as heap def test_heap(): _test_heap(100000, True) diff --git a/scikits/image/graph/tests/test_mcp.py b/skimage/graph/tests/test_mcp.py similarity index 99% rename from scikits/image/graph/tests/test_mcp.py rename to skimage/graph/tests/test_mcp.py index 5ceec9db..d695a9bc 100644 --- a/scikits/image/graph/tests/test_mcp.py +++ b/skimage/graph/tests/test_mcp.py @@ -1,7 +1,7 @@ import numpy as np from numpy.testing import * -import scikits.image.graph.mcp as mcp +import skimage.graph.mcp as mcp a = np.ones((8,8), dtype=np.float32) a[1:-1, 1] = 0 diff --git a/scikits/image/graph/tests/test_spath.py b/skimage/graph/tests/test_spath.py similarity index 95% rename from scikits/image/graph/tests/test_spath.py rename to skimage/graph/tests/test_spath.py index 36b30b91..a9f6b274 100644 --- a/scikits/image/graph/tests/test_spath.py +++ b/skimage/graph/tests/test_spath.py @@ -1,7 +1,7 @@ import numpy as np from numpy.testing import * -import scikits.image.graph.spath as spath +import skimage.graph.spath as spath def test_basic(): x = np.array([[1, 1, 3], diff --git a/scikits/image/io/__init__.py b/skimage/io/__init__.py similarity index 100% rename from scikits/image/io/__init__.py rename to skimage/io/__init__.py diff --git a/scikits/image/io/_plugins/__init__.py b/skimage/io/_plugins/__init__.py similarity index 100% rename from scikits/image/io/_plugins/__init__.py rename to skimage/io/_plugins/__init__.py diff --git a/scikits/image/io/_plugins/_colormixer.pyx b/skimage/io/_plugins/_colormixer.pyx similarity index 100% rename from scikits/image/io/_plugins/_colormixer.pyx rename to skimage/io/_plugins/_colormixer.pyx diff --git a/scikits/image/io/_plugins/_histograms.pyx b/skimage/io/_plugins/_histograms.pyx similarity index 100% rename from scikits/image/io/_plugins/_histograms.pyx rename to skimage/io/_plugins/_histograms.pyx diff --git a/scikits/image/io/_plugins/fits_plugin.ini b/skimage/io/_plugins/fits_plugin.ini similarity index 100% rename from scikits/image/io/_plugins/fits_plugin.ini rename to skimage/io/_plugins/fits_plugin.ini diff --git a/scikits/image/io/_plugins/fits_plugin.py b/skimage/io/_plugins/fits_plugin.py similarity index 99% rename from scikits/image/io/_plugins/fits_plugin.py rename to skimage/io/_plugins/fits_plugin.py index 9fd2aadb..0f7b741f 100644 --- a/scikits/image/io/_plugins/fits_plugin.py +++ b/skimage/io/_plugins/fits_plugin.py @@ -1,6 +1,7 @@ __all__ = ['imread', 'imread_collection'] -import scikits.image.io as io +import numpy as np +import skimage.io as io try: import pyfits diff --git a/scikits/image/io/_plugins/freeimage_plugin.ini b/skimage/io/_plugins/freeimage_plugin.ini similarity index 100% rename from scikits/image/io/_plugins/freeimage_plugin.ini rename to skimage/io/_plugins/freeimage_plugin.ini diff --git a/scikits/image/io/_plugins/freeimage_plugin.py b/skimage/io/_plugins/freeimage_plugin.py similarity index 100% rename from scikits/image/io/_plugins/freeimage_plugin.py rename to skimage/io/_plugins/freeimage_plugin.py diff --git a/scikits/image/io/_plugins/gdal_plugin.ini b/skimage/io/_plugins/gdal_plugin.ini similarity index 100% rename from scikits/image/io/_plugins/gdal_plugin.ini rename to skimage/io/_plugins/gdal_plugin.ini diff --git a/scikits/image/io/_plugins/gdal_plugin.py b/skimage/io/_plugins/gdal_plugin.py similarity index 100% rename from scikits/image/io/_plugins/gdal_plugin.py rename to skimage/io/_plugins/gdal_plugin.py diff --git a/scikits/image/io/_plugins/gtk_plugin.ini b/skimage/io/_plugins/gtk_plugin.ini similarity index 100% rename from scikits/image/io/_plugins/gtk_plugin.ini rename to skimage/io/_plugins/gtk_plugin.ini diff --git a/scikits/image/io/_plugins/gtk_plugin.py b/skimage/io/_plugins/gtk_plugin.py similarity index 100% rename from scikits/image/io/_plugins/gtk_plugin.py rename to skimage/io/_plugins/gtk_plugin.py diff --git a/scikits/image/io/_plugins/matplotlib_plugin.ini b/skimage/io/_plugins/matplotlib_plugin.ini similarity index 100% rename from scikits/image/io/_plugins/matplotlib_plugin.ini rename to skimage/io/_plugins/matplotlib_plugin.ini diff --git a/scikits/image/io/_plugins/matplotlib_plugin.py b/skimage/io/_plugins/matplotlib_plugin.py similarity index 100% rename from scikits/image/io/_plugins/matplotlib_plugin.py rename to skimage/io/_plugins/matplotlib_plugin.py diff --git a/scikits/image/io/_plugins/null_plugin.ini b/skimage/io/_plugins/null_plugin.ini similarity index 100% rename from scikits/image/io/_plugins/null_plugin.ini rename to skimage/io/_plugins/null_plugin.ini diff --git a/scikits/image/io/_plugins/null_plugin.py b/skimage/io/_plugins/null_plugin.py similarity index 92% rename from scikits/image/io/_plugins/null_plugin.py rename to skimage/io/_plugins/null_plugin.py index e0237437..70bfd5d8 100644 --- a/scikits/image/io/_plugins/null_plugin.py +++ b/skimage/io/_plugins/null_plugin.py @@ -5,7 +5,7 @@ import warnings message = '''\ No plugin has been loaded. Please refer to -scikits.image.io.plugins() +skimage.io.plugins() for a list of available plugins.''' diff --git a/scikits/image/io/_plugins/pil_plugin.ini b/skimage/io/_plugins/pil_plugin.ini similarity index 100% rename from scikits/image/io/_plugins/pil_plugin.ini rename to skimage/io/_plugins/pil_plugin.ini diff --git a/scikits/image/io/_plugins/pil_plugin.py b/skimage/io/_plugins/pil_plugin.py similarity index 100% rename from scikits/image/io/_plugins/pil_plugin.py rename to skimage/io/_plugins/pil_plugin.py diff --git a/scikits/image/io/_plugins/plugin.py b/skimage/io/_plugins/plugin.py similarity index 96% rename from scikits/image/io/_plugins/plugin.py rename to skimage/io/_plugins/plugin.py index fa6b5d5a..41c20864 100644 --- a/scikits/image/io/_plugins/plugin.py +++ b/skimage/io/_plugins/plugin.py @@ -71,9 +71,9 @@ def call(kind, *args, **kwargs): if len(plugin_funcs) == 0: raise RuntimeError('''No suitable plugin registered for %s. -You may load I/O plugins with the `scikits.image.io.use_plugin` +You may load I/O plugins with the `skimage.io.use_plugin` command. A list of all available plugins can be found using -`scikits.image.io.plugins()`.''' % kind) +`skimage.io.plugins()`.''' % kind) plugin = kwargs.pop('plugin', None) if plugin is None: @@ -108,7 +108,7 @@ def use(name, kind=None): Use the Python Imaging Library to read images: - >>> from scikits.image.io import plugin + >>> from skimage.io import plugin >>> plugin.use('PIL', 'read') """ @@ -176,7 +176,7 @@ def _load(plugin): raise ValueError("Plugin %s not found." % plugin) else: modname = plugin_module_name[plugin] - plugin_module = __import__('scikits.image.io._plugins.' + modname, + plugin_module = __import__('skimage.io._plugins.' + modname, fromlist=[modname]) provides = plugin_provides[plugin] diff --git a/scikits/image/io/_plugins/q_color_mixer.py b/skimage/io/_plugins/q_color_mixer.py similarity index 100% rename from scikits/image/io/_plugins/q_color_mixer.py rename to skimage/io/_plugins/q_color_mixer.py diff --git a/scikits/image/io/_plugins/q_histogram.py b/skimage/io/_plugins/q_histogram.py similarity index 100% rename from scikits/image/io/_plugins/q_histogram.py rename to skimage/io/_plugins/q_histogram.py diff --git a/scikits/image/io/_plugins/qt_plugin.ini b/skimage/io/_plugins/qt_plugin.ini similarity index 100% rename from scikits/image/io/_plugins/qt_plugin.ini rename to skimage/io/_plugins/qt_plugin.ini diff --git a/scikits/image/io/_plugins/qt_plugin.py b/skimage/io/_plugins/qt_plugin.py similarity index 99% rename from scikits/image/io/_plugins/qt_plugin.py rename to skimage/io/_plugins/qt_plugin.py index ff8c7bed..b7afe92e 100644 --- a/scikits/image/io/_plugins/qt_plugin.py +++ b/skimage/io/_plugins/qt_plugin.py @@ -62,7 +62,7 @@ class ImageLabel(QLabel): class ImageWindow(QMainWindow): def __init__(self, arr, mgr): QMainWindow.__init__(self) - self.setWindowTitle('scikits.image') + self.setWindowTitle('skimage') self.mgr = mgr self.main_widget = QWidget() self.layout = QtGui.QGridLayout(self.main_widget) diff --git a/scikits/image/io/_plugins/scivi.py b/skimage/io/_plugins/scivi.py similarity index 97% rename from scikits/image/io/_plugins/scivi.py rename to skimage/io/_plugins/scivi.py index 3c2c0de9..5048f65c 100644 --- a/scikits/image/io/_plugins/scivi.py +++ b/skimage/io/_plugins/scivi.py @@ -11,7 +11,7 @@ Please report any bugs to the author. The scivi module is not meant to be used directly. -Use scikits.image.io.imshow(img, fancy=True)''' +Use skimage.io.imshow(img, fancy=True)''' from textwrap import dedent import numpy as np @@ -143,7 +143,7 @@ class SciviImageWindow(QMainWindow): self.mgr.add_window(self) self.main_widget.show() - self.setWindowTitle('Scivi - The scikits.image viewer.') + self.setWindowTitle('Scivi - The skimage viewer.') self.mixer_panel = MixerPanel(self.arr) self.layout.addWidget(self.mixer_panel, 0, 2) @@ -215,7 +215,7 @@ class SciviImageWindow(QMainWindow): def save_to_stack(self): - from scikits.image import io + from skimage import io img = self.arr.copy() io.push(img) msg = dedent(''' @@ -233,7 +233,7 @@ class SciviImageWindow(QMainWindow): dialog.exec_() def save_to_file(self): - from scikits.image import io + from skimage import io filename = str(QtGui.QFileDialog.getSaveFileName()) if len(filename) == 0: return diff --git a/scikits/image/io/_plugins/test_freeimage.py b/skimage/io/_plugins/test_freeimage.py similarity index 75% rename from scikits/image/io/_plugins/test_freeimage.py rename to skimage/io/_plugins/test_freeimage.py index 77a92408..a8ff86cf 100644 --- a/scikits/image/io/_plugins/test_freeimage.py +++ b/skimage/io/_plugins/test_freeimage.py @@ -1,7 +1,7 @@ import os -import scikits.image as si -import scikits.image.io as sio +import skimage as si +import skimage.io as sio sio.use_plugin('matplotlib', 'imshow') sio.use_plugin('freeimage', 'imread') diff --git a/scikits/image/io/_plugins/test_plugin.ini b/skimage/io/_plugins/test_plugin.ini similarity index 100% rename from scikits/image/io/_plugins/test_plugin.ini rename to skimage/io/_plugins/test_plugin.ini diff --git a/scikits/image/io/_plugins/test_plugin.py b/skimage/io/_plugins/test_plugin.py similarity index 100% rename from scikits/image/io/_plugins/test_plugin.py rename to skimage/io/_plugins/test_plugin.py diff --git a/scikits/image/io/_plugins/util.py b/skimage/io/_plugins/util.py similarity index 100% rename from scikits/image/io/_plugins/util.py rename to skimage/io/_plugins/util.py diff --git a/scikits/image/io/collection.py b/skimage/io/collection.py similarity index 98% rename from scikits/image/io/collection.py rename to skimage/io/collection.py index eb265d1e..7de3c9cc 100644 --- a/scikits/image/io/collection.py +++ b/skimage/io/collection.py @@ -44,7 +44,7 @@ class MultiImage(object): Examples -------- - >>> from scikits.image import data_dir + >>> from skimage import data_dir >>> img = MultiImage(data_dir + '/multipage.tif') >>> len(img) @@ -212,8 +212,8 @@ class ImageCollection(object): Examples -------- - >>> import scikits.image.io as io - >>> from scikits.image import data_dir + >>> import skimage.io as io + >>> from skimage import data_dir >>> coll = io.ImageCollection(data_dir + '/lena*.png') >>> len(coll) diff --git a/scikits/image/io/io.py b/skimage/io/io.py similarity index 96% rename from scikits/image/io/io.py rename to skimage/io/io.py index ad83577c..05a7a8b7 100644 --- a/scikits/image/io/io.py +++ b/skimage/io/io.py @@ -1,8 +1,8 @@ __all__ = ['imread', 'imread_collection', 'imsave', 'imshow', 'show', 'push', 'pop'] -from scikits.image.io._plugins import call as call_plugin -from scikits.image.color import rgb2grey +from skimage.io._plugins import call as call_plugin +from skimage.color import rgb2grey import numpy as np # Shared image queue @@ -160,7 +160,7 @@ def show(): Examples -------- - >>> import scikits.image.io as io + >>> import skimage.io as io >>> for i in range(4): ... io.imshow(np.random.random((50, 50))) diff --git a/scikits/image/io/setup.py b/skimage/io/setup.py similarity index 97% rename from scikits/image/io/setup.py rename to skimage/io/setup.py index 213928d2..9ac9b908 100644 --- a/scikits/image/io/setup.py +++ b/skimage/io/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -from scikits.image._build import cython +from skimage._build import cython import os.path diff --git a/scikits/image/io/sift.py b/skimage/io/sift.py similarity index 100% rename from scikits/image/io/sift.py rename to skimage/io/sift.py diff --git a/scikits/image/io/tests/test_collection.py b/skimage/io/tests/test_collection.py similarity index 97% rename from scikits/image/io/tests/test_collection.py rename to skimage/io/tests/test_collection.py index 71fc0fde..fa311e3e 100644 --- a/scikits/image/io/tests/test_collection.py +++ b/skimage/io/tests/test_collection.py @@ -5,8 +5,8 @@ import numpy as np from numpy.testing import * from numpy.testing.decorators import skipif -from scikits.image import data_dir -from scikits.image.io import ImageCollection, MultiImage +from skimage import data_dir +from skimage.io import ImageCollection, MultiImage try: diff --git a/scikits/image/io/tests/test_colormixer.py b/skimage/io/tests/test_colormixer.py similarity index 98% rename from scikits/image/io/tests/test_colormixer.py rename to skimage/io/tests/test_colormixer.py index 72e4aed0..bf0363c5 100644 --- a/scikits/image/io/tests/test_colormixer.py +++ b/skimage/io/tests/test_colormixer.py @@ -1,7 +1,7 @@ from numpy.testing import * import numpy as np -import scikits.image.io._plugins._colormixer as cm +import skimage.io._plugins._colormixer as cm class ColorMixerTest(object): def setup(self): diff --git a/scikits/image/io/tests/test_fits.py b/skimage/io/tests/test_fits.py similarity index 94% rename from scikits/image/io/tests/test_fits.py rename to skimage/io/tests/test_fits.py index b9894cb6..7972dd9d 100644 --- a/scikits/image/io/tests/test_fits.py +++ b/skimage/io/tests/test_fits.py @@ -2,8 +2,8 @@ import os.path import numpy as np from numpy.testing import run_module_suite from numpy.testing.decorators import skipif -import scikits.image.io as io -from scikits.image import data_dir +import skimage.io as io +from skimage import data_dir pyfits_available = True @@ -13,7 +13,7 @@ try: except ImportError: pyfits_available = False else: - import scikits.image.io._plugins.fits_plugin as fplug + import skimage.io._plugins.fits_plugin as fplug def test_fits_plugin_import(): # Make sure we get an import exception if PyFITS isn't there diff --git a/scikits/image/io/tests/test_histograms.py b/skimage/io/tests/test_histograms.py similarity index 86% rename from scikits/image/io/tests/test_histograms.py rename to skimage/io/tests/test_histograms.py index 76589e3b..11602f3a 100644 --- a/scikits/image/io/tests/test_histograms.py +++ b/skimage/io/tests/test_histograms.py @@ -1,8 +1,8 @@ from numpy.testing import * import numpy as np -import scikits.image.io._plugins._colormixer as cm -from scikits.image.io._plugins._histograms import histograms +import skimage.io._plugins._colormixer as cm +from skimage.io._plugins._histograms import histograms class TestHistogram: def test_basic(self): diff --git a/scikits/image/io/tests/test_io.py b/skimage/io/tests/test_io.py similarity index 90% rename from scikits/image/io/tests/test_io.py rename to skimage/io/tests/test_io.py index dbf5a3fc..ba05d2d3 100644 --- a/scikits/image/io/tests/test_io.py +++ b/skimage/io/tests/test_io.py @@ -1,7 +1,7 @@ from numpy.testing import * import numpy as np -import scikits.image.io as io +import skimage.io as io def test_stack_basic(): x = np.arange(12).reshape(3, 4) diff --git a/scikits/image/io/tests/test_pil.py b/skimage/io/tests/test_pil.py similarity index 92% rename from scikits/image/io/tests/test_pil.py rename to skimage/io/tests/test_pil.py index 2115b795..8cafed10 100644 --- a/scikits/image/io/tests/test_pil.py +++ b/skimage/io/tests/test_pil.py @@ -5,12 +5,12 @@ from numpy.testing.decorators import skipif from tempfile import NamedTemporaryFile -from scikits.image import data_dir -from scikits.image.io import imread, imsave, use_plugin +from skimage import data_dir +from skimage.io import imread, imsave, use_plugin try: from PIL import Image - from scikits.image.io._plugins.pil_plugin import _palette_is_grayscale + from skimage.io._plugins.pil_plugin import _palette_is_grayscale use_plugin('pil') except ImportError: PIL_available = False diff --git a/scikits/image/io/tests/test_plugin.py b/skimage/io/tests/test_plugin.py similarity index 95% rename from scikits/image/io/tests/test_plugin.py rename to skimage/io/tests/test_plugin.py index 4ad4f41e..e0e89291 100644 --- a/scikits/image/io/tests/test_plugin.py +++ b/skimage/io/tests/test_plugin.py @@ -1,7 +1,7 @@ from numpy.testing import * -from scikits.image import io -from scikits.image.io._plugins import plugin +from skimage import io +from skimage.io._plugins import plugin from numpy.testing.decorators import skipif from copy import deepcopy diff --git a/scikits/image/io/tests/test_plugin_util.py b/skimage/io/tests/test_plugin_util.py similarity index 95% rename from scikits/image/io/tests/test_plugin_util.py rename to skimage/io/tests/test_plugin_util.py index 4ae30960..0170fcb1 100644 --- a/scikits/image/io/tests/test_plugin_util.py +++ b/skimage/io/tests/test_plugin_util.py @@ -1,4 +1,4 @@ -from scikits.image.io._plugins.util import prepare_for_display, WindowManager +from skimage.io._plugins.util import prepare_for_display, WindowManager from numpy.testing import * import numpy as np diff --git a/scikits/image/io/tests/test_sift.py b/skimage/io/tests/test_sift.py similarity index 98% rename from scikits/image/io/tests/test_sift.py rename to skimage/io/tests/test_sift.py index 02e99856..b6029461 100644 --- a/scikits/image/io/tests/test_sift.py +++ b/skimage/io/tests/test_sift.py @@ -5,7 +5,7 @@ from numpy.testing import assert_array_equal, assert_array_almost_equal, \ from tempfile import NamedTemporaryFile import os -from scikits.image.io import load_sift, load_surf +from skimage.io import load_sift, load_surf def test_load_sift(): f = NamedTemporaryFile(delete=False) diff --git a/scikits/image/io/video.py b/skimage/io/video.py similarity index 99% rename from scikits/image/io/video.py rename to skimage/io/video.py index f0a8561b..cd3d95e8 100644 --- a/scikits/image/io/video.py +++ b/skimage/io/video.py @@ -1,6 +1,6 @@ import numpy as np import os, time -from scikits.image.io import ImageCollection +from skimage.io import ImageCollection try: import pygst diff --git a/scikits/image/morphology/__init__.py b/skimage/morphology/__init__.py similarity index 100% rename from scikits/image/morphology/__init__.py rename to skimage/morphology/__init__.py diff --git a/scikits/image/morphology/_watershed.pyx b/skimage/morphology/_watershed.pyx similarity index 100% rename from scikits/image/morphology/_watershed.pyx rename to skimage/morphology/_watershed.pyx diff --git a/scikits/image/morphology/ccomp.pyx b/skimage/morphology/ccomp.pyx similarity index 100% rename from scikits/image/morphology/ccomp.pyx rename to skimage/morphology/ccomp.pyx diff --git a/scikits/image/morphology/cmorph.pyx b/skimage/morphology/cmorph.pyx similarity index 100% rename from scikits/image/morphology/cmorph.pyx rename to skimage/morphology/cmorph.pyx diff --git a/scikits/image/morphology/grey.py b/skimage/morphology/grey.py similarity index 96% rename from scikits/image/morphology/grey.py rename to skimage/morphology/grey.py index 1b5552ff..c82e2585 100644 --- a/scikits/image/morphology/grey.py +++ b/skimage/morphology/grey.py @@ -40,7 +40,7 @@ def greyscale_erode(image, selem, out=None, shift_x=False, shift_y=False): Examples -------- >>> # Erosion shrinks bright regions - >>> from scikits.image.morphology import square + >>> from skimage.morphology import square >>> bright_square = np.array([[0, 0, 0, 0, 0], ... [0, 1, 1, 1, 0], ... [0, 1, 1, 1, 0], @@ -57,7 +57,7 @@ def greyscale_erode(image, selem, out=None, shift_x=False, shift_y=False): if image is out: raise NotImplementedError("In-place erosion not supported!") try: - import scikits.image.morphology.cmorph as cmorph + import skimage.morphology.cmorph as cmorph out = cmorph.erode(image, selem, out=out, shift_x=shift_x, shift_y=shift_y) return out; @@ -96,7 +96,7 @@ def greyscale_dilate(image, selem, out=None, shift_x=False, shift_y=False): Examples -------- >>> # Dilation enlarges bright regions - >>> from scikits.image.morphology import square + >>> from skimage.morphology import square >>> bright_pixel = np.array([[0, 0, 0, 0, 0], ... [0, 0, 0, 0, 0], ... [0, 0, 1, 0, 0], @@ -148,7 +148,7 @@ def greyscale_open(image, selem, out=None): Examples -------- >>> # Open up gap between two bright regions (but also shrink regions) - >>> from scikits.image.morphology import square + >>> from skimage.morphology import square >>> bad_connection = np.array([[1, 0, 0, 0, 1], ... [1, 1, 0, 1, 1], ... [1, 1, 1, 1, 1], @@ -199,7 +199,7 @@ def greyscale_close(image, selem, out=None): Examples -------- >>> # Close a gap between two bright lines - >>> from scikits.image.morphology import square + >>> from skimage.morphology import square >>> broken_line = np.array([[0, 0, 0, 0, 0], ... [0, 0, 0, 0, 0], ... [1, 1, 0, 1, 1], @@ -249,7 +249,7 @@ def greyscale_white_top_hat(image, selem, out=None): Examples -------- >>> # Subtract grey background from bright peak - >>> from scikits.image.morphology import square + >>> from skimage.morphology import square >>> bright_on_grey = np.array([[2, 3, 3, 3, 2], ... [3, 4, 5, 4, 3], ... [3, 5, 9, 5, 3], @@ -298,7 +298,7 @@ def greyscale_black_top_hat(image, selem, out=None): Examples -------- >>> # Change dark peak to bright peak and subtract background - >>> from scikits.image.morphology import square + >>> from skimage.morphology import square >>> dark_on_grey = np.array([[7, 6, 6, 6, 7], ... [6, 5, 4, 5, 6], ... [6, 4, 0, 4, 6], diff --git a/scikits/image/morphology/heap_general.pxi b/skimage/morphology/heap_general.pxi similarity index 100% rename from scikits/image/morphology/heap_general.pxi rename to skimage/morphology/heap_general.pxi diff --git a/scikits/image/morphology/heap_watershed.pxi b/skimage/morphology/heap_watershed.pxi similarity index 100% rename from scikits/image/morphology/heap_watershed.pxi rename to skimage/morphology/heap_watershed.pxi diff --git a/scikits/image/morphology/selem.py b/skimage/morphology/selem.py similarity index 100% rename from scikits/image/morphology/selem.py rename to skimage/morphology/selem.py diff --git a/scikits/image/morphology/setup.py b/skimage/morphology/setup.py similarity index 97% rename from scikits/image/morphology/setup.py rename to skimage/morphology/setup.py index 3764fe0c..9d8b5527 100644 --- a/scikits/image/morphology/setup.py +++ b/skimage/morphology/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python import os -from scikits.image._build import cython +from skimage._build import cython base_path = os.path.abspath(os.path.dirname(__file__)) diff --git a/scikits/image/morphology/skeletonize.py b/skimage/morphology/skeletonize.py similarity index 100% rename from scikits/image/morphology/skeletonize.py rename to skimage/morphology/skeletonize.py diff --git a/scikits/image/morphology/tests/test_ccomp.py b/skimage/morphology/tests/test_ccomp.py similarity index 96% rename from scikits/image/morphology/tests/test_ccomp.py rename to skimage/morphology/tests/test_ccomp.py index 192f4ec4..5bf4cfdc 100644 --- a/scikits/image/morphology/tests/test_ccomp.py +++ b/skimage/morphology/tests/test_ccomp.py @@ -1,7 +1,7 @@ import numpy as np from numpy.testing import assert_array_equal, run_module_suite -from scikits.image.morphology import label +from skimage.morphology import label class TestConnectedComponents: def setup(self): diff --git a/scikits/image/morphology/tests/test_morphology.py b/skimage/morphology/tests/test_morphology.py similarity index 96% rename from scikits/image/morphology/tests/test_morphology.py rename to skimage/morphology/tests/test_morphology.py index 330518c2..2d089c58 100644 --- a/scikits/image/morphology/tests/test_morphology.py +++ b/skimage/morphology/tests/test_morphology.py @@ -3,10 +3,10 @@ import os.path import numpy as np from numpy.testing import * -from scikits.image import data_dir -from scikits.image.io import imread -from scikits.image import data_dir -from scikits.image.morphology import * +from skimage import data_dir +from skimage.io import imread +from skimage import data_dir +from skimage.morphology import * lena = np.load(os.path.join(data_dir, 'lena_GRAY_U8.npy')) diff --git a/scikits/image/morphology/tests/test_selem.py b/skimage/morphology/tests/test_selem.py similarity index 89% rename from scikits/image/morphology/tests/test_selem.py rename to skimage/morphology/tests/test_selem.py index 8f2d8d47..639cdf4e 100644 --- a/scikits/image/morphology/tests/test_selem.py +++ b/skimage/morphology/tests/test_selem.py @@ -5,10 +5,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 import data_dir -from scikits.image.morphology import * +from skimage import data_dir +from skimage.io import * +from skimage import data_dir +from skimage.morphology import * class TestSElem(): diff --git a/scikits/image/morphology/tests/test_skeletonize.py b/skimage/morphology/tests/test_skeletonize.py similarity index 100% rename from scikits/image/morphology/tests/test_skeletonize.py rename to skimage/morphology/tests/test_skeletonize.py diff --git a/scikits/image/morphology/tests/test_watershed.py b/skimage/morphology/tests/test_watershed.py similarity index 99% rename from scikits/image/morphology/tests/test_watershed.py rename to skimage/morphology/tests/test_watershed.py index 265a25e2..82ba6917 100644 --- a/scikits/image/morphology/tests/test_watershed.py +++ b/skimage/morphology/tests/test_watershed.py @@ -49,7 +49,7 @@ import unittest import numpy as np import scipy.ndimage -from scikits.image.morphology.watershed import watershed, \ +from skimage.morphology.watershed import watershed, \ _slow_watershed, is_local_maximum eps = 1e-12 diff --git a/scikits/image/morphology/watershed.py b/skimage/morphology/watershed.py similarity index 100% rename from scikits/image/morphology/watershed.py rename to skimage/morphology/watershed.py diff --git a/scikits/image/scripts/__init__.py b/skimage/scripts/__init__.py similarity index 100% rename from scikits/image/scripts/__init__.py rename to skimage/scripts/__init__.py diff --git a/scikits/image/scripts/scivi b/skimage/scripts/scivi similarity index 60% rename from scikits/image/scripts/scivi rename to skimage/scripts/scivi index 0da676ea..15c6a397 100755 --- a/scikits/image/scripts/scivi +++ b/skimage/scripts/scivi @@ -1,6 +1,6 @@ #!/usr/bin/env python if __name__ == "__main__": - from scikits.image.scripts import scivi + from skimage.scripts import scivi scivi.main() diff --git a/scikits/image/scripts/scivi.py b/skimage/scripts/scivi.py similarity index 77% rename from scikits/image/scripts/scivi.py rename to skimage/scripts/scivi.py index 553b975f..f6b5323f 100644 --- a/scikits/image/scripts/scivi.py +++ b/skimage/scripts/scivi.py @@ -1,6 +1,6 @@ -"""scikits.image viewer""" +"""skimage viewer""" def main(): - import scikits.image.io as io + import skimage.io as io import sys if len(sys.argv) != 2: diff --git a/scikits/image/setup.py b/skimage/setup.py similarity index 94% rename from scikits/image/setup.py rename to skimage/setup.py index 07d57679..35a04f6b 100644 --- a/scikits/image/setup.py +++ b/skimage/setup.py @@ -3,7 +3,7 @@ import os def configuration(parent_package='', top_path=None): from numpy.distutils.misc_util import Configuration - config = Configuration('image', parent_package, top_path) + config = Configuration('skimage', parent_package, top_path) config.add_subpackage('graph') config.add_subpackage('io') diff --git a/scikits/image/transform/__init__.py b/skimage/transform/__init__.py similarity index 100% rename from scikits/image/transform/__init__.py rename to skimage/transform/__init__.py diff --git a/scikits/image/transform/_hough_transform.pyx b/skimage/transform/_hough_transform.pyx similarity index 100% rename from scikits/image/transform/_hough_transform.pyx rename to skimage/transform/_hough_transform.pyx diff --git a/scikits/image/transform/_project.pyx b/skimage/transform/_project.pyx similarity index 100% rename from scikits/image/transform/_project.pyx rename to skimage/transform/_project.pyx diff --git a/scikits/image/transform/finite_radon_transform.py b/skimage/transform/finite_radon_transform.py similarity index 100% rename from scikits/image/transform/finite_radon_transform.py rename to skimage/transform/finite_radon_transform.py diff --git a/scikits/image/transform/hough_transform.py b/skimage/transform/hough_transform.py similarity index 100% rename from scikits/image/transform/hough_transform.py rename to skimage/transform/hough_transform.py diff --git a/scikits/image/transform/integral.py b/skimage/transform/integral.py similarity index 100% rename from scikits/image/transform/integral.py rename to skimage/transform/integral.py diff --git a/scikits/image/transform/project.py b/skimage/transform/project.py similarity index 100% rename from scikits/image/transform/project.py rename to skimage/transform/project.py diff --git a/scikits/image/transform/radon_transform.py b/skimage/transform/radon_transform.py similarity index 100% rename from scikits/image/transform/radon_transform.py rename to skimage/transform/radon_transform.py diff --git a/scikits/image/transform/setup.py b/skimage/transform/setup.py similarity index 96% rename from scikits/image/transform/setup.py rename to skimage/transform/setup.py index c5629eb0..58cfaf32 100644 --- a/scikits/image/transform/setup.py +++ b/skimage/transform/setup.py @@ -4,7 +4,7 @@ import os import shutil import hashlib -from scikits.image._build import cython +from skimage._build import cython base_path = os.path.abspath(os.path.dirname(__file__)) diff --git a/scikits/image/transform/tests/test_finite_radon_transform.py b/skimage/transform/tests/test_finite_radon_transform.py similarity index 90% rename from scikits/image/transform/tests/test_finite_radon_transform.py rename to skimage/transform/tests/test_finite_radon_transform.py index 32ebfcbb..d8504477 100644 --- a/scikits/image/transform/tests/test_finite_radon_transform.py +++ b/skimage/transform/tests/test_finite_radon_transform.py @@ -1,7 +1,7 @@ import numpy as np from numpy.testing import * -from scikits.image.transform import * +from skimage.transform import * def test_frt(): SIZE = 59 diff --git a/scikits/image/transform/tests/test_hough_transform.py b/skimage/transform/tests/test_hough_transform.py similarity index 90% rename from scikits/image/transform/tests/test_hough_transform.py rename to skimage/transform/tests/test_hough_transform.py index 52c70d7a..b75291e8 100644 --- a/scikits/image/transform/tests/test_hough_transform.py +++ b/skimage/transform/tests/test_hough_transform.py @@ -1,9 +1,9 @@ import numpy as np from numpy.testing import * -import scikits.image.transform as tf -import scikits.image.transform.hough_transform as ht -from scikits.image.transform import probabilistic_hough +import skimage.transform as tf +import skimage.transform.hough_transform as ht +from skimage.transform import probabilistic_hough def append_desc(func, description): """Append the test function ``func`` and append @@ -13,7 +13,7 @@ def append_desc(func, description): return func -from scikits.image.transform import * +from skimage.transform import * def test_hough(): # Generate a test image diff --git a/scikits/image/transform/tests/test_integral.py b/skimage/transform/tests/test_integral.py similarity index 92% rename from scikits/image/transform/tests/test_integral.py rename to skimage/transform/tests/test_integral.py index 65cdd632..b8905d92 100644 --- a/scikits/image/transform/tests/test_integral.py +++ b/skimage/transform/tests/test_integral.py @@ -1,7 +1,7 @@ import numpy as np from numpy.testing import * -from scikits.image.transform import integral_image, integrate +from skimage.transform import integral_image, integrate x = (np.random.random((50, 50)) * 255).astype(np.uint8) s = integral_image(x) diff --git a/scikits/image/transform/tests/test_project.py b/skimage/transform/tests/test_project.py similarity index 88% rename from scikits/image/transform/tests/test_project.py rename to skimage/transform/tests/test_project.py index f1756f99..de63419f 100644 --- a/scikits/image/transform/tests/test_project.py +++ b/skimage/transform/tests/test_project.py @@ -1,10 +1,10 @@ import numpy as np from numpy.testing import assert_array_almost_equal -from scikits.image.transform.project import _stackcopy -from scikits.image.transform import homography, fast_homography -from scikits.image import data -from scikits.image.color import rgb2gray +from skimage.transform.project import _stackcopy +from skimage.transform import homography, fast_homography +from skimage import data +from skimage.color import rgb2gray def test_stackcopy(): layers = 4 diff --git a/scikits/image/transform/tests/test_radon_transform.py b/skimage/transform/tests/test_radon_transform.py similarity index 98% rename from scikits/image/transform/tests/test_radon_transform.py rename to skimage/transform/tests/test_radon_transform.py index 6679528f..36074932 100644 --- a/scikits/image/transform/tests/test_radon_transform.py +++ b/skimage/transform/tests/test_radon_transform.py @@ -1,6 +1,6 @@ import numpy as np from numpy.testing import * -from scikits.image.transform import * +from skimage.transform import * def rescale(x): x = x.astype(float) diff --git a/scikits/image/util/__init__.py b/skimage/util/__init__.py similarity index 100% rename from scikits/image/util/__init__.py rename to skimage/util/__init__.py diff --git a/scikits/image/util/dtype.py b/skimage/util/dtype.py similarity index 100% rename from scikits/image/util/dtype.py rename to skimage/util/dtype.py diff --git a/scikits/image/util/tests/test_dtype.py b/skimage/util/tests/test_dtype.py similarity index 90% rename from scikits/image/util/tests/test_dtype.py rename to skimage/util/tests/test_dtype.py index d7cc3259..4932a480 100644 --- a/scikits/image/util/tests/test_dtype.py +++ b/skimage/util/tests/test_dtype.py @@ -1,7 +1,7 @@ import numpy as np from numpy.testing import assert_equal -from scikits.image import img_as_int, img_as_float, \ - img_as_uint, img_as_ubyte +from skimage import img_as_int, img_as_float, \ + img_as_uint, img_as_ubyte dtype_range = {np.uint8: (0, 255), np.uint16: (0, 65535), diff --git a/skimage/version.py b/skimage/version.py new file mode 100644 index 00000000..285cea03 --- /dev/null +++ b/skimage/version.py @@ -0,0 +1,2 @@ +# THIS FILE IS GENERATED FROM THE SKIMAGE SETUP.PY +version='0.4dev'