64 Commits

Author SHA1 Message Date
Steven Silvester bfb6175485 Merge pull request #2033 from soupault/remove_python_26
Removed Python 2.6 support and related checks
2016-04-05 18:44:02 -05:00
Steven Silvester 20613eb785 Fix local test function 2016-04-04 08:25:47 -05:00
Egor Panfilov 0e6ccabd93 Removed Python 2.6 support and related checks 2016-04-02 00:03:48 +03:00
Stefan van der Walt d8c18a9f15 Update version to 0.13dev 2016-03-06 18:25:28 -08:00
emmanuelle d5f4f32162 Modified bento.info and skimage/__init__.py with 0.12.0 2016-03-05 17:41:51 +01:00
Steven Silvester cfc5db7a6c Add missing space 2016-01-30 19:09:44 -06:00
Steven Silvester 4b2692b7c0 Cleanup 2016-01-30 15:56:19 -06:00
Steven Silvester b710bd21d2 Use a stacklevel of 2 by default for all warnings 2016-01-30 08:57:46 -06:00
Steven Silvester 683ecde2e1 Start deprecation of python 2.6 2015-12-12 20:27:21 -06:00
Jonathan Helmus 70d1afe153 DOC: Simplified the message when a broken skimage build detected 2015-07-30 14:53:49 -05:00
Jonathan Helmus 00a841f1c2 MAINT: Refactored imports 2015-07-28 14:11:51 -05:00
Jonathan Helmus f10ae88139 MAINT: remove unchecked import from util.dtype 2015-07-28 14:06:03 -05:00
Jonathan Helmus d2519d610f ENH: Build check in skimage/__init__.py module 2015-07-28 14:00:32 -05:00
Jonathan Helmus 64c4252eab BLD: __SKIMAGE_SETUP__ global variable for detecting build
The __SKIMAGE_SETUP__ global variable is set to True if skimage is being build
from the main setup.py file, False if not.  This behavior is modeled after a
similar setup in scikit-learn
2015-07-28 13:16:09 -05:00
michaelpacer edc16c6b75 Added build location checker, does not fully work yet. Complicated error. 2015-07-28 13:14:41 -05:00
Steven Silvester 3d963649fc Use a less-invasive approach 2015-07-16 07:56:14 -05:00
Steven Silvester 756b9289c9 Add the viridis colormap and make it the default 2015-07-14 07:47:59 -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
Steven Silvester 23b643ae55 Fix behavior of skimage.doctest when nose is not found 2015-02-16 21:33:09 -06:00
Steven Silvester 297ccea8b0 Do not try and guess the mpl backend 2014-12-27 10:52:30 -06:00
Steven Silvester 47065d733c Use a smarter backend selection 2014-12-27 10:52:30 -06:00
Steven Silvester 65c1d4eec6 Update viewer for PyQt5 compatibility
Conflicts:
	skimage/viewer/tests/test_plugins.py
	skimage/viewer/tests/test_tools.py
2014-12-27 10:52:27 -06:00
Stefan van der Walt 78a7b7307a Rename and deprecate filter module to prevent shadowing of built-in keyword 2014-11-10 12:53:50 +02:00
Stefan van der Walt 1d99966804 Remove leftovers of old logger 2014-09-01 17:16:13 +01:00
Steven Silvester a85a8bcd39 Fix #1108 2014-08-31 09:50:25 -05:00
Johannes Schönberger b08a1264c1 Remove deprecated logger function in skimage/__init__.py 2014-04-11 10:06:28 -04:00
Johannes Schönberger 9e3070ac57 Homogenize subpackage description 2014-03-29 01:23:10 -04:00
Johannes Schönberger 65dbff751d Update subpackage descriptions 2014-03-28 18:22:50 -04:00
Johannes Schönberger 107f1d607c Move phase unwrapping algorithms to restoration submodule 2014-03-13 18:50:39 -04:00
blink1073 308c5c7e5e Add viewer to main docstring. 2014-02-16 19:18:03 -06:00
François Orieux 4e2a5a9644 Better docstring. Better test coverage. 2013-12-10 22:45:16 +01:00
Johannes Schönberger 12d2e9a204 Fix indentation 2013-11-18 15:32:42 +01: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 307725edb5 Add --exe directive to doc test 2013-11-18 11:50:59 +01:00
Johannes Schönberger 4566c36b3a Add doctest function to skimage 2013-11-18 11:34:54 +01:00
François Boulogne eb4c5c9ee4 PEP8 2013-10-14 16:14:30 +02:00
Stefan van der Walt ca768b0b95 Remove unnecessary import of Warning. 2013-08-21 00:59:37 +02:00
Stefan van der Walt d9836a6add Remove logger in favor of warnings. 2013-08-21 00:10:33 +02:00
Johannes Schönberger 746d815dfa Fix recursion problem with nose test suite 2012-12-15 20:08:18 +01:00
Johannes Schönberger e0f4cd0978 Fix double space in warning message 2012-12-15 19:35:49 +01:00
Johannes Schönberger 450eaee4d9 Hide functools and imp packages in global skimage namespace 2012-12-15 19:35:17 +01:00
Steven Silvester a8dcb32b60 STY: Replaced indent with original formatting, no need to change. 2012-12-15 09:19:26 -06:00
Steven Silvester 49119524e3 Fixed indent on nose.run, so it will run when verbose is False 2012-12-15 09:17:39 -06:00
Steven Silvester b620c0ade6 STY: Added newline at the end of file 2012-12-15 07:40:04 -06:00
Steven Silvester cb1527bbe8 STY: Fixed indent on docstring. 2012-12-15 07:24:31 -06:00
Steven Silvester 380e27e60d Lazily import nose for testing, makes skimge load in 1/3 time. 2012-12-14 16:38:48 -06:00
Paul Ivanov b4b090271d complete singularization of scikit-image
I've updated references in the code and documentation to the new name.
2012-10-08 16:29:55 -07:00
Tony S Yu bc745e833a BUG: Pass package directory as positional argument to nose.run
When the package directory is passed to nosetest via the "where" argument (-w), that directory becomes the working directory. This causes problems because `skimage.io` will take precedence over the builtin `io` package.
2012-10-07 15:07:11 -04:00
James Bergstra ed8f214a95 ENH: default logger blocks messages from global handler 2012-09-06 10:57:21 -04:00