2e56e685d8
change import syntax for python 3
2015-06-15 11:05:07 +02:00
d55135ddbb
Fix comments and tab whitespace
2015-06-15 11:03:58 +02:00
f09907961a
Initial attempt at optimising HOG features with cython
2015-06-15 11:03:57 +02:00
7132df764e
Merge pull request #1550 from jni/ndi
...
STY: Harmonize scipy.ndimage usage across the library
2015-06-10 22:16:00 -05:00
56d62b39be
Split scipy.ndimage & spatial into different lines
...
This improves the readability of the import code and is in line with
PEP8 recommendations.
2015-06-11 11:36:48 +10:00
0a8fc08ec1
Specify ndimage as ndi import convention
...
... in CONTRIBUTING.txt for future contributions.
2015-06-10 15:12:34 +10:00
3434b19299
Merge pull request #1549 from JDWarner/fix_tiffile_c_replacement
...
FIX: Correct typo in local version of tifffile _replace_by
2015-06-09 16:42:25 -05:00
0d134987f9
Harmonize all ndimage usage across the library
...
Only two forms remain in use:
- `from scipy import ndimage as ndi`
- `from scipy.ndimage import function`
2015-06-09 15:18:37 +10:00
8d8ac736ed
DOC/STY: Fix whitespace, harmonize version with PyPi 0.4.1
2015-06-08 22:33:02 -05:00
82a5d0c5d9
Remove unused variable in example
2015-06-09 11:45:10 +10:00
f81dfd84fd
FIX: typo in local version of tifffile _replace_by
2015-06-08 17:20:10 -05:00
46057c489b
Merge pull request #1535 from stefanv/doc/installation
...
DOC: Simplify installation instructions
2015-06-07 19:05:59 -05:00
84c79541a5
Merge pull request #1546 from blink1073/window-size
...
ENH: Allow ``view_as_windows`` to take a non-tuple step, and update tests
2015-06-07 16:08:47 -05:00
580db16cb1
Simplify installation instructions
2015-06-07 07:56:41 -07:00
38c7c26460
Style and doc updates
2015-06-07 06:30:12 -05:00
38e5919248
Merge pull request #1543 from stefanv/docs/remove_logo
...
Remove logo (moved to branding repo)
2015-06-07 06:22:39 -05:00
087c14d0d7
Merge pull request #1545 from cgohlke/patch-1
...
DOC: add WinPython distribution; correct spelling
2015-06-07 06:19:34 -05:00
eb8c2d2853
Fix typo
2015-06-07 06:15:24 -05:00
3f8e94ff0c
Allow view_as_window to take a tuple step, and update tests
2015-06-07 06:13:36 -05:00
29c49e914b
DOC: add WinPython distribution; correct spelling
2015-06-06 22:12:47 -07:00
da8e2c7c69
Merge pull request #1540 from vighneshbirodkar/ncut_fix
...
Fixes #1538
2015-06-07 11:21:29 +10:00
cacd214d68
Corrected Typo
2015-06-06 21:36:00 +05:30
805e322ea9
Remove logo (moved to branding repo)
2015-06-05 12:54:57 -07:00
8a78ad87ed
skip loop when min and max are equal
2015-06-06 00:51:30 +05:30
658fe02683
Merge pull request #1542 from michaelaye/patch-2
...
Remove unnecessary loop counter
2015-06-05 11:23:14 -07:00
fdc7e6f99a
removing unnecessary loop counter
...
Why use an un-pythonic counter if it's not required? ;)
2015-06-05 11:54:28 -06:00
ae2b0a26db
Merge pull request #1534 from michaelaye/patch-1
...
Removing see-also to unexposed internal function
2015-06-03 10:55:58 -07:00
18b1906607
removed debug statements
2015-06-03 22:03:34 +05:30
23c6111ad3
Fixing error in ncut when subgraph as all equal weights ( #1538 )
2015-06-03 21:58:26 +05:30
15f2273272
Merge pull request #1537 from kevin-keraudren/ellipse-round-radius
...
the output of hough_ellipse needs to be rounded before being truncated
2015-06-01 10:58:33 +10:00
4dfa467c34
code simplification
2015-05-31 15:25:41 +01:00
941cdda8f5
the output of hough_ellipse needs to be rounded before being truncated
2015-05-30 20:47:37 +01:00
56fc42ad47
removing obsolete (or not found?) link
...
`intensity_range` does not seem to exist or is not found. Removing obsolete reference in doctext.
2015-05-29 12:06:46 -06:00
3faa32149a
Merge pull request #1526 from arve0/installation_instructions
...
Add dask[array], improve CI builds, update install instructions
2015-05-29 10:38:09 -05:00
e497e5c4f5
Merge pull request #1530 from LeeKamentsky/master
...
Watershed fixes for issue #803 (incorrect propagation in plateaus)
2015-05-29 16:58:36 +10:00
06ad9e3c9a
Merge pull request #1483 from ozak/ravel-not-flatten
...
Use ravel instead of flatten in Minimum Cost Path code to improve memory efficiency.
2015-05-29 16:20:26 +10:00
54f8265603
Issue #803 order the structuring element by distance to get diagonals processed last
2015-05-28 13:28:21 -04:00
a9bdaaf274
proposed fix and test for broken watershed on flat areas ( https://github.com/scikit-image/scikit-image/issues/803 )
2015-05-28 13:28:16 -04:00
04cbaa1579
expect PIL open fp
2015-05-28 16:06:32 +02:00
89521548a6
update install instructions
2015-05-28 14:45:29 +02:00
dedff0efa8
smarter requirements in test env
2015-05-28 14:44:00 +02:00
fb66edd753
Merge pull request #1532 from JDWarner/fix_appveyor
...
FIX: Use direct, secure link to wheelhouse to fix AppVeyor builds
2015-05-28 04:09:03 -05:00
ba79a7c827
FIX: Use direct, secure link for pip wheelhouse.
2015-05-27 17:05:37 -05:00
ddedb9de08
use travis python 2.7 and wheel house
2015-05-27 23:29:13 +02:00
d9908f74ad
trust http wheel house
2015-05-26 01:18:54 +02:00
b455d851b1
Use np.ravel instead of np.copy
...
This should decrease memory usage and
increase speed without affecting anything else
2015-05-25 18:21:53 -04:00
c52dc414c6
install binaries -> then resolve deps
...
requirements.txt should hold all dependencies all deps are not in wheel house
- first install binaries from wheel house
- then install the rest of the deps
2015-05-25 17:04:50 +02:00
bf31af6728
update appveyor requirements.txt
...
- cython 0.20 in wheel house is below scikit-image requirement (>=0.21)
- cython 0.21 will be installed anyhow, save time not installing
cython twice
- dask[arrary] is added to /requirements.txt, and should not be needed
here
2015-05-25 17:04:39 +02:00
b6aa358439
clean up setup.py according to 9cfaf4a
...
- cython added to setup_requirements
- setuptools will call easy_install to install it
- all other build requirements, excluding numpy, will be resolved by pip
- do not parse requirements.txt
- requirements should be the real runtime requirements
- fail gracefully when missing numpy
- scipy will be resolved by pip from install_requires
2015-05-25 12:43:36 +02:00
2166041fee
deps: cython not runtime, add dask, six >= 1.4
...
- cython is not a runtime dependency
- dask is a runtime dependency
- scikit-image depends on six.moves.urllib
2015-05-25 12:41:13 +02:00
Tim Sheerman-Chase