Commit Graph

150 Commits

Author SHA1 Message Date
Steven Silvester 208afc3837 Move version_requirements to _shared and remove skipif from require. 2014-08-02 11:09:46 -05:00
blink1073 b6dcf3c336 Update Travis build to use Anaconda.
Update Travis build to use Anaconda

Travis updates and fixes

More travis fixes

Another travis attempt

Revert changes

Use PIL and Pillow

Refactor travis into 4 different builds

Fix activation error

Remove explicit mpl in build_versions.py

Make matplotlib an explicit requirement

Rearrange travis

Make pillow a hard requirement

Try again to make Pillow optional

Fix bash syntax error

Fix bash syntax error

Bump required cython version

More rearrangments

Remove mpl from build_versions, rearrange travis

Fix version check

Make matplotlib explicit again

Conda install into test env

Check for proper install

Allow tests to skip if networkx is not available

Allow tests to skip if networkx is not available

Try swapping pillow for matplotlib

Allow tests to pass when matplotlib is not present

Remove matplotlib from build_versions

Print PIL version

Get pillow from PIP

Allow tests to skip if matplotlib is not present.

Allow tests to skip if networkx is not present.

travis fix

Remove unused mpl import that caused test error

Use nose-cov and do not run doctests without optional libs

Bump required numpy version and fix nose calls

Make overlay test repeatable

bump numpy version again

Move low-end numpy to python 2.7

Play with minimum versions

Add version requirements and use functions

Add version requirements and use functions

Allow require to skip a test

More implementation of require decorator

Update require decorator and clean up tests

Only use requires decorator when needed

Fix python3 error in version_requirements

Fix build errors

Fix handling of require with tests

More fixes for require handler

Use latest miniconda

Fix more build errors

Fix another dict comprehension and travis file.

Fix missing imports

Fix dictionary again

Fix import warning

Fix last failing test on 2.6

Skip doc examples on python2.6

Do not run doctests on python2.6

Fix typo in travis.yml

Make numpy-1.6 compatibility changes

Use numpy-1.6 in travis python2.6

Add tests for version requirements

Fix line noise in PR

Add additional io plugins

Fix simpleitk test.

Fix python 3 error in freeimage_plugin.

Install imread in Travis.

Put matplotlib settings in XDG recommended directory

Fix formatting in travis yml

Fix formatting in travis yml

Make sure to close PIL file atexit

Fix name of apt package xcftools

Fix pil fp closing

Fix matplotlibrc creation

Only download SimpleITK on py2x, run coverage on py27

Fix travis yml syntax error

Run coveralls on py2.7

Install SimpleITK on py3.3 and run coverage on py3.3

Make simpleitk install quiet

Use standard nose and clean up incantation

Fix travis yml syntax error

Put in miniconda workout for libc error.

Fix imread plugin.

Fix travis syntax

Remove unused import

Remove miniconda libpng in favor of system png

Fix imread install and move libm removal to after optional pkg install.

Fix png header copy in travis yml

Another attempt to use png headers

Debug freeimage

Add jpeg library for freeimage and debug imread.

More debug for imread and freeimage

More freeimage and imread debugging

More debugging

Use correct paths for test env

Make sure imread is tied to libpng15

Add a TODO note for simpleitk test causing error.

Fix typo in yml

Cleanup and add more comments to travis yml

Update comment

Try and add 3.2 support.

Docstring formatting

Add more travis comments.

Try numpy 1.6 on python 2.7

Fix travis syntax error

Rename CONDA to ENV for clarity

Alias python on python 3.2

Use python 3.2 as the system python

Clean up libfreeimage install

Fix order on py3.2 pre_install

Move old numpy back to py26

Use the appropriate python calls.

Debug 3.2 build.

Update comment

Fix syntax error

Another fix for syntax error.

Install scipy after downloading import tools

More debugging for py32

Do not install conda on py3.2 (duh)

Fix typo in travis yml

Fix py32 qt install, separate pyfits and imread to find error

Fix syntax error and front-load option lib check for debug

pyfits is not supported in py3.2, try imread now

imread is also not supported on py3.2

install imread before pyfits to show relationship with libs

Make pip builds quiet

Minor formatting to retrigger build

Allow simpleitk to fail to download without breaking the build

Use travis_retry for SimpleITK

See what breaks when we keep libm in

Now remove libm again
2014-08-02 06:47:09 -05:00
Josh Warner (Mac) 1ca0eef825 FIX: Non-integer indexing deprecation warnings 2014-05-08 00:39:54 -05:00
Stefan van der Walt 86beb21e5a Move all_warnings to skimage._shared.utils 2014-04-27 03:23:22 +02:00
Stefan van der Walt 8fdd5a270d In all_warnings context manager, return warnings for examination 2014-04-27 02:16:41 +02:00
Stefan van der Walt 337f3d175f Update shape tests to use all_warnings 2014-04-27 02:10:29 +02:00
Stefan van der Walt 132aa8bbd3 Add all_warnings context manager
The context manager searches for __warningregistry__ entries that
Python leaves all over the place, clearing them, thereby ensuring
that warnings will always be raised.  This is necessary for the test
suite to detect warnings even if they were raised before under
the "once" filter.
2014-04-27 02:08:33 +02:00
Stefan van der Walt 717f5feb51 Fix typo in docstring 2014-04-08 11:15:24 +02:00
Stefan van der Walt c18d4bbe59 Update view_as_windows docstring 2014-04-07 18:18:09 +02:00
Stefan van der Walt 12af2ef7ed Take a softer approach and raise a warning when a non-contiguous input is provided 2014-04-07 18:15:49 +02:00
Stefan van der Walt 5733a02853 Do not allow view_as_* to return copies (closes #866) 2014-04-07 14:41:56 +02:00
François Boulogne ced3f5656f DOC: specify range for step 2014-03-15 07:42:08 -04:00
François Boulogne cf7a184ba7 TEST: add test on step 2014-03-15 07:40:39 -04:00
François Boulogne 217b0aa697 MAINT: remove blank lines 2014-03-15 07:39:06 -04:00
Johannes Schönberger f280e0b13e Fix regular grid doctest 2014-03-13 18:24:59 -04:00
Josh Warner faa4f571d4 Merge pull request #847 from ahojnnes/template
Fix bugs in array padding and template matching
2014-01-13 19:13:55 -08:00
Juan Nunez-Iglesias a67c5e1e2b Explicity cast start, step to int in regular_grid 2013-12-13 00:54:57 +11:00
Johannes Schönberger 33d00e7411 Update arraypad tests 2013-12-09 00:07:00 +01:00
Johannes Schönberger 783c04baec Fix bug in array padding, template matching 2013-12-08 18:54:02 +01:00
Johannes Schönberger 5038a0e958 Remove numpy prefix from pad function examples 2013-11-03 18:16:25 +01:00
Johannes Schönberger 256a0bad07 Fix montage2d doctest 2013-11-03 09:55:06 +01:00
Stefan van der Walt eb6867cfe2 Make six an external dependency. 2013-10-27 14:06:26 +02:00
François Boulogne 65f73ee171 DOC: fix syntax error 2013-10-14 16:25:29 +02:00
François Boulogne 69bdfe0339 PEP8 another one 2013-10-14 16:22:29 +02:00
Josh Warner (Mac) 1c5dc10f4d FEAT: Add 'localvar' mode to random_noise 2013-10-13 12:21:29 -05:00
Josh Warner (Mac) f20aa5e661 FIX: Better handling of skimage.data.camera for Python3 compatibility 2013-10-12 09:32:46 -05:00
Josh Warner (Mac) 9f7a2f4fbc ENH: Tighten tests, all noise types now support signed I/O 2013-10-11 16:53:16 -05:00
Josh Warner (Mac) f435afebd5 ENH: Add optional clip kwarg, docs, & handling of signed inputs. 2013-10-11 16:39:22 -05:00
Josh Warner (Mac) c2e4442eaf ENH: More concise next-power-of-2 calculation 2013-10-11 10:51:07 -05:00
Josh Warner (Mac) de42ba831a FIX: Fix and improve Poisson random noise generator
The Poissson generator now works.

The improved Poisson generator now infers the bit depth of the image
after conversion to a floating point image, by analyzing the unique
values present and finding the next power of two. This value is then
used to scale the floating point image up, after which Poisson
noise is generated, and then image is then scaled back down.
2013-10-11 01:53:15 -05:00
Johannes Schönberger 3e3a52331d Misc doc string fixes 2013-10-02 17:07:23 +02:00
Johannes Schönberger 445dd7e859 Merge pull request #630 from JDWarner/improve_noise
ENH: Improve random_noise with better param names & docfixes
2013-09-14 01:41:08 -07:00
Josh Warner (Mac) 6f5f6a0a7a DOC: Further improvements to naming conventions. 2013-09-07 00:39:04 -05:00
Stefan van der Walt b0d3b92e74 Add skip parameter to view_as_windows. 2013-09-01 23:50:54 +02:00
Emmanuelle Gouillart 4d80670925 Merge pull request #672 from jni/chull-fix
Convex hull fix
2013-08-25 04:48:20 -07:00
Juan Nunez-Iglesias 072eb7640a Add docstring note explaining coord use case 2013-08-25 11:06:31 +02:00
Juan Nunez-Iglesias cb28bba6ee Add note describing array copy if discontiguous 2013-08-25 11:04:50 +02:00
Stefan van der Walt d9836a6add Remove logger in favor of warnings. 2013-08-21 00:10:33 +02:00
Juan Nunez-Iglesias b40ef3ad7d Ensure array input to unique_rows is contiguous 2013-08-06 22:46:12 +10:00
Juan Nunez-Iglesias 909d4cb5f6 Add test to unique_rows for discontiguous arrays 2013-08-06 22:45:21 +10:00
Juan Nunez-Iglesias 640c49608d Add unique_rows to util/__init__.py 2013-08-05 09:40:10 +10:00
Juan Nunez-Iglesias 11f9a5bdbd Add test for unique_rows 2013-08-05 09:35:50 +10:00
Juan Nunez-Iglesias 89dbb4dccb Add unique_rows function 2013-08-05 09:26:36 +10:00
Josh Warner a3bb1098d1 Merge pull request #632 from ahojnnes/local-blocks
Refactor N-dimensial array resampling and add additional functionality
2013-07-31 14:10:18 -07:00
Josh Warner b5d09bcd1c Merge pull request #603 from TheChymera/master
ENH: User-specified output aspect ratio in skimage.util.montage.montage2d function
2013-07-20 22:33:32 -07:00
Horea Christian 35a65aeef3 Resolved faulty montage2d import. 2013-07-21 05:55:02 +02:00
Horea Christian 2d33bf7622 Added test case for grid_shape parameter. 2013-07-21 03:55:16 +02:00
Horea Christian 228bf8f7ba Adapted if statement to grid_shape=None 2013-07-19 00:32:38 +02:00
Horea Christian 90f3a5d685 Syntax and default variable.
From (0,0) to None.
2013-07-18 17:54:03 +02:00
Johannes Schönberger dc27babee2 Merge pull request #546 from jni/3d-slic
Add support for 3D images in SLIC segmentation
2013-07-14 23:50:38 -07:00