Renaming: scikits.image -> skimage

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

DEVELOPMENT.txt

@@ -2,7 +2,7 @@ Development process
 -------------------
 
 :doc:`Read this overview <gitwash/index>` 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
    <http://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

LICENSE.txt

@@ -6,7 +6,7 @@ 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

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"

TASKS.txt

@@ -1,6 +1,6 @@
  ..  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

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

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]

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)

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

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
 

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
 

doc/logo/shrink_logo.py

@@ -1,4 +1,4 @@
-from scikits.image import io, transform
+from skimage import io, transform
 
 s = 0.7
 

doc/source/conf.py

@@ -48,7 +48,7 @@ source_suffix = '.txt'
 master_doc = 'index'
 
 # General information about the project.
-project = u'scikits.image'
+project = u'skimage'
 copyright = u'2011, scikits-image team'
 
 # The version info for the project you're documenting, acts as replacement for

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 <overview.html>`_
 
-       Introduction to scikits.image.
+       Introduction to skimage.
 
      - `API Reference <api/api.html>`_ (`changes <api_changes.html>`_)
 
-       Documentation for the functions included in scikits.image.
+       Documentation for the functions included in skimage.
 
    * - `Installation Steps <install.html>`_
 
-       How to install scikits.image.
+       How to install skimage.
 
      - `User Guide <user_guide.html>`_
 

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

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

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 

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

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.
 """
 

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]
 

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.'''
 

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)

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