From 8ac2fc17f728a5453514285fee6705609904ab67 Mon Sep 17 00:00:00 2001 From: Emmanuelle Gouillart Date: Wed, 24 Aug 2011 10:57:49 +0200 Subject: [PATCH 1/4] Modified README to point to the new github repo. Mentioned in install doc that it is possible to download a zipball without having git installed. --- README.txt | 2 +- doc/source/install.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.txt b/README.txt index bcdaec07..4ebd7207 100644 --- a/README.txt +++ b/README.txt @@ -3,7 +3,7 @@ Image Processing SciKit Source ------ -http://github.com/stefanv/scikits.image +https://github.com/scikits-image/scikits.image Mailing List ------------ diff --git a/doc/source/install.txt b/doc/source/install.txt index 85806b77..7bf07093 100644 --- a/doc/source/install.txt +++ b/doc/source/install.txt @@ -13,6 +13,10 @@ by running in a terminal (You will need to have git installed on your machine). +If you do not have git installed, you can also download a zipball from +`https://github.com/scikits-image/scikits.image/zipball/master +`_. + The SciKit can be installed globally using :: From 272fbbe1eaa0030b05e18b318f711d6902be548a Mon Sep 17 00:00:00 2001 From: Emmanuelle Gouillart Date: Wed, 24 Aug 2011 17:18:10 +0200 Subject: [PATCH 2/4] Known errors during build for Windows. --- DEPENDS.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/DEPENDS.txt b/DEPENDS.txt index 6c679f1e..151080ac 100644 --- a/DEPENDS.txt +++ b/DEPENDS.txt @@ -4,6 +4,22 @@ Build Requirements * `Numpy >= 1.4 `_ * `Cython >= 0.13 `_ +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 +`_ 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 `_ From a146e80cf6b960b8ced112ef0d5332a8ebba8139 Mon Sep 17 00:00:00 2001 From: Emmanuelle Gouillart Date: Wed, 24 Aug 2011 17:57:09 +0200 Subject: [PATCH 3/4] Fixed broken plot_directive.py so to build the doc. --- doc/ext/plot_directive.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ext/plot_directive.py b/doc/ext/plot_directive.py index 2ad1530a..dc86552b 100644 --- a/doc/ext/plot_directive.py +++ b/doc/ext/plot_directive.py @@ -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, From 805be0ab3f1c98d3d63185a0f801fdfb63b0fe0b Mon Sep 17 00:00:00 2001 From: Emmanuelle Gouillart Date: Mon, 29 Aug 2011 20:55:00 +0200 Subject: [PATCH 4/4] Name of new github repository in setup.py of submodules --- scikits/image/filter/setup.py | 2 +- scikits/image/graph/setup.py | 2 +- scikits/image/io/setup.py | 2 +- scikits/image/morphology/setup.py | 2 +- scikits/image/opencv/setup.py | 2 +- scikits/image/transform/setup.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scikits/image/filter/setup.py b/scikits/image/filter/setup.py index d211d7f4..88fd44a2 100644 --- a/scikits/image/filter/setup.py +++ b/scikits/image/filter/setup.py @@ -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()) ) diff --git a/scikits/image/graph/setup.py b/scikits/image/graph/setup.py index 13cc1455..75d3bfc7 100644 --- a/scikits/image/graph/setup.py +++ b/scikits/image/graph/setup.py @@ -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()) ) diff --git a/scikits/image/io/setup.py b/scikits/image/io/setup.py index 9c9cf023..213928d2 100644 --- a/scikits/image/io/setup.py +++ b/scikits/image/io/setup.py @@ -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()) ) diff --git a/scikits/image/morphology/setup.py b/scikits/image/morphology/setup.py index bdac6d6e..9206670f 100644 --- a/scikits/image/morphology/setup.py +++ b/scikits/image/morphology/setup.py @@ -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()) ) diff --git a/scikits/image/opencv/setup.py b/scikits/image/opencv/setup.py index 0cab7b3b..d9401104 100644 --- a/scikits/image/opencv/setup.py +++ b/scikits/image/opencv/setup.py @@ -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()) ) diff --git a/scikits/image/transform/setup.py b/scikits/image/transform/setup.py index 5e377186..f15dd08c 100644 --- a/scikits/image/transform/setup.py +++ b/scikits/image/transform/setup.py @@ -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()) )