From 1704ab31a926ba8a141f6d2fbff306d4c4f5641f Mon Sep 17 00:00:00 2001 From: Nelle Varoquaux Date: Tue, 18 Oct 2011 21:07:40 +0200 Subject: [PATCH] skimage/version.py should be ignored. Doc has been updated with new module name ``sklearn`` --- .gitignore | 2 +- LICENSE.txt | 2 +- TASKS.txt | 4 ++-- doc/source/conf.py | 8 ++++---- skimage/data/__init__.py | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) 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/LICENSE.txt b/LICENSE.txt index 1de81082..8da77167 100644 --- a/LICENSE.txt +++ b/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 Image Scikit team All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/TASKS.txt b/TASKS.txt index d51e115f..ff1fe2dd 100644 --- a/TASKS.txt +++ b/TASKS.txt @@ -3,13 +3,13 @@ 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/source/conf.py b/doc/source/conf.py index 4f5f086f..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. @@ -49,7 +49,7 @@ master_doc = 'index' # General information about the project. project = u'skimage' -copyright = u'2011, scikits-image team' +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/skimage/data/__init__.py b/skimage/data/__init__.py index 67802ed9..3c4d30c5 100644 --- a/skimage/data/__init__.py +++ b/skimage/data/__init__.py @@ -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))