6925 Commits

Author SHA1 Message Date
Stefan van der Walt dc10d457d1 gh-pages: Read skimage version from __init__.py 2015-04-12 23:53:21 -07:00
Stefan van der Walt fa7eb64ce7 Add spacing in novice model to make docs render correctly 2015-04-12 23:24:04 -07:00
Stefan van der Walt 07f4803178 Pick up Cython functions when building docs API 2015-04-12 23:23:58 -07:00
Stefan van der Walt 76b7e426d4 Set version to 0.11.3 v0.11.3 2015-04-01 01:26:38 -07:00
Stefan van der Walt edb7f2774e Merge remote-tracking branch 'origin/master' into v0.11.x
Conflicts:
	bento.info
	setup.py
2015-04-01 01:25:44 -07:00
Stefan van der Walt 1a1ebff4ca Merge pull request #1408 from stefanv/tagging
Update tagging instructions for release
2015-04-01 01:14:56 -07:00
Stefan van der Walt f7d47b9881 Merge pull request #1453 from blink1073/only-index-tiff-gif
Only index tif and gif files in collection
2015-03-31 20:17:48 -07:00
Steven Silvester 62e82ccf49 Do not read in the whole array 2015-03-31 20:54:57 -05:00
Steven Silvester ad8c94fcaf Fix handling of non-gif and tiff files 2015-03-30 21:41:44 -05:00
Steven Silvester e531e57124 Only index tif and gif files in collection 2015-03-29 21:54:35 -05:00
Josh Warner 3e9506c6b3 Merge pull request #1457 from blink1073/fix-pkg-resources
FIX: Fix setup to allow installing from PyPI
2015-03-29 21:54:11 -05:00
Steven Silvester eed18b803f Another random warning guard 2015-03-29 15:36:25 -05:00
Steven Silvester adac822ee9 Fix setup to allow installing from PyPI
≈
Fix setup to allow installing from PyPi
Another attempt at fixing the setuptools problem

Fix pip incantation

Fix typo

Try updating setuptools too

Try upgrading pip and setuptools after venv install

Rule out install_requires as the source of the problem

Try just requiring the ones that can be built from source

Use explicit install_requires and move version checks to after setup runs

Clean up installation for PyPI compatiblity

Dead end commit

Fix travis to match new installation procedure

Put build_versions check after install

Fix travis syntax

Switch to lower-case cython in version check

Another attempt

Another fix

Fix syntax error

Make header executable

Build inplace on py27

Fix finding of source code version in sphinx

Fix travis syntax

Import setuptools after install

Fix the version check in sphinx

Work around setuptools bug in 2.7

Fix handling of Cython requirement and update release notes

Switch to one Appveyor build and update build method

Add cython back to install_requires

Remove debug lines

Another try for appveyor install

Another attempt at setuptools and Appveyor

Do not let intermittent apt-get failures crash the build

Fix typo

Another appveyor attempt

More fixes for setuptools and Appveyor

Yet another setuptools/appveyor attempt

Put requirements.txt back in order

Fix typo

Fix readlines function call

Try not using a venv for python 2.7

Fix syntax

Try the provided venv for py27

Remove --user

Remove debug info

Another try for python27 fix

Try again

Do not use install_requires with numpy/scipy

Try just avoiding scipy

Try removing scipy (numpy was before)

Avoid both scipy and numpy

Fix qt install on 27

Fix qt install on 27 agin

Revert the scripts to their previous condition

Revert file permission changes

Undo changes to requirements.txt
2015-03-29 15:36:11 -05:00
Stefan van der Walt 65d525bcd5 Merge pull request #1452 from blink1073/fix-pkg-resources
Fix for broken setuptools on Py27 Travis build
2015-03-25 19:07:35 -07:00
Steven Silvester 77d725893e Fix for broken setuptools 2015-03-25 20:18:08 -05:00
Juan Nunez-Iglesias 8ff27aaa8a Merge pull request #1440 from blink1073/fix-imread
Fix handling of ImageCollection indexing and add test
2015-03-25 14:20:17 +11:00
Josh Warner f9b85c454e Merge pull request #1446 from arve0/readme_typo
STY: Close conda install code string in README
2015-03-24 13:37:55 -05:00
arve0 94d987ddcb close conda install code string 2015-03-24 19:25:33 +01:00
Steven Silvester a25d4d274e Merge pull request #1426 from arve0/dependencies
install_requires from requirements.txt
2015-03-24 12:31:38 -05:00
Steven Silvester 9ef99d0bb1 Fix freeimage collection test 2015-03-23 19:33:57 -05:00
Steven Silvester 73b1942751 Do not attempt to use _frame_index for exotic load_patterns 2015-03-23 15:35:17 -05:00
Steven Silvester caea879bfc More specific test in freeimage 2015-03-21 09:31:34 -05:00
Steven Silvester a51d49abe6 Always use _find_images() 2015-03-21 09:31:05 -05:00
Steven Silvester 4344817c70 Remove debug error raise 2015-03-20 19:35:17 -05:00
Steven Silvester 80555a2bdb Add a note to the docstring 2015-03-20 19:14:25 -05:00
Steven Silvester 45f21d3941 Fix handling of ImageCollection indexing and add test 2015-03-20 19:11:29 -05:00
Steven Silvester e91dcbae0b Merge pull request #1436 from ericdill/save-buttons-fix
TST: Barn-door testing of SaveButtons clicks
2015-03-19 14:20:09 -05:00
Eric Dill 8af43739c4 TST: Barn-door testing of SaveButtons clicks
The canny_simple.py demo in viewer_examples/plugins has a save
button that raises an AttributeError in PIL because the button
click is passing 'False' to the SaveButtons.save_to_file function
when it expects a filename or None.
2015-03-19 08:35:57 -04:00
arve0 3c6e00083f add some more magic 2015-03-17 10:59:20 +01:00
arve0 98ad602780 install sphinx before running tests in travis 2015-03-15 12:51:13 +01:00
arve0 2107ab24a9 install_requires from requirements.txt 2015-03-15 09:30:00 +01:00
Steven Silvester 6051ff215c Merge pull request #1430 from arve0/document_measure.label
import from _label instead of _ccomp
2015-03-14 22:00:45 -05:00
Steven Silvester 779ab425b0 Merge pull request #1416 from jni/low-contrast-docstring
Clarify 'low-contrast' in docstring
2015-03-14 21:40:27 -05:00
Juan Nunez-Iglesias 0d3d5f1319 Update See Also to References
"See Also" is apparently reserved by sphinx-numpydoc for pointers to
other code functions, rather than documentation.
2015-03-15 12:21:18 +11:00
Juan Nunez-Iglesias 2f62cf9d2e Clarify 'low-contrast' in docstring 2015-03-15 12:21:18 +11:00
Steven Silvester 0e92486fa3 Merge pull request #1429 from JDWarner/dev_guide_indentation
DOC: Fix Sphinx rendering of dev process docs
2015-03-14 18:19:36 -05:00
arve0 6fceaa2f75 import from _label instead of _ccomp 2015-03-14 23:22:15 +01:00
Steven Silvester a67e0f98a8 Merge pull request #1428 from arve0/doc_requires_latex
add note about latex
2015-03-14 16:50:37 -05:00
Josh Warner 660c161cbf Merge pull request #1388 from arve0/move_docstrings_to_init
DOC: Move viewer.widgets docstring to __init__.py
2015-03-14 16:24:56 -05:00
Josh Warner (Mac) d745e9c46e DOC: Fix Sphinx rendering of dev process docs 2015-03-14 16:15:31 -05:00
arve0 ae95170f6a add note about latex 2015-03-14 20:27:03 +01:00
arve0 f737ac4496 move docstring from viewer.widgets.core to viewer.widgets 2015-03-14 20:26:36 +01:00
Josh Warner 3aa767de0c Merge pull request #1424 from blink1073/contrast-check-function
FIX: Handle Sphinx 1.3 API change
2015-03-14 14:23:54 -05:00
Steven Silvester 5c6ee9511c Remove unnecessary sphinx version check 2015-03-14 10:39:25 -05:00
Steven Silvester 15f6497bfe Revert changes to force Sphinx 1.2.3 2015-03-14 10:35:59 -05:00
Steven Silvester 9c3a6c1e91 Fix support for Sphinx 1.3 2015-03-14 10:35:04 -05:00
Steven Silvester 7d65366b67 Try a fix for py27 build 2015-03-13 22:07:04 -05:00
Steven Silvester c62397493a Handle Sphinx 1.3 API change 2015-03-13 08:18:50 -05:00
Juan Nunez-Iglesias d4463ba537 Merge pull request #1412 from blink1073/contrast-check-function
Add a function to check whether an image is low contrast for its data type.
2015-03-11 00:27:16 +11:00
Steven Silvester 0e61374a89 Add a helper function to check for low contrast
Add a helper function to check for low contrast

Add a check for low contrast when using imsave

Use the low contrast helper in imshow and make sure warnings are always shown

Clean up parameter names and add doctests

Remove unnecessary warning context

Remove unnecessary warning context

Add dtype ranges for 64bit types

Update tests with new warnings

Fix doctest logic

Fix doctest logic

Add a low contrast test with multiple dtypes

Fix check for color images

Fix color check again

Add support for int32 types

Relax assertion for 32bit builds

Add a low contrast test with multiple dtypes

Add a low contrast test with multiple dtypes

Fix check for color images

Fix color check again

Add support for int32 types
2015-03-09 21:34:58 -05:00