Commit Graph
184 Commits
Author SHA1 Message Date
Steven Silvester b4793caebd Remove debug message 2015-12-25 15:13:11 -06:00
Steven Silvester 0d73999cfd Allow axes to be provided to imshow and fix colorbar
Allow axes to be provided to imshow and fix colorbar

Allow axes to be provided to imshow and fix colorbar

Allow axes to be provided to imshow and fix colorbar

Use tight layout by default

Try and fix appveyor issue

Handle deprecation warning on appveyor

Pin the colorbar to the image using box-forced

Fix tests again

Update function signature

Update function signature

Fix imshow call

Fix docstring with utf characters

Remove kwargs
2015-12-25 15:12:53 -06:00
Steven Silvester 4ccf7787a3 Remove 3.2 from travis build 2015-10-06 19:02:37 -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
Steven Silvester 252cf8b5b9 Try with a token encrypted in this repo 2015-09-19 08:47:28 -05:00
Steven Silvester e3167112a9 Another fix 2015-09-18 21:33:03 -05:00
Steven Silvester e1c57be1c4 Encrypt token for target repo 2015-09-18 21:28:49 -05:00
Steven Silvester 0fee62f6fd Update token 2015-09-18 06:55:57 -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
John Wiggins 8721bee3ef Attempt to cache the sphinx-build intermediates on Travis. 2015-09-05 18:29:40 +02:00
John Wiggins e224b0dd7d Enable ccache on Travis 2015-09-05 15:48:20 +02:00
Steven Silvester 6e39dbbb26 Add dev docs push on master builds 2015-09-04 21:32:51 -05:00
John Wiggins 0e46d2cd82 Make sure the pip in the virtualenv is upgraded.
Additionally, list the installed packages after each of the two installation
phases.
2015-09-01 08:59:15 +02:00
John Wiggins 8a5cc800cb Revert pip cache changes. Use pip's built-in retry. 2015-08-31 20:26:22 +02:00
John Wiggins 05e6c0cb76 Fix some things on Travis
- Now using the latest pip
- imread wasn't actually being installed
- Optional package installation uses a requirements file
- `python setup.py develop` instead of the previous two-step.
2015-08-30 13:50:03 +02:00
Steven Silvester 4fb80b8f40 Add an explicit pip cache since we override the install step 2015-07-15 10:07:46 -05:00
Steven Silvester 5285408a33 Try and install pyqt on the container 2015-07-15 08:25:01 -05:00
Steven Silvester 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
Steven Silvester adac822ee9 Fix setup to allow installing from PyPI
≈
Fix setup to allow installing from PyPi
Another attempt at fixing the setuptools problem

Fix pip incantation

Fix typo

Try updating setuptools too

Try upgrading pip and setuptools after venv install

Rule out install_requires as the source of the problem

Try just requiring the ones that can be built from source

Use explicit install_requires and move version checks to after setup runs

Clean up installation for PyPI compatiblity

Dead end commit

Fix travis to match new installation procedure

Put build_versions check after install

Fix travis syntax

Switch to lower-case cython in version check

Another attempt

Another fix

Fix syntax error

Make header executable

Build inplace on py27

Fix finding of source code version in sphinx

Fix travis syntax

Import setuptools after install

Fix the version check in sphinx

Work around setuptools bug in 2.7

Fix handling of Cython requirement and update release notes

Switch to one Appveyor build and update build method

Add cython back to install_requires

Remove debug lines

Another try for appveyor install

Another attempt at setuptools and Appveyor

Do not let intermittent apt-get failures crash the build

Fix typo

Another appveyor attempt

More fixes for setuptools and Appveyor

Yet another setuptools/appveyor attempt

Put requirements.txt back in order

Fix typo

Fix readlines function call

Try not using a venv for python 2.7

Fix syntax

Try the provided venv for py27

Remove --user

Remove debug info

Another try for python27 fix

Try again

Do not use install_requires with numpy/scipy

Try just avoiding scipy

Try removing scipy (numpy was before)

Avoid both scipy and numpy

Fix qt install on 27

Fix qt install on 27 agin

Revert the scripts to their previous condition

Revert file permission changes

Undo changes to requirements.txt
2015-03-29 15:36:11 -05: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
Steven Silvester 57c32722be Set the pip timeout globally for Travis
Conflicts:
	.travis.yml
2014-12-13 04:39:30 -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
Steven Silvester 80edc0ef66 Move the virtual framebuffer to top level yaml 2014-12-10 20:19:47 -06:00
Stefan van der Walt 076d95b7e4 Webhook to report Travis-CI status on Gitter 2014-12-07 21:33:49 +02:00
Steven Silvester 043721aa24 Use system packages on Py2.7
Use system packages on python 2.7

Try and fix PyQt4 and use wheelhouse astropy

Fix version requirements
2014-12-02 05:39:56 -06:00
Steven Silvester 40d6a51779 Use virtualenv for all builds and install everything from wheelhouse
Use venv for all builds and install everything from wheelhouse

Use venv and all minimum requirements

Edit requirements.txt in place and use one call

Update minimum versions and install exclusively from wheelhouse

Use mpl 1.3.1 on py 3.2

Fix pip invocation

Fix pip invocation again

Another fix to pip invocation

Explicitly use venv python to call build_versions.py

Move venv creation and activation to top level

Do not use site-packages

Fix minimum matplotlib ver and Pillow version check

Fix minimum matplotlib ver

Improve error message on version check

Add more debug info

Even more debug info

More debug info

Yet another debug print

Fix python 2.7 installation problem

check for PIL.Image version on install

Add debug to before_install

Try a pip install virtualenv first

Clean up virtualenv creation, add debug info, fix PySide script install

Fix virtualenv path for PySide install

Fix venv location and activation

Try no site packages and fix python 2.7 install
2014-12-02 05:39:35 -06:00
Steven Silvester e6f726b77b Move debug info into top level travis for visibility 2014-11-16 10:52:18 -06: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 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 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
Steven Silvester 3a0f0ccb86 Add whitespace 2014-10-11 04:58:11 -05:00
Steven Silvester c52a42975d Move env variable to before_install 2014-10-11 04:58:11 -05:00
Steven Silvester 9c7cee33ab Use a straight install 2014-10-11 04:58:10 -05:00
Steven Silvester ef215de3a9 Install skimage so we do not have to fool with PYTHONPATH 2014-10-11 04:58:10 -05:00
Steven Silvester 2d4604a3cf Move dependency output to setup script 2014-10-11 04:58:10 -05:00
Steven Silvester 16f2393958 Put the other env variables up top as well 2014-10-11 04:58:10 -05:00
Steven Silvester 5dbf433eef Put the WHEELHOUSE as a global variable 2014-10-11 04:58:10 -05:00
Steven Silvester d3172b3350 Keep consistent with calling convention 2014-10-11 04:58:10 -05:00
Steven Silvester 5f719d19eb Put the whole script in an sh file 2014-10-11 04:58:09 -05:00
Steven Silvester 81d5498338 Put the TEST_ARGS in travis_setup.sh 2014-10-11 04:58:09 -05:00
Steven Silvester d415486a21 Try removing the explicit env 2014-10-11 04:58:09 -05:00
Steven Silvester 7cb084b9c4 Use an explicit matrix 2014-10-11 04:58:09 -05:00
Steven Silvester 87d3a07b71 Reorganize files 2014-10-11 04:58:09 -05:00
Steven Silvester 0bad613568 Add explicit sh executable 2014-10-11 04:58:09 -05:00
Steven Silvester cf7c8750b5 Push parts of travis into separate shell scripts 2014-10-11 04:58:07 -05:00