Merge pull request #17 from emmanuelle/change_repo_name

Update config files with new repo location. Update build instructions for windows.
This commit is contained in:
Stefan van der Walt
2011-08-29 13:20:39 -07:00
8 changed files with 23 additions and 7 deletions
+16
View File
@@ -4,6 +4,22 @@ Build Requirements
* `Numpy >= 1.4 <http://numpy.scipy.org/>`_
* `Cython >= 0.13 <http://www.cython.org/>`_
Known build errors
------------------
If Cython compilation fails with the error ``cpython.pycapsule.pxd not
found`` (for Cython 0.14), try to `install Cython 0.15
<http://www.cython.org/#download>`_ instead.
On Windows, the error ``Error:unable to find vcvarsall.bat`` means that
distutils is not correctly configured to use the C compiler. Edit (create
if not existing) the configuration file ``distutils.cfg`` (located for
example at ``C:\Python26\Lib\distutils\distutils.cfg``) to be::
[build]
compiler=mingw32
Usage Requirements
------------------
* `Scipy <http://www.scipy.org/>`_
+1 -1
View File
@@ -481,7 +481,7 @@ def run_code(code, code_path, ns=None, function_name=None):
def clear_state(plot_rcparams):
plt.close('all')
matplotlib.rc_file_defaults()
matplotlib.rcdefaults()
matplotlib.rcParams.update(plot_rcparams)
def render_figures(code, code_path, output_dir, output_base, context,
+1 -1
View File
@@ -27,7 +27,7 @@ if __name__ == '__main__':
author = 'Scikits.Image Developers',
maintainer_email = 'scikits-image@googlegroups.com',
description = 'Filters',
url = 'http://stefanv.github.com/scikits.image/',
url = 'https://github.com/scikits-image/scikits.image',
license = 'SciPy License (BSD Style)',
**(configuration(top_path='').todict())
)
+1 -1
View File
@@ -31,7 +31,7 @@ if __name__ == '__main__':
setup(maintainer = 'scikits.image Developers',
maintainer_email = 'scikits-image@googlegroups.com',
description = 'Graph-based Image-processing Algorithms',
url = 'http://stefanv.github.com/scikits.image/',
url = 'https://github.com/scikits-image/scikits.image',
license = 'Modified BSD',
**(configuration(top_path='').todict())
)
+1 -1
View File
@@ -33,7 +33,7 @@ if __name__ == '__main__':
setup(maintainer = 'scikits.image Developers',
maintainer_email = 'scikits-image@googlegroups.com',
description = 'Image I/O Routines',
url = 'http://stefanv.github.com/scikits.image/',
url = 'https://github.com/scikits-image/scikits.image',
license = 'Modified BSD',
**(configuration(top_path='').todict())
)
+1 -1
View File
@@ -30,7 +30,7 @@ if __name__ == '__main__':
author = 'Damian Eads',
maintainer_email = 'scikits-image@googlegroups.com',
description = 'Morphology Wrapper',
url = 'http://stefanv.github.com/scikits.image/',
url = 'https://github.com/scikits-image/scikits.image',
license = 'SciPy License (BSD Style)',
**(configuration(top_path='').todict())
)
+1 -1
View File
@@ -33,7 +33,7 @@ if __name__ == '__main__':
author = 'Steven C. Colbert',
maintainer_email = 'scikits-image@googlegroups.com',
description = 'OpenCV wrapper for NumPy arrays',
url = 'http://stefanv.github.com/scikits.image/',
url = 'https://github.com/scikits-image/scikits.image',
license = 'SciPy License (BSD Style)',
**(configuration(top_path='').todict())
)
+1 -1
View File
@@ -27,7 +27,7 @@ if __name__ == '__main__':
author = 'Scikits.Image Developers',
maintainer_email = 'scikits-image@googlegroups.com',
description = 'Transforms',
url = 'http://stefanv.github.com/scikits.image/',
url = 'https://github.com/scikits-image/scikits.image',
license = 'SciPy License (BSD Style)',
**(configuration(top_path='').todict())
)