Commit Graph

6447 Commits

Author SHA1 Message Date
Steven Silvester a8d480a1c8 Add a coveralls repo token 2014-12-14 12:26:49 -06:00
Steven Silvester 78974d93dc Fix section titles to avoid spaces 2014-12-14 12:26:49 -06:00
Steven Silvester 12248e18e7 Fix usage of set command
Fix usage of set command

Fix set command again

Fix mpl directory for python 2.7
2014-12-14 12:26:42 -06:00
Steven Silvester 68547f0a8a Do not explicitly remove packages from requirements.txt 2014-12-14 12:26:42 -06:00
Steven Silvester fd6f7fe9fd Use the system python for 2.7 2014-12-14 12:26:42 -06:00
Steven Silvester 91332bf348 Use our own retry command since travis_retry is not exported
Use our own retry command since travis_retry is not exported

Reinstate the MPL settings

Fix the order of the MPL settings

Fix the MPL versions

Streamline the section headers

Adjust min MPL requirement for the Ubuntu version

Force pip to not install matplotlib and scipy
2014-12-14 12:26:25 -06:00
Steven Silvester 0b4884a361 Switch to a single script to get the folds to work
Switch to a single script to get the folds to work

Replace the old install_min with this before_install script

Reinstate optional installs and add headers

move the display setup to the travis_script

Use force remove on temp directory

Always retry on pip

Fix the travis_retry pip alias

Source the before_install script and move the alias

Create bash functions for folding and export DISPLAY

Export fold functions

Make repip a function
2014-12-14 12:26:13 -06:00
Steven Silvester b9a02e0957 Add a script to create env variables and travis folding helpers
Implement travis folding helpers

Add a script to create env variables and travis folding helpers

Implement travis folding helpers

Source all of the shell scripts

Remove  since we are sourcing

Fix syntax of travis fold commands

Put the travis folds in the individual files

Put the min test and flake in their own files

Reinstate top level venv activation

Remove unused script commands

Fix travis_fold syntax
2014-12-14 12:25:19 -06:00
Stefan van der Walt 8f7972474f Merge pull request #1292 from emmanuelle/numpydoc
Updated numpydoc files from the github package numpy/numpydoc
2014-12-14 19:49:11 +02:00
emmanuelle 9395464122 Updated numpydoc files from the github package numpy/numpydoc 2014-12-14 18:02:46 +01:00
Juan Nunez-Iglesias 53bb6f9369 Merge pull request #1290 from pratapvardhan/morph-selem
TST: Test for selem.cube
2014-12-14 18:13:04 +11:00
Josh Warner 1213a3ea1a Merge pull request #1289 from ahojnnes/random
STY: Misc PEP8 fixes
2014-12-13 23:25:37 -06:00
Pratap Vardhan 073f28e90e TST: Test for selem.cube 2014-12-14 10:52:53 +05:30
Johannes Schönberger 3a1079a180 Misc PEP8 fixes 2014-12-14 02:56:14 +01:00
Stefan van der Walt dad2b18546 Merge pull request #1288 from pratapvardhan/morph-selem
Minor cleanup for morphology/tests/test_selem.py
2014-12-14 02:41:37 +02:00
Stefan van der Walt a55a334efc Merge pull request #1286 from blink1073/python3-doc-build
Add python3 doc building capability
2014-12-14 02:36:57 +02:00
Pratap Vardhan 9d6516903d DOC: Add test functions docstrings 2014-12-14 01:28:09 +05:30
Pratap Vardhan 2058fe23cb CLN: Minor cleanup - unused imports, pep8 2014-12-14 01:17:27 +05:30
Steven Silvester bd94253cef Add python3 doc building capability 2014-12-13 11:59:22 -06:00
Stefan van der Walt 8066c6da44 Merge pull request #1273 from blink1073/increase-pip-timeout
Increase timeout to install requirements
2014-12-13 19:50:21 +02:00
Stefan van der Walt c23ab37925 Merge pull request #1281 from blink1073/fix-imshow
Create a new figure for imshow if necessary
2014-12-13 19:42:29 +02:00
Stefan van der Walt 2622778444 Merge pull request #1285 from blink1073/fix-travis-setup
Prevent travis-retry breaks when recreating hard link for PyQt
2014-12-13 19:36:05 +02:00
Steven Silvester 1de9329661 Prevent travis-try breaks when recreating hard link for PyQt 2014-12-13 11:24:39 -06:00
Steven Silvester bc78bf8544 Create a new figure for imshow if there is already data 2014-12-13 08:57:14 -06:00
Stefan van der Walt af2e6c3937 Merge pull request #1275 from blink1073/use-wheelhouse-simpleitk
Do not try and install SimpleITK on Py3.2 or 3.4
2014-12-13 16:39:33 +02:00
Steven Silvester 04a5b62847 Fix typo in bash conditional 2014-12-13 07:11:40 -06:00
Juan Nunez-Iglesias 57533c8cc7 Merge pull request #1272 from blink1073/fix-tifffile-warning
Do not use importlib in `tifffile_local` to avoid warnings
2014-12-13 23:44:52 +11:00
Steven Silvester 94dab0d30e Fix boolean logic for SimpleITK install and add warning 2014-12-13 06:22:39 -06:00
Steven Silvester b10548509d Do not try and install SimpleITK on Py3.2 or 3.4 2014-12-13 06:19:04 -06:00
Steven Silvester 0da21290dd Merge pull request #1274 from blink1073/use-wheelhouse-simpleitk
Install simpleitk from wheelhouse if available
2014-12-13 05:51:32 -06:00
Steven Silvester 3c4573b852 Install simpleitk from wheelhouse if available 2014-12-13 05:41:44 -06:00
Emmanuelle Gouillart 82ee0b1b7f Merge pull request #1244 from ahojnnes/rank-fix
Fix rank filter kernels
2014-12-13 12:12:39 +01:00
Steven Silvester 57c32722be Set the pip timeout globally for Travis
Conflicts:
	.travis.yml
2014-12-13 04:39:30 -06:00
Steven Silvester be7d0be713 Increase timeout to install requirements 2014-12-13 04:39:06 -06:00
Johannes Schönberger cf499bf844 Add tests for all rank filters and reformat code 2014-12-13 11:25:59 +01:00
Steven Silvester 1b38c17280 Beef up docstring 2014-12-12 21:18:48 -06:00
Juan Nunez-Iglesias fc667d98d4 Merge pull request #1269 from blink1073/test-all-modules
Test all modules (including those starting with underscores), and always doctest on Travis
2014-12-13 13:04:52 +11:00
Steven Silvester 8f89852e05 Improved docstring 2014-12-12 19:44:40 -06:00
Steven Silvester 3756e7adbe Do not use importlib in tifffile_local to avoid warnings 2014-12-12 15:59:44 -06:00
Steven Silvester 2f0d815253 Update test args for command line 2014-12-12 13:58:28 -06:00
Steven Silvester 4df8ea45b7 Use the test arguments from skimge.test_verbose 2014-12-12 11:14:25 -06:00
Steven Silvester 9c765086a2 Test all modules (including underscores), and always doctest 2014-12-12 10:32:47 -06:00
Stefan van der Walt 9ccd373bd8 Merge pull request #1263 from blink1073/fix-load-imgnum
Fix handling of img_num in PIL Plugin
2014-12-12 18:26:51 +02:00
Steven Silvester 2966e262a3 Fix handling of singleton frames in pil_to_ndarray 2014-12-12 09:39:08 -06:00
Steven Silvester a4a628b529 Fix file indexing in ImageCollection 2014-12-12 09:38:48 -06:00
Steven Silvester ed8524961c Reinstate run_module_suite in test_pil 2014-12-12 08:53:27 -06:00
Steven Silvester 296e492658 Fix handling of multi-image gifs and add test 2014-12-12 07:46:16 -06:00
Steven Silvester f7e984662a Fix handling of imgnum 2014-12-12 07:46:15 -06:00
Stefan van der Walt 81d3065ec2 Merge pull request #1267 from blink1073/fix-travis-retry
Travis-CI: launch the virtual framebuffer from the top level yaml
2014-12-11 17:30:22 +02:00
Stefan van der Walt 8042c7701c Merge pull request #1268 from pratapvardhan/morph-selem
Remove unused import and add module docstring
2014-12-11 17:24:46 +02:00