Commit Graph

7427 Commits

Author SHA1 Message Date
Stefan van der Walt c0a5010998 Merge pull request #1377 from blink1073/test-against-pil
Test against PIL on Python 2.7 Travis
2015-02-17 10:47:43 -08:00
Steven Silvester 2613b81bf7 Fix name of pil package 2015-02-17 11:12:24 -06:00
Steven Silvester 914248c190 Test against PIL on python 2.7 2015-02-17 10:53:51 -06:00
Jeremy Metz 5eef38bba5 Removed nbins input (from use with histogram input) 2015-02-17 14:55:27 +00:00
Jeremy Metz 979d7515f0 Cleaned up comments, removed unnecessary vars 2015-02-17 14:45:31 +00:00
Jeremy Metz 2970de33ee Initial draft of Li thresholding (comments left in) 2015-02-17 14:36:58 +00:00
Juan Nunez-Iglesias 0ec4016926 Merge pull request #1375 from tonysyu/fix/pil-compatibility
Fix compatibility with PIL
2015-02-17 17:18:26 +11:00
Tony S Yu 977ec17d8a Fix numpy 1.9 warnings about array.fromstring 2015-02-16 22:41:28 -06:00
Tony S Yu 7da811993a Fix compatibility with PIL 2015-02-16 22:02:52 -06:00
Juan Nunez-Iglesias b9aceac632 Merge pull request #1374 from blink1073/fix-fallback-test
Fix behavior of skimage.doctest when nose is not found
2015-02-17 14:36:55 +11:00
Steven Silvester 23b643ae55 Fix behavior of skimage.doctest when nose is not found 2015-02-16 21:33:09 -06:00
emmanuelle 3eb775542f Added some comments inside Cython functions. 2015-02-10 23:22:42 +01:00
Stefan van der Walt a4e4612ad7 Merge pull request #1079 from blink1073/fix-colorconv
Fix holes in lab conversions and add tests
2015-02-09 13:57:48 -08:00
Steven Silvester 371d46ecf5 Remove unnecessary option and update test 2015-02-09 14:37:11 -06:00
Stefan van der Walt ebee2bcf04 Merge pull request #1371 from blink1073/fix-reference-links
DOC: Fix reference links
2015-02-07 18:31:29 -08:00
Steven Silvester ed7aecdc4c Fix links 2015-02-07 19:33:30 -06:00
Steven Silvester 73aa5a22ba Remove citations in first line of docstring 2015-02-07 19:29:50 -06:00
Steven Silvester 26548181bf Be more specific about citation not found error 2015-02-07 19:29:32 -06:00
Stefan van der Walt f0cabfeeb6 Merge pull request #1356 from blink1073/travis-build-docs
Verify doc building with Travis
2015-02-07 16:55:00 -08:00
Steven Silvester 1a612e53c7 Do not build docs on Py2.6
Do not build docs on PY2.6

Install more latex dependencies

Fix bash script syntax

Install dvipng
2015-02-07 16:41:21 -06:00
Steven Silvester 72218fb0d0 Install latex and dvipng
Install latex

Quiet down latex install

Install just the base latex

Another try at latex install
2015-02-07 16:41:07 -06:00
Steven Silvester fa226ad807 Update the README with some warning hints
Update the readme with some warning hints

Tweak README

Tweak README

Fix preferred plugins test

Pep8 fix

Remove imshow from PIL plugin

Fix spelling

Tweak readme
2015-02-07 16:40:54 -06:00
Steven Silvester 5ccdd36bc3 Remove imshow from PIL plugin
Do not provide imshow, show in PIL plugin to prevent conflicts

Make the sphinx install quiet

Fix local linka

Fix literal blocks

Fix another local link

Fix richardson-lucy link

Assert world dominance
2015-02-07 16:40:44 -06:00
Steven Silvester be7154f23d Skip build on 3.2
Skip doc build on 3.2

Skip doc build on 3.2

Use block literal

Fix html make target

Revert change to threshold_isodata

Fix skimage.novice and thresholding warnings

Fix feature.__init__ __all__

Fix generic.py link

Doc reference fixes

Fix missing class member warnings

Add parallelization to the user guide toc

Remove unused automodule directives

Fix sub_dirs in gallery_index

Remove unused file and fix reference to api/api

Add missing links to user guide

Use pre-output links to images

Recover from Juan's doc 'upgrades'
2015-02-07 16:40:37 -06:00
Steven Silvester 09876408fc Fix some sphinx warnings and add to build
Fix some sphinx warnings

Add documentation build to test

Add documentation build to test

Remove change in numpydoc

Remove change in apigen

Add makefile target for html and add to travis script

Add a makefile target for html and add to travis script

Fix more sphinx warnings
2015-02-07 16:40:26 -06:00
Steven Silvester 1af0edbb02 Update test to reflect new error behaviour 2015-02-05 21:53:57 -06:00
blink1073 8042dc2cd9 Fix holes in lab conversions and add tests
Fix holes in lab conversions and add tests

Fix holes in lab conversions and add tests

Add saturation protection and error raising by default

Trigger travis rebuild after error

Raise warning by default, change parameter name
2015-02-05 21:47:17 -06:00
Steven Silvester d082d137aa Merge pull request #1370 from r3vl1s/imread_collections
load correct _frame_index
2015-02-05 20:03:17 -06:00
Tim Seifert 3748557ac9 fix for concatenate test 2015-02-04 22:59:19 -06:00
Stefan van der Walt 703087061b Merge pull request #1352 from jni/data-types
Document range preservation
2015-02-04 19:02:33 -08:00
Tim Seifert 4bdde3d2ae load correct _frame_index 2015-02-04 12:24:20 -06:00
Josh Warner b34f7aac45 Merge pull request #1367 from blink1073/fix-deprecated-decorators
FIX: Cannot use bare deprecated decorators
2015-02-03 22:06:38 -07:00
Steven Silvester f4970f9707 Fix canny import test 2015-02-03 21:47:56 -06:00
Steven Silvester d070b2df4d Add an explicit test for canny deprecation 2015-02-03 21:39:23 -06:00
Steven Silvester 69c0fd5e46 Give an alternate canny location 2015-02-03 21:34:25 -06:00
Steven Silvester 85a68cff28 Cannot use bare deprecated decorator 2015-02-03 21:10:30 -06:00
Steven Silvester cd0a6480d9 Merge pull request #1366 from JDWarner/mixed_permission_error
FIX: Informative IOError if package installed w/mixed permissions.
2015-02-03 21:00:25 -06:00
Steven Silvester 372ea53cc9 Merge pull request #1365 from jni/future
Add skimage.future package
2015-02-03 21:00:03 -06:00
Juan Nunez-Iglesias d638e042eb Add concrete usage examples for preserve_range 2015-02-04 09:47:28 +11:00
Josh Warner (Mac) 7d5ed51935 FIX: Informative IOError if package installed w/mixed permissions. 2015-02-03 15:47:28 -07:00
Stefan van der Walt b3e5b126f7 Merge pull request #1280 from jni/array_order
Describe array order terminology in 2D, 2D+c, 3D, 3D+c arrays
2015-02-03 10:27:21 -08:00
Juan Nunez-Iglesias 0d1a2ef1fa Import graph into future parent package 2015-02-04 00:37:48 +11:00
Juan Nunez-Iglesias e5fe82d6f3 Fix even more tests still importing skimage.graph 2015-02-03 16:20:15 +11:00
Juan Nunez-Iglesias 9cbeeca0df Update RAG doctest to use future 2015-02-03 15:52:26 +11:00
Juan Nunez-Iglesias 008775853f Fix setup.py cascade 2015-02-03 15:34:56 +11:00
Juan Nunez-Iglesias d2d50e9391 Add package docstring for skimage.future 2015-02-03 15:20:57 +11:00
Juan Nunez-Iglesias 5bd36730fc Update plot_ncut example to use skimage.future 2015-02-03 15:13:02 +11:00
Juan Nunez-Iglesias 483d7d669b Update plot_rag examples to use skimage.future 2015-02-03 15:10:54 +11:00
Juan Nunez-Iglesias eeaf766291 Update bento file to moved RAG code 2015-02-03 15:08:12 +11:00
Juan Nunez-Iglesias 1b748668ee Move package to skimage.future.graph 2015-02-03 15:06:27 +11:00