Commit Graph

270 Commits

Author SHA1 Message Date
Steven Silvester 1a1d665c0a Use functools.wraps in default_fallback dectorator 2014-09-13 08:10:14 -05:00
Julian Taylor 87c72ae60f BUG: add signed flag to chars
Sign of char is undefined and there are numerous places where its sign
is important. Fixes tests with -funsigned-char.
Closes gh-1110
2014-09-05 23:51:39 +02: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
Juan Nunez-Iglesias 85a5cea533 Merge pull request #1054 from blink1073/add_test_seeds
Add random seeds to tests per #1044

Additionally, change all `np.random.random` to `np.random.rand` calls, as the former are not affected by `np.random.seed`.
2014-07-20 07:48:49 -05:00
blink1073 5677dafe41 Move away from random.random in favor of random.rand 2014-07-19 18:18:23 -05:00
Nelson Brown 6e8ae37f07 Change ndimage test image to fit uint8 range 2014-07-16 20:03:37 -07:00
Nelson Brown eb4725826d Change test of ndimage equivalence to use uint8 test image 2014-07-16 19:57:25 -07:00
Nelson Brown 4449c77884 Fix calls to ndimage to use footprint argument 2014-07-15 08:39:34 -07:00
Nelson Brown 7976520e7a Add test that the 2D results correspond to scipy's
Remove trailing whitespace
2014-07-15 08:25:17 -07:00
Nelson Brown 8c2b9b1784 Updated docstrings 2014-07-15 08:07:30 -07:00
Nelson Brown 001a63bd21 Remove repeated comments 2014-07-15 08:03:31 -07:00
Nelson Brown a1519a015e Change binary morphology functions to output numpy.bool dtype 2014-07-13 19:59:43 -07:00
Nelson Brown b677c400df Add whitespace following comma 2014-07-13 16:55:06 -07:00
Nelson Brown 042d85ad43 Adjust hanging indentation whitespace in dict comprehension 2014-07-13 16:31:58 -07:00
Nelson Brown d9909c4db9 Add tests for ndimage fallback for 3D white_tophat & black_tophat 2014-07-13 12:36:05 -07:00
Nelson Brown f1a8132fbf Add doctrings and comments in response to reviewers 2014-07-13 11:28:27 -07:00
Nelson Brown ea3e65f25a Add 3d-fallback tests for binary functions 2014-07-12 16:54:35 -07:00
Nelson Brown 2b91c259d6 Add fallback decorator for 3D images
We don't support images greater than 2D, so fall back on ndimage
2014-07-12 15:22:48 -07:00
Nelson Brown 3518e65ab4 Add newline at EOF of selem.py 2014-07-11 23:39:07 -07:00
Nelson Brown c2bbca6113 Add a newline at EOF 2014-07-11 23:32:36 -07:00
Nelson Brown 9cd9a1372a Address reviewer comments
Add newline at EOF of selem.py
Add "optional" to grey.py and binary.py
2014-07-11 15:19:33 -07:00
Nelson Brown 1ef556b710 Remove unnecessary whitespace 2014-07-11 14:51:57 -07:00
Nelson Brown 54aff88bd0 Add docstring for default structuring element 2014-07-11 14:10:18 -07:00
Nelson Brown bb732c9225 Add default structuring element to morphology 2014-07-11 13:50:55 -07:00
blink1073 5ef3f95d71 Add random seeds to tests per #1044 2014-07-05 12:49:42 -05:00
Stefan van der Walt dead8612c7 Correctly compare mask to None 2014-06-15 15:04:40 +02:00
Juan Nunez-Iglesias 34cf1f9243 Update parameter list in docstring for consistency 2014-06-12 01:20:53 +10:00
Juan Nunez-Iglesias 8cba840a05 Clarify mask argument in medial_axis docstring 2014-06-11 20:29:06 +10:00
Johannes L. Schönberger 6546b9dba4 Merge pull request #1007 from stefanv/label_refactor
Move `morphology.label` to `measure.label` and prepare for 0-label transition
2014-05-25 21:56:42 -04:00
Stefan van der Walt c0be2ec505 Correctly apply catch_warnings() 2014-05-26 01:21:58 +02:00
Stefan van der Walt 135965fbe4 Avoid circular imports 2014-05-25 20:05:17 +02:00
Stefan van der Walt 5b07567973 Merge pull request #1005 from JDWarner/int_idx_patch
Fix NumPy non-integer indexing deprecation warnings
2014-05-13 17:48:11 +02:00
Johannes Schönberger 7b86728498 Add full test coverage for corner_subpix and fix bug 2014-05-10 10:12:41 -04:00
Johannes Schönberger e4a60e4bf2 Test invalid input for selem 2014-05-10 09:44:59 -04:00
Johannes Schönberger 69a0255a28 Test invalid input for seed 2014-05-10 09:07:01 -04:00
Stefan van der Walt 4da4ec5b89 Mention which parameters to label are optional. Simplify label deprecation. 2014-05-09 03:00:39 +02:00
Josh Warner (Mac) 77b036eb89 Merge branch 'master' of git://github.com/scikit-image/scikit-image into int_idx_patch 2014-05-08 19:57:06 -05:00
Stefan van der Walt 1de102a885 Fix broken and circular imports 2014-05-09 02:53:57 +02:00
Stefan van der Walt 5ba3ea421c Fix imports and suppress deprecation warnings 2014-05-08 19:14:38 +02:00
Stefan van der Walt 46829c6a33 Move implementation of label to measure submodule 2014-05-08 18:04:03 +02:00
Stefan van der Walt 7152d5c314 Move label to measure module (with deprecation). Warn that background parameter will default to 0 in v0.12. 2014-05-08 17:49:47 +02:00
Josh Warner (Mac) 1ca0eef825 FIX: Non-integer indexing deprecation warnings 2014-05-08 00:39:54 -05:00
Josh Warner (Mac) b8334e85c8 failUnless -> assertTrue 2014-05-07 23:16:42 -05:00
Johannes Schönberger cedcff8f2b Remove deprecated skimage.morphology.greyscale_* 2014-04-11 10:05:51 -04:00
Jeremy Metz ef779d1588 Fixed PEP8 spaces 2014-02-02 12:40:37 +00:00
Jeremy Metz 0136fd5915 Removed trailing whitespaces 2014-02-01 20:30:39 +00:00
Jeremy Metz 920c3efb83 Added new convex_hull_image qhull test 2014-02-01 16:17:53 +00:00
Jeremy Metz add4b51db7 QH6228 Bug fix - remove offset from coords 2014-01-31 13:46:28 +00:00
Johannes Schönberger a2cde5ebb0 Test invalid inplace operation 2013-11-22 00:17:59 +01:00
Johannes Schönberger fb1c1d39f0 Fix misspelled sections 2013-11-09 23:01:58 +01:00