Commit Graph

6852 Commits

Author SHA1 Message Date
Stefan van der Walt cf8d69ca81 Merge pull request #1077 from buzmakov/master
Increase reconstruction quality of FPB in iradon documentation example.
2015-03-02 08:24:47 -08:00
Stefan van der Walt 884516980a Merge pull request #1320 from blink1073/pr/1057
Add Appveyor CI support
2015-03-02 07:55:57 -08:00
Jonathan Helmus 78a0eb6b98 Implement appveyor builds
Implement Appveyor builds

initial test

Updated appveyor.yml

New nosetest call

With conda update conda

with pillow

without pillow

TST: Change case sensitivive JPG extension

Revert "TST: Change case sensitivive JPG extension"

This reverts commit 2deed7cc63736f7c6f0387bd37df4c6643c32847.

Trying with Python 2.7

Trying with version env

Trying again with variables

Testing on all Python versions

don't allow failures

Allow failure

Do not actually use tests

Ignore failing tests

Removed Python 2.6 test

Testing only Python 2.6

Testing out more sklearn like AppVeyor CI

Added install to pip

Add artifacts

Enabled all permutations

Disable 2.6, add PIL

Python 2.6, 2.7 only with PIL

Testing with variable dependencies

Allow failure with IF ELSE

With Python 3.4

Scikit-learn like appveyor CI

Fixing paths

Undo path fix

path fix single line

path fix single line 2

Using Miniconda

More path fixes

New wheelhouse link

Added pillow to requirements.txt

Added networkx to requirements.txt

Add testing of 32/64-bit Python 2.7 and 3.4 to matrix

Debugging Cython compile

Retry with all 4 builds

Updated install.ps1 file

Updated based on latest python-appveyor-demo

Debugging pip install

Specify numpy 1.8.1 until whl is uploaded to rackspace

Use skimage-wide requirements.txt file

Minor comment change to trigger build

Install wheel and then install from WHEELHOUSE

Install six from pip

Install networkx from pip

Install pyparsing from pip

Install pytz from pip

Try using just find-links

Install the binary dependencies first, then the rest

Add pillow to the install list

Fix appveyor.yml syntax

Fix requirements.txt syntax

Fix requirements.txt syntax again

Fix appveyor call to initial install

Fix appveyor call to initial install again

Fix appveyor call to initial install yet again

Install wheel

Install wheel first

Install wheel and nose in the appveyor requirements.txt

Fix Python3 version to match python ftp site

Only use cleanup decorator if available

Add debug info to multiimage test

More debugging information

Fix handling of path separators on Windows

Add another warning guard

Fix warning handling for non-windows

Do not use TkAgg as it may be causing alloc error

Clean up echo command

Allow for unclosed file warning

Fix spacing in echo command
2015-02-28 19:57:45 -06:00
Steven Silvester 4156e20459 Merge pull request #1397 from JDWarner/fix_find_contours
FIX: Ignore exception if attempted deletion fails (fixes #817)
2015-02-28 19:29:42 -06:00
Josh Warner (Mac) ea02a4e348 FIX: Ignore exception if attempted deletion fails (fixes #817) 2015-02-28 17:11:31 -06:00
Juan Nunez-Iglesias 3f6d9fa985 Merge pull request #1385 from stefanv/README_deps_update
Update README and installation instructions
2015-02-25 13:49:42 +11:00
Josh Warner 23f1a88578 Merge pull request #1391 from ahojnnes/eigvals-fix
FIX: Hessian matrix eigvals computation
2015-02-24 12:36:03 -06:00
Steven Silvester 1649fb627d Merge pull request #1392 from jmetz/threshold_li
Update threshold_li
2015-02-24 07:58:57 -05:00
Jeremy Metz 28d0691d9e Minor modification to docstring 2015-02-24 12:39:09 +00:00
Jeremy Metz 06b2a50f22 Merge branch 'master' into threshold_li 2015-02-24 12:25:49 +00:00
Jeremy Metz 09bb2c319c Moved contribution statement to CONTRIBUTORS.txt
* Amended docstring
2015-02-24 10:23:47 +00:00
Stefan van der Walt d5468845e4 Mention license type 2015-02-24 00:28:23 -08:00
Johannes Schönberger 84bcb583d7 Fix Hessian matrix eigvals 2015-02-23 22:32:04 -05:00
Steven Silvester 6ddec9bd85 Merge pull request #1376 from jmetz/threshold_li
Li thresholding port from imagej
2015-02-23 12:55:16 -05:00
Jeremy Metz 2bc9e82465 Minor stylistic changes, removed lena test 2015-02-23 16:40:38 +00:00
Jeremy Metz 3cbae84360 PEP8 fixes, License file added, tests added
* Added 7 tests (3 in TestSimpleImage, 4 as separate functions)
* Added ImageJ license file
* Updated Li code
  * threshold set from image instead of fixed at 0.5
  * subtract min to handle -ve images (as log is integral part of alg.)
2015-02-23 11:22:12 +00:00
Stefan van der Walt c00670459f Update README and installation instructions 2015-02-22 23:28:34 -08:00
Steven Silvester a3c89ced87 Merge pull request #1384 from stefanv/py3_ghpages
Fix gh-pages under Python 3. Make robust against running twice in a row.
2015-02-22 21:48:48 -05:00
Stefan van der Walt 6ab7df1875 Fix gh-pages under Python 3. Make robust against running twice in a row. 2015-02-22 17:23:13 -08:00
Steven Silvester b27eb88496 Merge pull request #1382 from arve0/ImageViewer.update_image
move CollectionViewer `update_image` to parent class
2015-02-20 08:18:25 -06:00
arve0 3acae2274f move CollectionViewer update_image to parent class 2015-02-20 13:09:25 +01:00
Josh Warner 4644bdd347 Merge pull request #874 from emmanuelle/nlm_denoise
FEAT: NL-means denoising
2015-02-19 16:53:58 -06:00
Josh Warner 5247c36af7 Merge pull request #1380 from arve0/fix_Blitmanager.remove_artists
FIX: Remove artist from artists, not itself
2015-02-18 16:41:53 -06:00
Josh Warner 3f33ce7797 Merge pull request #1378 from arve0/fix_canny_simple_viewer_example
FIX: Use feature.canny in viewer example
2015-02-18 16:33:38 -06:00
arve0 2308ba0617 fix typo artist.remove -> artists.remove 2015-02-18 22:19:31 +01:00
arve0 de4df6559a use feature.canny 2015-02-18 21:32:16 +01:00
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