Commit Graph

6212 Commits

Author SHA1 Message Date
Juan Nunez-Iglesias f73fc33e0e Merge pull request #1188 from vighneshbirodkar/rag_merge
Added in_place option to merge_nodes
2014-10-23 20:48:23 +11:00
Vighnesh Birodkar b8988190b0 Docstring changes 2014-10-23 13:17:29 +05:30
Stefan van der Walt dbab977535 Merge pull request #1206 from tonysyu/fix/canny-deprecation
Fix deprecation of canny function
2014-10-21 13:17:16 +02:00
Tony S Yu cb1a26ce2e Fix deprecation of canny function 2014-10-20 22:21:28 -05:00
Stefan van der Walt f6ef94cb73 Merge pull request #1204 from blink1073/travis-streamline
Travis-CI streamline
2014-10-20 14:05:33 +02:00
Steven Silvester 79473ee6d9 Quiet down optional installs to avoid hitting 10000 line limit 2014-10-20 06:13:39 -05:00
Steven Silvester 1ae060dce8 Free disk space during travis install 2014-10-20 06:13:00 -05:00
Stefan van der Walt 59e2badb8f Merge pull request #1199 from blink1073/use-pypi-tifffile
Use PyPI tifffile or fall back on local version
2014-10-20 12:57:58 +02:00
Steven Silvester 95f4aa70c1 Avoid star import 2014-10-20 05:03:00 -05:00
Stefan van der Walt 8fe238d323 Merge pull request #1202 from jni/badge
Add Travis and Coveralls badges to README
2014-10-20 10:39:12 +02:00
Vighnesh Birodkar 96bf747197 always return new id and put new id logic in a function 2014-10-18 21:33:42 +05:30
Juan Nunez-Iglesias 4d50466edc Add Travis and Coveralls badges to README 2014-10-17 20:13:16 +11:00
Steven Silvester 7734cdf7e0 Move tifffile license description 2014-10-16 17:06:12 -05:00
Vighnesh Birodkar 31ecc3db86 Change None to 0 2014-10-17 00:06:12 +05:30
Vighnesh Birodkar 0419c1e6f7 sequential numbering of nodes using max id 2014-10-16 23:22:56 +05:30
Steven Silvester 713452ab9e Use newer version of tifffile.py. 2014-10-16 05:28:43 -05:00
Steven Silvester 17a3b50a5e Use tifffile 0.3.2, which passes doctests 2014-10-16 05:05:37 -05:00
Steven Silvester b5da90e4c7 Just disable doctests in tifffile_local 2014-10-16 04:49:45 -05:00
Steven Silvester 0569524d79 Use proper nose option 2014-10-16 04:14:42 -05:00
Steven Silvester 284cdd0bca Do not test or cover the external libraries directly 2014-10-16 03:20:09 -05:00
Steven Silvester a3c8ce32ac Rename file to a valid module name. 2014-10-15 21:05:23 -05:00
Steven Silvester 88719b3340 Fix path to tifffile.c 2014-10-15 21:00:52 -05:00
Steven Silvester 50aff0058a Add tifffile.c to the build 2014-10-15 20:59:20 -05:00
Steven Silvester b6f775a7cf Use new wheels site and do not install tifffile until optional 2014-10-15 06:03:11 -05:00
Steven Silvester fbba5e5e01 Remove tifffile as an external dependency 2014-10-15 05:58:54 -05:00
Steven Silvester dddbc1aa23 Add the __init__.py to make it a package 2014-10-15 05:57:56 -05:00
Steven Silvester 268eb5f2b5 Add tifffile to a new external package. 2014-10-15 05:57:05 -05:00
Steven Silvester 37d6ddfe36 Fix handling of variables - use local 2014-10-12 19:11:32 -05:00
Steven Silvester 0d2799a98d Export the MPL variables 2014-10-12 18:35:35 -05:00
Steven Silvester 4795946537 Make new script executable 2014-10-12 17:20:23 -05:00
Steven Silvester 71233cca51 Break script into parts and travis_retry optional installs 2014-10-12 17:05:44 -05:00
Steven Silvester d33833ae59 Use retries where applicable 2014-10-12 16:54:37 -05:00
Steven Silvester c74b652e1e Remove install_requires altogether 2014-10-12 16:28:31 -05:00
Steven Silvester 7d171a8e37 Fix install_requires 2014-10-12 16:08:42 -05:00
Steven Silvester 6cff910f67 Update the setup script to install tifffile 2014-10-12 15:12:45 -05:00
Steven Silvester 56915d29c3 Fix tifffile imports 2014-10-12 15:10:40 -05:00
Steven Silvester 24ac72a663 Bump the required tifffile version 2014-10-12 15:10:40 -05:00
Steven Silvester 36ab379e0c Use the PyPI tifffile instead of bundling 2014-10-12 15:10:14 -05:00
Stefan van der Walt 18cb5cd699 Merge pull request #1198 from blink1073/travis-sh
Break Travis-CI commands out into bash scripts
2014-10-12 20:39:57 +02:00
Steven Silvester 0fabb0c3ab Fix comment typo 2014-10-11 18:28:36 -05:00
Steven Silvester 725c376d78 Make sure we disconnect all the signals 2014-10-11 14:34:55 -05:00
Steven Silvester 72292f73c0 Use a manual hack to remove the canvas events for old MPL 2014-10-11 09:15:10 -05:00
Steven Silvester 532e460172 Disconnect the events manually 2014-10-11 07:21:32 -05:00
Steven Silvester 0c35d13203 Add a try/catch for RectangleTool.disconnect_events 2014-10-11 05:12:04 -05:00
Steven Silvester 3b63e19412 Fix MPL_DIR location 2014-10-11 04:58:11 -05:00
Steven Silvester 283e759b37 Matplotlibrc was in a different location in mpl 1.1.1 2014-10-11 04:58:11 -05:00
Steven Silvester f5b30bf867 Formatting 2014-10-11 04:58:11 -05:00
Steven Silvester b37913d63c Use a null backend during the doc examples 2014-10-11 04:58:11 -05:00
Steven Silvester 53892e2153 Move the rest of the code to the scripts. 2014-10-11 04:58:11 -05:00
Steven Silvester 095160f1c6 Reinstate the separate build step 2014-10-11 04:58:11 -05:00