Merge remote-tracking branch 'upstream/master' into neil_yager-skeletonize

* upstream/master:
  Remove print statements
  Remove print statements
  Update URL in package description
  Fix print statements missed by 2to3
  Fix: don't run all scikits tests when running scikits.image.test()
  DOC: Rewash the git docs.
  DOC: Use correct repo URL in gitwash.
  DOC: Add gitwash as a submodule.
  Remove empty gitwash directory in order to fix submodule.
  DOC: Update contributors.
  BUG: Fix scikits.image.test.

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "doc/tools/gitwash"]
+	path = doc/tools/gitwash
+	url = git@github.com:matthew-brett/gitwash.git

CONTRIBUTORS.txt

@@ -74,3 +74,7 @@
 
 - David-Warde Farley, Sturla Molden
   Bresenheim line drawing, from snippets on numpy-discussion.
+
+- Christoph Gohlke
+  Windows packaging and Python 3 compatibility.
+

doc/Makefile

@@ -123,4 +123,6 @@ gitwash:
 	python tools/gitwash/gitwash_dumper.py source scikits.image \
 	--project-url=http://scikits-image.org \
 	--project-ml-url=http://groups.google.com/group/scikits-image \
+	--repo-name=scikits.image \
+	--github-user=scikits-image \
 	--source-suffix=.txt

doc/source/gitwash/following_latest.txt

@@ -10,7 +10,7 @@ These are the instructions if you just want to follow the latest
 The steps are:
 
 * :ref:`install-git`
-* get local copy of the git repository from github
+* get local copy of the `scikits.image github`_ git repository
 * update local copy from time to time
 
 Get the local copy of the code
@@ -18,7 +18,7 @@ Get the local copy of the code
 
 From the command line::
 
-   git clone git://github.com/scikits.image/scikits.image.git
+   git clone git://github.com/scikits-image/scikits.image.git
 
 You now have a copy of the code tree in the new ``scikits.image`` directory.
 

doc/source/gitwash/maintainer_workflow.txt

@@ -16,7 +16,7 @@ access to the upstream repo.  Being a maintainer, you've got read-write access.
 It's good to have your upstream remote have a scary name, to remind you that
 it's a read-write remote::
 
-    git remote add upstream-rw git@github.com:scikits.image/scikits.image.git
+    git remote add upstream-rw git@github.com:scikits-image/scikits.image.git
     git fetch upstream-rw
 
 *******************

doc/source/gitwash/patching.txt

@@ -29,7 +29,7 @@ Overview
    git config --global user.email you@yourdomain.example.com
    git config --global user.name "Your Name Comes Here"
    # get the repository if you don't have it
-   git clone git://github.com/scikits.image/scikits.image.git
+   git clone git://github.com/scikits-image/scikits.image.git
    # make a branch for your patching
    cd scikits.image
    git branch the-fix-im-thinking-of
@@ -59,7 +59,7 @@ In detail
 #. If you don't already have one, clone a copy of the
    scikits.image_ repository::
 
-      git clone git://github.com/scikits.image/scikits.image.git
+      git clone git://github.com/scikits-image/scikits.image.git
       cd scikits.image
 
 #. Make a 'feature branch'.  This will be where you work on

doc/source/gitwash/set_up_fork.txt

@@ -13,7 +13,7 @@ Overview
 
    git clone git@github.com:your-user-name/scikits.image.git
    cd scikits.image
-   git remote add upstream git://github.com/scikits.image/scikits.image.git
+   git remote add upstream git://github.com/scikits-image/scikits.image.git
 
 In detail
 =========
@@ -46,7 +46,7 @@ Linking your repository to the upstream repo
 ::
 
    cd scikits.image
-   git remote add upstream git://github.com/scikits.image/scikits.image.git
+   git remote add upstream git://github.com/scikits-image/scikits.image.git
 
 ``upstream`` here is just the arbitrary name we're using to refer to the
 main scikits.image_ repository at `scikits.image github`_.
@@ -59,8 +59,8 @@ use it to merge into our own code.
 Just for your own satisfaction, show yourself that you now have a new
 'remote', with ``git remote -v show``, giving you something like::
 
-   upstream	git://github.com/scikits.image/scikits.image.git (fetch)
-   upstream	git://github.com/scikits.image/scikits.image.git (push)
+   upstream	git://github.com/scikits-image/scikits.image.git (fetch)
+   upstream	git://github.com/scikits-image/scikits.image.git (push)
    origin	git@github.com:your-user-name/scikits.image.git (fetch)
    origin	git@github.com:your-user-name/scikits.image.git (push)
 

doc/source/gitwash/this_project.inc

@@ -1,5 +1,5 @@
 .. scikits.image
 .. _scikits.image: http://scikits-image.org
-.. _`scikits.image github`: http://github.com/scikits.image/scikits.image
+.. _`scikits.image github`: http://github.com/scikits-image/scikits.image
 
 .. _`scikits.image mailing list`: http://groups.google.com/group/scikits-image

scikits/image/__init__.py

@@ -3,7 +3,8 @@
 
 import os.path as _osp
 
-data_dir = _osp.abspath(_osp.join(_osp.dirname(__file__), 'data'))
+pkg_dir = _osp.abspath(_osp.dirname(__file__))
+data_dir = _osp.join(pkg_dir, 'data')
 
 from version import version as __version__
 
@@ -11,8 +12,7 @@ def _setup_test():
     import gzip
     import functools
 
-    basedir = _osp.dirname(_osp.join(__file__, '../'))
-    args = ['', '--exe', '-w', '%s' % basedir]
+    args = ['', '--exe', '-w', '%s' % pkg_dir]
 
     try:
         import nose as _nose

scikits/image/morphology/tests/test_watershed.py

@@ -388,11 +388,9 @@ class TestWatershed(unittest.TestCase):
         before = time.clock() 
         out = watershed(image, markers, self.eight)
         elapsed = time.clock() - before
-        print "Fast watershed ran a megapixel image in %f seconds"%(elapsed)
         before = time.clock()
         out = scipy.ndimage.watershed_ift(image.astype(np.uint16), markers, self.eight)
         elapsed = time.clock() - before
-        print "Scipy watershed ran a megapixel image in %f seconds"%(elapsed)
 
 
 class TestIsLocalMaximum(unittest.TestCase):

scikits/image/transform/tests/test_project.py

@@ -39,8 +39,6 @@ def test_fast_homography():
     H[:2, 2] = [tx, ty]
 
     for mode in ('constant', 'mirror', 'wrap'):
-        print 'Transform mode:', mode
-
         p0 = homography(img, H, mode=mode, order=1)
         p1 = fast_homography(img, H, mode=mode)
         p1 = np.round(p1)
@@ -54,7 +52,6 @@ def test_fast_homography():
         ## plt.show()
 
         d = np.mean(np.abs(p0 - p1))
-        print "delta=", d
         assert d < 0.2
     
 

setup.py

@@ -6,7 +6,7 @@ Image processing algorithms for SciPy, including IO, morphology, filtering,
 warping, color manipulation, object detection, etc.
 
 Please refer to the online documentation at
-http://stefanv.github.com/scikits.image
+http://scikits-image.org/
 """
 
 DISTNAME            = 'scikits.image'