Commit Graph

93 Commits

Author SHA1 Message Date
Steven Silvester 2355c17e3c Add mask option to exposure.equalize_hist with test.
Remove print and fix comparision to None

Update test to make it clear there is a difference

Fix mask logic and `equalize_hist` in `__all__`.

Fix handling of mask and tweak mask test

Another run at travis

Update travis to avoid conflict
2014-08-31 21:15:01 -05:00
Steven Silvester e8e23fa154 Fix typo in spacer declaration 2014-08-31 11:03:30 -05:00
Steven Silvester e8987b582f Fix matplotlib install, make installs verbose, add spacers 2014-08-31 10:56:41 -05:00
Steven Silvester 72f6a8c056 Make suggested changes to build update and use travis_retry for all installs. 2014-08-11 17:01:53 -05:00
Steven Silvester 5996cf8aba Add travis_retry around the conda installs 2014-08-04 10:48:15 -05:00
Steven Silvester 480a9f72fc Add note in travis 2014-08-04 10:44:23 -05:00
Steven Silvester 56152fe6a7 Update comment 2014-08-04 07:32:11 -05:00
Steven Silvester 26a550a93b Formatting fix. 2014-08-04 07:13:42 -05:00
Steven Silvester f2b7e104f8 Add documentation and rename import variable 2014-08-04 06:37:48 -05:00
Steven Silvester e3b84edf1b Fix python 2.6 restoration/unwrap error 2014-08-02 10:30:32 -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
Vighnesh Birodkar 5165ebe01e Added networkx installation 2014-06-19 02:50:25 +05:30
Stefan van der Walt 10459feefc Don't fail if .matplotlib dir already exists 2014-05-05 17:01:27 +02:00
Stefan van der Walt c666b0f2d6 Remove deprecated --use-mirrors from pip calls 2014-05-05 16:34:31 +02:00
Stefan van der Walt b03d59f736 Print versions of software used in Travis output 2014-05-05 16:33:46 +02:00
Stefan van der Walt 9142c51cbb Replace broken _import_tools from numpy with Git version 2014-05-05 16:33:46 +02:00
Vighnesh Birodkar f1a8e6bd4c Tab to spaces. 2014-04-27 11:51:25 +05:30
Vighnesh Birodkar 0b4ad42dd1 pip command correction. 2014-04-27 11:51:15 +05:30
Vighnesh Birodkar b6224d0502 Changed travis.yml to install pillow. 2014-04-27 11:51:03 +05:30
Johannes L. Schönberger 34ec43e8f0 Merge pull request #973 from stefanv/coveralls_other
Try another Coveralls package
2014-04-13 20:08:24 -04:00
Stefan van der Walt e3303dba54 Use coveralls instead of python-coveralls 2014-04-14 00:27:39 +02:00
Stefan van der Walt 697e8e66d4 Fix coverage config specification in nosetests invocation 2014-04-13 23:56:35 +02:00
Stefan van der Walt c0625f8c5a Distinguish between executable Python and Python version for apt-get 2014-04-09 18:24:18 +02:00
Stefan van der Walt 14773e34d5 Print warnings while testing 2014-04-08 01:19:37 +02:00
Stefan van der Walt ddf06f1fcb Travis-ci doesn't like 'if-else'? 2014-02-12 14:25:46 +02:00
Stefan van der Walt 4c80d31e1d Exit with status zero under Python 2 2014-02-12 13:38:09 +02:00
Stefan van der Walt 7a77c12393 Only run coverage for Python 3. 2014-02-12 13:38:09 +02:00
Stefan van der Walt 1280f38378 Fix invocation of nosetests. 2013-11-20 17:48:56 +02:00
Stefan van der Walt 5d9d5e99af Ignore setup. No need for tmp dir any longer. 2013-11-20 16:58:45 +02:00
Stefan van der Walt 531f0c2cfb Change to test directory before running coveralls 2013-11-20 16:58:04 +02:00
Stefan van der Walt 588a86e7d3 Execute coveralls without flags. 2013-11-20 16:58:03 +02:00
Stefan van der Walt 6583b469ba Add coverall support 2013-11-20 16:55:52 +02:00
Johannes Schönberger b9b50dcf22 Make sure stdlib io is not shadowed by skimage.io 2013-11-18 12:27:44 +01:00
Johannes Schönberger e472528e3d Return correct exit code for tests 2013-11-18 12:12:01 +01:00
Johannes Schönberger b1d146df00 Use skimage test functions instead of nose commandline 2013-11-18 11:37:47 +01:00
Johannes Schönberger c9a0e530f1 Remove python 2.6 and 3.3 2013-11-09 17:52:10 +01:00
Johannes Schönberger a242f00a46 Add python 2.6 and 3.3 environments 2013-11-09 12:20:53 +01:00
Johannes Schönberger 729c38c9a5 Fix matplotlibrc configuration 2013-11-09 10:18:58 +01:00
Johannes Schönberger 4fa7b5ba03 Touch non-existent matplotlibrc 2013-11-09 09:12:25 +01:00
Johannes Schönberger 49fc67ce06 Simplify travis config 2013-11-08 20:32:32 +01:00
Johannes Schönberger f76f06c71d Discard pip installation and install matplotlib from PyPI 2013-11-07 16:48:57 +01:00
Johannes Schönberger 64e21e9a43 Use travis-ci python config 2013-11-07 08:11:41 +01:00
Johannes Schönberger b7b391c712 Temporarily disable brief test cases and ignore test files with a leading underscore 2013-11-03 23:40:13 +01:00
Johannes Schönberger a1fcc65e88 Also run doc tests for files with a leading underscore 2013-11-03 23:13:05 +01:00
Johannes Schönberger 20e8e723f0 Only build in-place 2013-11-03 18:28:17 +01:00
Johannes Schönberger 66219e8f3a Build extensions in-place 2013-11-03 16:24:12 +01:00
Johannes Schönberger 0e32735b6a Do not change into a separate directory for testing 2013-11-03 15:52:39 +01:00
Johannes Schönberger cc33e53531 Use xvfb rather than xorg 2013-11-03 15:36:47 +01:00
Johannes Schönberger 0f303a2f08 Install Cython via pip 2013-11-03 12:24:05 +01:00
Johannes Schönberger 7bf858c8d1 Install xserver 2013-11-03 12:19:49 +01:00