Commit Graph

7497 Commits

Author SHA1 Message Date
Josh Warner 844b8b9052 Merge pull request #1738 from blink1073/test-3.5
TST: Test against py35, remove py32 test
2015-10-06 17:26:58 -07:00
Steven Silvester 4ccf7787a3 Remove 3.2 from travis build 2015-10-06 19:02:37 -05:00
Stefan van der Walt d66babe9bb Merge pull request #1741 from escorciav/peak-local-max-output-type
Fix output type of `peak_local_max`
2015-10-06 00:20:33 -07:00
Victor Escorcia 7254c1e7b2 Fix output type of peak_local_max 2015-10-03 22:12:03 +03:00
Steven Silvester 730297def6 Use Dask 0.7.1 on Python 3.2
Try dask 0.7.2

Try dask 0.7.1

Fix comment
2015-10-03 13:34:14 -05:00
Steven Silvester 0d9987e2b3 Test against Python 3.5 on Travis
Add a test against py35

Restore PySide install for 3.5

Do not try and install simpleitk on py35

Fix syntax in optional requirements file

Allow simpleitk on python 3.4

Do not try simpleitk on py3.4
2015-10-03 13:34:02 -05:00
Juan Nunez-Iglesias 953fbfc539 Merge pull request #1725 from sciunto/unclosedfile
MAINT: use with to close the file
2015-09-22 16:14:39 +10:00
François Boulogne 811f13c1d6 MAINT: use with to close the file
MAINT: use with to close the file
2015-09-21 22:21:57 -04:00
Steven Silvester 9371ae7aa5 Merge pull request #1724 from sciunto/unclosedfile
MAINT: use with to close the file
2015-09-21 21:16:22 -05:00
François Boulogne 14588366e5 MAINT: use with to close the file 2015-09-21 21:47:06 -04:00
Stefan van der Walt 4e21f5dcef Merge pull request #1722 from blink1073/add-doc-deploy-notes
Add notes on how to deploy docs on Travis
2015-09-19 19:41:42 -07:00
Steven Silvester 05d0202712 Add notes on how to deploy docs on Travis 2015-09-19 21:19:48 -05:00
Johannes Schönberger 9ac63b32b8 Merge pull request #1721 from sciunto/fixurl
DOC fix broken url
2015-09-19 13:37:11 -04:00
François Boulogne 42784a45bc DOC fix broken url 2015-09-19 13:10:23 -04:00
Stefan van der Walt d661361c27 Merge pull request #1720 from blink1073/another-token-attempt
Try doc upload with a token encrypted in this repo
2015-09-19 08:13:39 -07:00
Steven Silvester 252cf8b5b9 Try with a token encrypted in this repo 2015-09-19 08:47:28 -05:00
Stefan van der Walt 2063dd109c Merge pull request #1719 from blink1073/another-docs-build
Encrypt token for target repo
2015-09-18 21:34:24 -07:00
Steven Silvester b272785409 Fix variable name 2015-09-18 21:33:35 -05:00
Steven Silvester e3167112a9 Another fix 2015-09-18 21:33:03 -05:00
Steven Silvester 87dfaf3074 Fix variable name 2015-09-18 21:31:00 -05:00
Steven Silvester e1c57be1c4 Encrypt token for target repo 2015-09-18 21:28:49 -05:00
Steven Silvester 67b89e6e6d Merge pull request #1717 from sciunto/doctravis
DOC: fix env variable GH_TOCKEN
2015-09-18 20:30:05 -05:00
François Boulogne c1559041ab DOC: fix env variable GH_TOCKEN 2015-09-18 21:24:50 -04:00
Stefan van der Walt 5f27db9c08 Merge pull request #1716 from blink1073/docs-build-again
Try with debug output
2015-09-18 15:05:14 -07:00
Steven Silvester 6f8cfc7001 Try with debug output 2015-09-18 10:16:54 -05:00
Stefan van der Walt 2c153823c7 Merge pull request #1715 from blink1073/docs-build-token
Update docs build token
2015-09-18 07:54:19 -07:00
Steven Silvester 0fee62f6fd Update token 2015-09-18 06:55:57 -05:00
Stefan van der Walt e57cce5b4a Merge pull request #1713 from blink1073/docs-fix-take-3
Fix Travis documentation upload
2015-09-17 18:22:23 -07:00
Steven Silvester 4c345666bd gh-pages is the default target branch 2015-09-17 20:06:25 -05:00
Stefan van der Walt f6b03f4d86 Merge pull request #1711 from blink1073/docs-push-again
Fix variable check in docs deployment
2015-09-17 15:10:22 -07:00
Steven Silvester 82ad2a7fd0 Fix variable check 2015-09-17 12:34:39 -05:00
Steven Silvester 08f0677277 Merge pull request #1710 from sciunto/favicon
DOC: activate favicon in config + fix doc push
2015-09-17 08:49:02 -05:00
François Boulogne 7e150256cd MAINT: remove check for TRAVIS_PULL_REQUEST (never false) 2015-09-17 08:20:08 -04:00
François Boulogne 341039fec7 DOC: favicon path relative to source/ 2015-09-17 05:22:01 -04:00
François Boulogne b1c1bdf564 DOC: activate favicon in config 2015-09-16 21:42:33 -04:00
Stefan van der Walt 20b03b13fa Merge pull request #1709 from blink1073/windows-docs
Add API docs & gallery on Windows build; build docs on Appveyor
2015-09-16 11:41:10 -07:00
Stefan van der Walt 31dd5f4e16 Merge pull request #1702 from blink1073/fix-doc-build
Fix Travis docs push and add instructions
2015-09-16 11:38:52 -07:00
Steven Silvester f2b15dec47 Revert to single build 2015-09-16 10:36:05 -05:00
Steven Silvester ade828636a Fix yml format 2015-09-16 09:30:12 -05:00
Steven Silvester 5f729fa03a Try a 64bit 2.7 build 2015-09-16 09:29:18 -05:00
Steven Silvester 30af111e42 Fix pip upgrade 2015-09-16 09:00:32 -05:00
Steven Silvester d8e4774d8f Use the latest pip on appveyor 2015-09-16 08:20:42 -05:00
Steven Silvester b9101202fb Add a 64bit python 3.4 build 2015-09-16 08:02:15 -05:00
Steven Silvester f20e2c3c1a Fix PYTHON executable and html script 2015-09-15 08:45:03 -05:00
Steven Silvester 634737ca22 Add the make target 2015-09-15 07:58:25 -05:00
Steven Silvester d2c4ccba59 Build from the right directory and add api to latex command 2015-09-15 07:32:33 -05:00
Steven Silvester da3da0bc29 Add api docs and gallery on Windows build and build docs on Appveyor 2015-09-14 21:35:43 -05:00
Steven Silvester 0372cb4934 Merge pull request #1708 from JDWarner/fix_win_doc_build
FIX: Point Windows batch file at source subdir.
2015-09-14 21:28:57 -05:00
Joshua Warner 04fb2e35e7 FIX: Point Windows batch file at source subdir. 2015-09-14 20:08:43 -05:00
Steven Silvester 3345e95a53 Merge pull request #1699 from jwiggins/use-ccache
Enable ccache and Sphinx cache on Travis
2015-09-13 10:31:31 -05:00