From 391f68587a1678eee7c63a117608a919c1124681 Mon Sep 17 00:00:00 2001 From: Emmanuelle Gouillart Date: Wed, 24 Aug 2011 10:57:49 +0200 Subject: [PATCH 1/2] 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 fa422d508407f1e2bb745e0404b68aadd315e849 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Wed, 24 Aug 2011 03:54:22 -0700 Subject: [PATCH 2/2] Correctly detect missing FreeImage. --- scikits/image/io/tests/test_plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikits/image/io/tests/test_plugin.py b/scikits/image/io/tests/test_plugin.py index 305acf5e..4ad4f41e 100644 --- a/scikits/image/io/tests/test_plugin.py +++ b/scikits/image/io/tests/test_plugin.py @@ -17,7 +17,7 @@ try: io.use_plugin('freeimage') FI_available = True priority_plugin = 'freeimage' -except ImportError: +except OSError: FI_available = False