a939eb4ce6
Use a container and pip cache
...
Use container and pip cache
Add the sudo calls back in
Try removing sudo and the tk install
Skip show() call in novice doctest
Try not building docs and no libqt4-dev
Try the optional installs right away
Do not install PyQt4 or imread
Try without libfreeimage
Try and install libfreeimage outside of root
Another attempt at libfreeimage
Yet another attempt at libfreeimage
Use the travis whitelist
Try adding the sudo command
Try and build the docs
Install scikit-image first
Restore full build functionality
Fix whitespace
Remove unused tk import
2015-07-13 21:22:44 -05:00
09c8a84a54
Merge pull request #1518 from stefanv/relative_imports
...
Consistently use relative imports
2015-07-12 14:41:06 -05:00
b4320ebcb5
Merge pull request #1597 from library111/DocumentationChanges
...
Novice module documentation improvements
2015-07-12 12:27:19 -05:00
d4d3eaa1f1
Remove Picture.scale and Picture._rescale from novice module
...
The scale and rescale function was never used in the novice module.
These functions are extraneous in a novice code, and have no purpose there.
Also updated tests.
2015-07-12 11:47:07 -05:00
d9213bedde
Fix notebook display bug for novice module
...
io.Image was previously removed, but the novice Picture still depended on it.
Now moved the relevant functionality back into the Picture class.
2015-07-12 11:07:21 -05:00
80629c34bb
Use a simpler operator in the novice tutorial
...
Using a more explicit series of operations is simpler than using the
compound "=/" operator, which may be unfamilar to newer users of Python.
2015-07-11 18:23:49 -04:00
45eecd09d2
Updated novice module tutorial to show images
...
Providing visual feedback to a new user, by displaying their image, will
make a much friendlier introduction to Scikit Image.
2015-07-11 18:23:28 -04:00
83d5ff9001
Consistently use relative imports
2015-07-11 15:41:37 -05:00
80ef48ccfa
Add spacing in novice model to make docs render correctly
2015-04-11 22:18:34 -07:00
0859b3662e
Avoid creating an int64 array
2015-01-30 21:01:45 -06:00
2c635989d2
Force novice.Picture.from_size to return a uint8 image
...
Force Picure.from_size to return a uint8 image
Remove img_as_ubyte
2015-01-30 19:42:55 -06:00
ee5c6fbeb2
Use relative imports in skimage files
2015-01-22 07:36:48 -05:00
f898bd0209
Style fixes
2014-12-26 11:26:30 -06:00
1b905d4cef
More cleanup and updating of tests
...
Clean up setup_test and add a teardown_test method
Implement new setup/teardown in novice tests
Fix warning handling in pil_plugin
Update rank tests
2014-12-23 16:50:50 -06:00
a4e4e57ba5
Create new expected_warnings helper and some cleanup
...
Add new helper function for expected warnings during test
Indentation cleanups and avoid skipping doctests if possible.
2014-12-23 16:50:18 -06:00
4680f30466
Add a test setup helper function
...
Add a function to set up a skimage test
Switch to new test helper function
Import local packages that raise warnings in test setup function
More fixes to doctests
Fix regionprops doc test
Try and fix the test_rank failure.
Remove no longer needed RectangleSelector shim
Skip more doctests in _regionprops
Try importing another scipy subpackage
2014-12-23 16:49:20 -06:00
f72882fbd2
Import scipy before turning on warnings
2014-12-23 16:49:19 -06:00
542cd4fabe
Fix some doctest warnings
...
Fix doctest errors
Suppress warnings when importing scipy.ndimage for the first time
2014-12-23 16:49:01 -06:00
0debedd82c
Handle more warnings and reset io plugins as needed
...
Reset plugins prior to running collections test
Handle warnings in morphology pkg
Add __init__ for morpohology tests
Handle warnings for novice pkg
Handle warnings for restoration pkg
Handle warnings for segmentation pkg
Handle warnings for _shared pkg
Handle warnings for transform pkg
Handle warnings for util pkg
Handle warnings in viewer module
2014-12-23 16:48:16 -06:00
451d8aa697
Fix novice module with new dtype behavior
2014-12-23 12:44:16 +01:00
3a1079a180
Misc PEP8 fixes
2014-12-14 02:56:14 +01:00
739dca0201
Fix novice doc test
2014-04-12 09:57:51 -04:00
f84cce3238
Convert incoming novice images to ubyte
2014-03-26 08:48:10 -04:00
aa8cc0af40
Merged with ahojnnes novice
2014-03-19 20:58:44 -04:00
f871c4024f
Extract changes by @synesthesiam in PR #797
2014-03-19 17:47:49 -04:00
8321c84e63
Merged with master
2014-03-17 08:40:58 -04:00
2df1af87ef
Merge pull request #916 from neerajgangwar/master
...
Add loading from URL in novice module
2014-03-14 16:15:19 +02:00
1d133e5c17
made minor changes in syntax
...
1. merged is_url and file_or_url_context in one import statement
2. changed syntax to check if path is a URL. now more compact
2014-03-13 18:42:12 +05:30
0bfdda58e5
removed unnecessary imports from _novice.py
2014-03-12 17:55:54 +05:30
7880453d42
changed the method of fetching images in Picture class
...
using file_or_url_context to get context and calling imread
and imghdr on returned context
2014-03-12 15:57:32 +05:30
dc85186e19
corrected syntax for error handling while fetching image from
...
a URL in class Picture
2014-03-12 13:05:53 +05:30
70ca1495cb
changed urlparse library from six.moves.urllib_parse
...
to six.moves.urllib.parse
2014-03-12 08:48:23 +05:30
2f3bd464b8
added a dummy useragent in Picture class while fetching image
...
using URL.
2014-03-12 08:00:53 +05:30
15893a3ed0
changed the method of checking if a string is URL
...
1. removed regex code which was used earlier to check if a string is
url. (regex code taken from django)
2. Now checking if a string starts with http(s) or ftp(s).
2014-03-12 00:29:19 +05:30
654642c986
changed test url in example for the Picture(object)
2014-03-11 22:35:07 +05:30
1fd34b4751
added description and exmaple for new functionality
...
of fetching images of url
2014-03-11 21:53:47 +05:30
9557c8dde1
added a functionality to fetch images from URL in _novice.py
2014-03-11 21:49:21 +05:30
534721126b
Fix test_novice.test_update_on_save failure on Windows
...
On Windows, tempfile.NamedTemporaryFile() can not be opened a second time. See <http://docs.python.org/2/library/tempfile.html#tempfile.NamedTemporaryFile >
2014-03-10 22:22:02 -07:00
98ff6e5f20
FIX: Specify field index for Python 2.6 compatible use of str.format()
2013-11-20 15:45:54 -06:00
1312670d56
Merged with upstream
2013-11-20 14:01:42 -05:00
695da41841
Removed extraneous trys for six imports
2013-11-20 14:00:46 -05:00
753cc6fd23
Fix novice doctest
2013-11-03 19:18:48 +01:00
8daeb6540b
Fix novice doctests
2013-11-03 19:13:07 +01:00
f11ef60c35
Fixed import of urlparse and rebase on upstream
2013-10-29 09:43:52 -04:00
522778b214
Trying to get imports working with both Python 2 and 3
2013-10-28 10:29:20 -04:00
eb6867cfe2
Make six an external dependency.
2013-10-27 14:06:26 +02:00
1d6531aa04
Fixed Python 3 import errors, added alpha and rgba properties
2013-10-23 16:28:41 -04:00
9d91751ed9
Switching to RGBA
2013-10-23 15:44:50 -04:00
f5c68531ab
Novice module can open images from a url
2013-10-22 13:07:16 -04:00
e794aed012
Add support for non-unit step
2013-10-21 23:02:51 -05:00
Steven Silvester