complete singularization of scikit-image

I've updated references in the code and documentation to the new name.

DEVELOPMENT.txt

@@ -4,8 +4,8 @@ Development process
 :doc:`Read this overview <gitwash/index>` of how to use Git with
 ``skimage``.  Here's the long and short of it:
 
- * Go to `https://github.com/scikits-image/scikits-image
+ * Go to `https://github.com/scikit-image/scikit-image
-   <http://github.com/scikits-image/scikits-image>`_ and follow the
+   <http://github.com/scikit-image/scikit-image>`_ and follow the
    instructions on making your own fork.
  * Create a new branch for the feature you want to work on.  Since the
    branch name will appear in the merge message, use a sensible name
@@ -42,7 +42,7 @@ Guidelines
  * Follow the `Python PEPs <http://www.python.org/dev/peps/pep-0008/>`_
    where possible.
  * No major changes should be committed without review.  Ask on the
-   `mailing list <http://groups.google.com/group/scikits-image>`_ if
+   `mailing list <http://groups.google.com/group/scikit-image>`_ if
    you get no response to your pull request.
  * Examples in the gallery should have a maximum figure width of 8 inches.
 
@@ -99,4 +99,4 @@ detailing the test coverage::
 
 Bugs
 ````
-Please `report bugs on Github <https://github.com/scikits-image/scikits-image/issues>`_.
+Please `report bugs on Github <https://github.com/scikit-image/scikit-image/issues>`_.

LICENSE.txt

@@ -1,7 +1,7 @@
 Unless otherwise specified by LICENSE.txt files in individual
 directories, all code is
 
-Copyright (C) 2011, the scikits-image team
+Copyright (C) 2011, the scikit-image team
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.rst

@@ -3,11 +3,11 @@ Image Processing SciKit
 
 Source
 ------
-https://github.com/scikits-image/scikits-image
+https://github.com/scikit-image/scikit-image
 
 Mailing List
 ------------
-http://groups.google.com/group/scikits-image
+http://groups.google.com/group/scikit-image
 
 Installation from source
 ------------------------

RELEASE.txt

@@ -38,7 +38,7 @@ How to make a new release of ``skimage``
   - In ``bento.info``, set to ``0.X.dev0``.
 
 - Update the web frontpage:
-  The webpage is kept in a separate repo: scikits-image-web
+  The webpage is kept in a separate repo: scikit-image-web
 
   - Sync your branch with the remote repo: ``git pull``.
     If you try to ``make gh-pages`` when your branch is out of sync, it

TASKS.txt

@@ -16,13 +16,13 @@ How to contribute to ``skimage``
 
 
 Developing Open Source is great fun!  Join us on the `skimage mailing
-list <http://groups.google.com/group/scikits-image>`_ and tell us which of the
+list <http://groups.google.com/group/scikit-image>`_ 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 <gitwash/index>` when developing skimage
-* If you're looking something to implement, you can find a list of `requested features on github <https://github.com/scikits-image/scikits-image/wiki/Requested-features>`__. In addition, you can browse the `open issues on github <https://github.com/scikits-image/scikits-image/issues?state=open>`__.
+* If you're looking something to implement, you can find a list of `requested features on github <https://github.com/scikit-image/scikit-image/wiki/Requested-features>`__. In addition, you can browse the `open issues on github <https://github.com/scikit-image/scikit-image/issues?state=open>`__.
 
 .. contents::
    :local:

bento.info

@@ -1,15 +1,15 @@
-Name: scikits-image
+Name: scikit-image
 Version: 0.8.dev0
 Summary: Image processing routines for SciPy
-Url: http://scikits-image.org
+Url: http://scikit-image.org
-DownloadUrl: http://github.com/scikits-image/scikits-image
+DownloadUrl: http://github.com/scikit-image/scikit-image
 Description:     Image Processing SciKit
 
     Image processing algorithms for SciPy, including IO, morphology, filtering,
     warping, color manipulation, object detection, etc.
 
     Please refer to the online documentation at
-    http://scikits-image.org/
+    http://scikit-image.org/
 Maintainer: Stefan van der Walt
 MaintainerEmail: stefan@sun.ac.za
 License: Modified BSD

doc/Makefile

@@ -77,17 +77,17 @@ qthelp:
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
 	      ".qhcp project file in build/qthelp, like this:"
-	@echo "# qcollectiongenerator build/qthelp/scikitsimage.qhcp"
+	@echo "# qcollectiongenerator build/qthelp/scikitimage.qhcp"
 	@echo "To view the help file:"
-	@echo "# assistant -collectionFile build/qthelp/scikitsimage.qhc"
+	@echo "# assistant -collectionFile build/qthelp/scikitimage.qhc"
 
 devhelp:
 	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(DEST)/devhelp
 	@echo
 	@echo "Build finished."
 	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/scikitsimage"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/scikitimage"
-	@echo "# ln -s build/devhelp $$HOME/.local/share/devhelp/scikitsimage"
+	@echo "# ln -s build/devhelp $$HOME/.local/share/devhelp/scikitimage"
 	@echo "# devhelp"
 
 latex:

doc/logo/Makefile

@@ -1,11 +1,11 @@
 .PHONY: logo
 
 logo: green_orange_snake.png snake_logo.svg
-	inkscape --export-png=scikits_image_logo.png --export-dpi=100 \
+	inkscape --export-png=scikit_image_logo.png --export-dpi=100 \
 		     --export-area-drawing --export-background-opacity=1 \
 			 snake_logo.svg
 	python shrink_logo.py
 
 green_orange_snake.png:
-	python scikits_image_logo.py --no-plot
+	python scikit_image_logo.py --no-plot
 

doc/logo/shrink_logo.py

@@ -2,7 +2,7 @@ from skimage import io, transform
 
 s = 0.7
 
-img = io.imread('scikits_image_logo.png')
+img = io.imread('scikit_image_logo.png')
 h, w, c = img.shape
 
 print "\nScaling down logo by %.1fx..." % s
@@ -13,4 +13,4 @@ img = transform.homography(img, [[s, 0, 0],
                            output_shape=(int(h*s), int(w*s), 4),
                            order=3)
 
-io.imsave('scikits_image_logo_small.png', img)
+io.imsave('scikit_image_logo_small.png', img)

doc/make.bat

@@ -74,9 +74,9 @@ if "%1" == "qthelp" (
 	echo.
 	echo.Build finished; now you can run "qcollectiongenerator" with the ^
 .qhcp project file in build/qthelp, like this:
-	echo.^> qcollectiongenerator build\qthelp\scikitsimage.qhcp
+	echo.^> qcollectiongenerator build\qthelp\scikitimage.qhcp
 	echo.To view the help file:
-	echo.^> assistant -collectionFile build\qthelp\scikitsimage.ghc
+	echo.^> assistant -collectionFile build\qthelp\scikitimage.ghc
 	goto end
 )
 

doc/source/conf.py

@@ -176,7 +176,7 @@ html_sidebars = {
 #html_file_suffix = ''
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'scikitsimagedoc'
+htmlhelp_basename = 'scikitimagedoc'
 
 
 # -- Options for LaTeX output --------------------------------------------------
@@ -190,7 +190,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'The Image Scikit Documentation',
+  ('contents', 'scikitimage.tex', u'The Image Scikit Documentation',
    u'SciPy Developers', 'manual'),
 ]
 

setup.py

@@ -6,17 +6,17 @@ Image processing algorithms for SciPy, including IO, morphology, filtering,
 warping, color manipulation, object detection, etc.
 
 Please refer to the online documentation at
-http://scikits-image.org/
+http://scikit-image.org/
 """
 
-DISTNAME            = 'scikits-image'
+DISTNAME            = 'scikit-image'
 DESCRIPTION         = 'Image processing routines for SciPy'
 LONG_DESCRIPTION    = descr
 MAINTAINER          = 'Stefan van der Walt'
 MAINTAINER_EMAIL    = 'stefan@sun.ac.za'
-URL                 = 'http://scikits-image.org'
+URL                 = 'http://scikit-image.org'
 LICENSE             = 'Modified BSD'
-DOWNLOAD_URL        = 'http://github.com/scikits-image/scikits-image'
+DOWNLOAD_URL        = 'http://github.com/scikit-image/scikit-image'
 VERSION             = '0.8dev'
 PYTHON_VERSION      = (2, 5)
 DEPENDENCIES        = {

skimage/__init__.py

@@ -1,6 +1,6 @@
 """Image Processing SciKit (Toolbox for SciPy)
 
-``scikits-image`` (a.k.a. ``skimage``) is a collection of algorithms for image
+``scikit-image`` (a.k.a. ``skimage``) is a collection of algorithms for image
 processing and computer vision.
 
 The main package of ``skimage`` only provides a few utilities for converting

skimage/_shared/setup.py

@@ -28,11 +28,11 @@ def configuration(parent_package='', top_path=None):
 
 if __name__ == '__main__':
     from numpy.distutils.core import setup
-    setup(maintainer='Scikits-image Developers',
+    setup(maintainer='scikit-image Developers',
-          author='Scikits-image Developers',
+          author='scikit-image Developers',
-          maintainer_email='scikits-image@googlegroups.com',
+          maintainer_email='scikit-image@googlegroups.com',
           description='Transforms',
-          url='https://github.com/scikits-image/scikits-image',
+          url='https://github.com/scikit-image/scikit-image',
           license='SciPy License (BSD Style)',
           **(configuration(top_path='').todict())
           )

skimage/draw/setup.py

@@ -21,11 +21,11 @@ def configuration(parent_package='', top_path=None):
 
 if __name__ == '__main__':
     from numpy.distutils.core import setup
-    setup(maintainer='scikits-image developers',
+    setup(maintainer='scikit-image developers',
-          author='scikits-image developers',
+          author='scikit-image developers',
-          maintainer_email='scikits-image@googlegroups.com',
+          maintainer_email='scikit-image@googlegroups.com',
           description='Drawing',
-          url='https://github.com/scikits-image/scikits-image',
+          url='https://github.com/scikit-image/scikit-image',
           license='SciPy License (BSD Style)',
           **(configuration(top_path='').todict())
           )

skimage/feature/setup.py

@@ -24,11 +24,11 @@ def configuration(parent_package='', top_path=None):
 
 if __name__ == '__main__':
     from numpy.distutils.core import setup
-    setup(maintainer='scikits-image Developers',
+    setup(maintainer='scikit-image Developers',
-          author='scikits-image Developers',
+          author='scikit-image Developers',
-          maintainer_email='scikits-image@googlegroups.com',
+          maintainer_email='scikit-image@googlegroups.com',
           description='Features',
-          url='https://github.com/scikits-image/scikits-image',
+          url='https://github.com/scikit-image/scikit-image',
           license='SciPy License (BSD Style)',
           **(configuration(top_path='').todict())
           )

skimage/filter/setup.py

@@ -21,11 +21,11 @@ def configuration(parent_package='', top_path=None):
 
 if __name__ == '__main__':
     from numpy.distutils.core import setup
-    setup(maintainer='scikits-image Developers',
+    setup(maintainer='scikit-image Developers',
-          author='scikits-image Developers',
+          author='scikit-image Developers',
-          maintainer_email='scikits-image@googlegroups.com',
+          maintainer_email='scikit-image@googlegroups.com',
           description='Filters',
-          url='https://github.com/scikits-image/scikits-image',
+          url='https://github.com/scikit-image/scikit-image',
           license='SciPy License (BSD Style)',
           **(configuration(top_path='').todict())
           )

skimage/graph/setup.py

@@ -29,10 +29,10 @@ def configuration(parent_package='', top_path=None):
 
 if __name__ == '__main__':
     from numpy.distutils.core import setup
-    setup(maintainer='scikits-image Developers',
+    setup(maintainer='scikit-image Developers',
-          maintainer_email='scikits-image@googlegroups.com',
+          maintainer_email='scikit-image@googlegroups.com',
           description='Graph-based Image-processing Algorithms',
-          url='https://github.com/scikits-image/scikits-image',
+          url='https://github.com/scikit-image/scikit-image',
           license='Modified BSD',
           **(configuration(top_path='').todict())
           )

skimage/io/_plugins/skivi.py

@@ -3,9 +3,9 @@ Skivi is written/maintained/developed by:
 
 S. Chris Colbert - sccolbert@gmail.com
 
-Skivi is free software and is part of the scikits-image project.
+Skivi is free software and is part of the scikit-image project.
 
-Skivi is governed by the licenses of the scikits-image project.
+Skivi is governed by the licenses of the scikit-image project.
 
 Please report any bugs to the author.
 

skimage/io/setup.py

@@ -31,10 +31,10 @@ def configuration(parent_package='', top_path=None):
 
 if __name__ == '__main__':
     from numpy.distutils.core import setup
-    setup(maintainer='scikits-image Developers',
+    setup(maintainer='scikit-image Developers',
-          maintainer_email='scikits-image@googlegroups.com',
+          maintainer_email='scikit-image@googlegroups.com',
           description='Image I/O Routines',
-          url='https://github.com/scikits-image/scikits-image',
+          url='https://github.com/scikit-image/scikit-image',
           license='Modified BSD',
           **(configuration(top_path='').todict())
           )

skimage/measure/setup.py

@@ -24,10 +24,10 @@ def configuration(parent_package='', top_path=None):
 
 if __name__ == '__main__':
     from numpy.distutils.core import setup
-    setup(maintainer='scikits-image Developers',
+    setup(maintainer='scikit-image Developers',
-          maintainer_email='scikits-image@googlegroups.com',
+          maintainer_email='scikit-image@googlegroups.com',
           description='Graph-based Image-processing Algorithms',
-          url='https://github.com/scikits-image/scikits-image',
+          url='https://github.com/scikit-image/scikit-image',
           license='Modified BSD',
           **(configuration(top_path='').todict())
           )

skimage/morphology/setup.py

@@ -39,11 +39,11 @@ def configuration(parent_package='', top_path=None):
 
 if __name__ == '__main__':
     from numpy.distutils.core import setup
-    setup(maintainer='scikits-image Developers',
+    setup(maintainer='scikit-image Developers',
           author='Damian Eads',
-          maintainer_email='scikits-image@googlegroups.com',
+          maintainer_email='scikit-image@googlegroups.com',
           description='Morphology Wrapper',
-          url='https://github.com/scikits-image/scikits-image',
+          url='https://github.com/scikit-image/scikit-image',
           license='SciPy License (BSD Style)',
           **(configuration(top_path='').todict())
           )

skimage/segmentation/setup.py

@@ -25,10 +25,10 @@ def configuration(parent_package='', top_path=None):
 
 if __name__ == '__main__':
     from numpy.distutils.core import setup
-    setup(maintainer='scikits-image Developers',
+    setup(maintainer='scikit-image Developers',
-          maintainer_email='scikits-image@googlegroups.com',
+          maintainer_email='scikit-image@googlegroups.com',
           description='Segmentation Algorithms',
-          url='https://github.com/scikits-image/scikits-image',
+          url='https://github.com/scikit-image/scikit-image',
           license='SciPy License (BSD Style)',
           **(configuration(top_path='').todict())
           )

skimage/transform/setup.py

@@ -26,11 +26,11 @@ def configuration(parent_package='', top_path=None):
 
 if __name__ == '__main__':
     from numpy.distutils.core import setup
-    setup(maintainer='Scikits-image Developers',
+    setup(maintainer='scikit-image Developers',
-          author='Scikits-image Developers',
+          author='scikit-image Developers',
-          maintainer_email='scikits-image@googlegroups.com',
+          maintainer_email='scikit-image@googlegroups.com',
           description='Transforms',
-          url='https://github.com/scikits-image/scikits-image',
+          url='https://github.com/scikit-image/scikit-image',
           license='SciPy License (BSD Style)',
           **(configuration(top_path='').todict())
           )