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
This applies `adapt_rgb` to `equalize_adapthist` and removes the
special-casing of RGB images in that function. Note that tests of
`adapt_rgb` fail because some type conversion and intensity scaling
were added to pass tests for `equalize_adapthist`.
* 'adapthist' of github.com:blink1073/scikits-image:
Cleaned up adapthist func to use LAB for all RGB->required rest result change
Removed sys.path hack in test, fixed spelling of import in __init__.py
Translated clahe C code to python, added to list of contributors.
Passed all tests with full coverage, PEP8 and Pylint performed.
Improved support for color images using lab transform.
Replaced generic ACM license with the Graphics Gems IV license.
Pep8 fixes.
Added Notes to the docstring.
Tests pass and example works on build.
Initial commit of adapthist modifications.
Conflicts:
CONTRIBUTORS.txt
doc/examples/plot_equalize.py
skimage/exposure/_adapthist.py
skimage/exposure/tests/test_exposure.py
skimage/setup.py
blink1073