Commit Graph

62 Commits

Author SHA1 Message Date
Steven Silvester 782ba46a4c Handle more warnings
Punt on the issue of warnings with the minimum build

Handle warnings in measure pkg

Fix the rank filter test by forcing a random seed in the function

Compare as boolean in imread test

Import loadmat in test_setup to avoid warning

Use a setup method for imread plugin test

Revoke unintended changes

Fix indentation to appease jni

More indentation fixes

Fix unintentional comment out
2014-12-23 16:49:59 -06:00
Steven Silvester 6db92d387b More doctest and pil_plugin fixes
Fix Python2 imread in pil_plugin.

Load from data

Use all_warnings when importing the other packages

More fixes for regionprops doctest
2014-12-23 16:49:38 -06:00
Steven Silvester 2756358f3c Clean up PIL plugin and handle more warnings
Use the pil plugin to load data files

Fix install_requires string formatting

Dead end commit

Make all tools executable

Remove debug print

Suppress PIL resourcewarnings

Handle a few more warnings
2014-12-23 16:48:38 -06:00
Steven Silvester 9e8f91930e Handle warnings in several packages
Start handling warnings in data, exposure, and draw

Add a known_warning decorator and suppress warnings in color pkg

Use the existing all_warnings context manager

Raise warnings in data

Raise warnings in draw

Raise warnings in exposure

Suppress warnings in exposure tests

Add comments about warning suppressions

Raise warnings in feature

Fix warnings in filter package

Add warning handling to graph

Handle warnings in io package
2014-12-23 16:47:41 -06:00
Steven Silvester 874d68ba3f # This is a combination of 7 commits.
# The first commit's message is:
Add a known_warning decorator and suppress warnings in color pkg

# This is the 2nd commit message:

Use the existing all_warnings context manager

# This is the 3rd commit message:

Raise warnings in data

# This is the 4th commit message:

Raise warnings in draw

# This is the 5th commit message:

Raise warnings in exposure

# This is the 6th commit message:

Suppress warnings in exposure tests

# This is the 7th commit message:

Add comments about warning suppressions
2014-12-23 16:46:24 -06:00
Steven Silvester 2966e262a3 Fix handling of singleton frames in pil_to_ndarray 2014-12-12 09:39:08 -06:00
Steven Silvester 296e492658 Fix handling of multi-image gifs and add test 2014-12-12 07:46:16 -06:00
Steven Silvester f7e984662a Fix handling of imgnum 2014-12-12 07:46:15 -06:00
Steven Silvester b7da8009d2 Clean up docstring 2014-11-07 15:22:20 +02:00
Steven Silvester 0d76827734 Allow keyword arguments to imread 2014-11-07 15:22:20 +02:00
Steven Silvester b4838c3bd9 Fix failing tests 2014-11-07 15:22:19 +02:00
Steven Silvester bf9bcaaf0d Add a note about sequential access. 2014-11-07 15:22:19 +02:00
Steven Silvester 1c0d86a48d Allow PIL imread to read multiple images 2014-11-07 15:22:19 +02:00
Steven Silvester 4298b8babc Allow multiple frames in PIL data in imread 2014-11-07 15:22:19 +02:00
Steven Silvester 39d9dcf20e Fix implementation of pil_to_ndarray in MultiImage 2014-11-07 15:22:19 +02:00
Steven Silvester dfffd07e4a Clean up the imports in the pil_plugin 2014-11-02 07:03:15 -06:00
Steven Silvester 268eb5f2b5 Add tifffile to a new external package. 2014-10-15 05:57:05 -05:00
Steven Silvester 56915d29c3 Fix tifffile imports 2014-10-12 15:10:40 -05:00
Steven Silvester 84a56fa4a0 Fix docstring links 2014-10-11 04:48:18 -05:00
Steven Silvester fe6912b591 Add 'imsave' to the '*' output of pil_plugin 2014-10-10 05:43:46 -05:00
Steven Silvester ae19578192 Remove unused import 2014-10-09 20:18:44 -05:00
Steven Silvester 708ab0593b Fix docstring typo 2014-10-09 20:18:43 -05:00
Steven Silvester bae672f34b Do not try and save signed integer output, improved signed checks for tif. 2014-10-09 20:18:43 -05:00
Steven Silvester 047650ce38 Fix reference citation 2014-10-09 20:18:43 -05:00
Steven Silvester fb9f7e7346 Properly handle all image types for PNG, beef up docs 2014-10-09 20:18:43 -05:00
Steven Silvester 9b768dc681 Add references in docstrings 2014-10-09 20:18:43 -05:00
Steven Silvester 74c87b583d Clean up imsave behavior and beef up docstring 2014-10-09 20:18:43 -05:00
Steven Silvester 199c3da307 Clean up tests and add to bento.info.
Remove "no plugin" test because we will always have a plugin.

Fix handling of bools in ubyte check

Fix integration of tifffile.c

Clean up new tests.

Fix _tifffile import and add to bento.info

Add tifffile.py and fix pil_plugin import

Add tifffile tests to test_pil and remove PIL import checks
2014-10-09 20:18:20 -05:00
Steven Silvester 8049c642af Add tests for new behavior.
Add tests for new behavior

Fix utils import and make io.tests a package
2014-10-09 20:18:20 -05:00
Steven Silvester 7374f4ac53 Add tifffile.py and its license.
Add use of tifffile and its license

Actually add the tifffile file and LICENSE
2014-10-09 20:18:20 -05:00
Steven Silvester 5f769cb4bf Fix handling of non-uint8 images for PIL imsave.
Fix handling of non-uint8 imags for PIL imsave.

Update build requirements and documentation

Reorganized dependencies in DEPENDS.txt.

Fix install_requires string formatting

Use img_as_ubyte instead of the previous hack

Add to the docstring notes.

Add to docstring notes

Fix errant changes

Add support for tif floating point and 16bit files

Handle case where format_str is None

Add note about 2D TIFF file support

Add handling for uint16 and integer types.
2014-10-09 20:18:20 -05:00
Steven Silvester 8758ce9f93 Minor formatting of error message 2014-09-19 19:40:41 -05:00
Steven Silvester 53760e3d87 Point user to Pillow docs for external libraries 2014-09-19 19:39:50 -05:00
Steven Silvester 7e33ee75e8 Clean up error message. 2014-09-19 19:33:22 -05:00
Steven Silvester 688f669181 Perform im.getdata check up front 2014-09-19 19:25:42 -05:00
Steven Silvester adae753c42 Fix indent 2014-09-19 18:52:23 -05:00
Steven Silvester c59cd1c496 Catch PIL imread problems early and generate error message 2014-09-19 18:50:42 -05:00
Adam Feuer 8494b8081a removed trailing blank line in comment 2014-08-09 10:37:11 -07:00
Adam Feuer ef7da3be4a explicitly checking for None as per code review feedback
- instead of implicit (non-truthy) test
2014-08-09 09:04:05 -07:00
Adam Feuer 25f08ff68e removing trailing space (PEP8 formatting) 2014-08-09 09:03:06 -07:00
Adam Feuer 05380823cc updated imread parameters comment to standard format
- with 'str' file type (instead of 'string')
2014-08-09 09:01:07 -07:00
Adam Feuer 6d9a3c3913 reformat comments to be standard format
- clarified function names
- comments in standard format
- removed extra blank line
- as per code review feedback
2014-08-06 21:14:00 -07:00
Adam Feuer 1dcb60fd68 added tests for roundtrip export and import
- and corrected error in imexport - wasn't using imsave code
  correctly
- split imsave into imsave and imexport functions to reuse
  imsave code
2014-08-05 07:52:45 -07:00
Adam Feuer b03683d6c5 pil_plugin can import and export from memory
- added capability to import and export to PIL Image
  objects, not just files - allows for converting
  to and from PIL image objects without writing
  to disk
- no unit test yet
2014-08-05 07:50:09 -07: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
François Boulogne ba11683d45 update info about PIL 2014-04-03 19:56:02 -04:00
Stefan van der Walt b71008a135 Fix Image.frombytes for older version of Python/PIL 2014-02-12 12:59:51 +02:00
Stefan van der Walt c930133982 Use frombytes instead of fromstring on PIL images, since the latter is now deprecated 2014-02-12 12:17:26 +02:00
Stefan van der Walt eb6867cfe2 Make six an external dependency. 2013-10-27 14:06:26 +02:00
cgohlke ea357a4464 BUG: basestring not defined on PY3 2013-10-10 21:16:14 -07:00