Renamed scikits.image to skimage

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

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

scikits/__init__.py

@@ -1 +0,0 @@
-__import__('pkg_resources').declare_namespace(__name__)

scikits/image/version.py

@@ -1 +0,0 @@
-version='unbuilt-dev'

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},

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:

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):

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)

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
 

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.

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
 

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__))
 

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))

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):

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), 

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__))
 

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):

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():

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):

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'),

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():
 

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__))

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)

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

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],

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

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]