From 9142c51cbbc8228e4b313c57dc5cc016ea9b46c2 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Mon, 5 May 2014 12:55:52 +0200 Subject: [PATCH 1/5] Replace broken _import_tools from numpy with Git version --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index aa816a4a..0585e9e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,10 @@ before_install: - sh -e /etc/init.d/xvfb start - sudo apt-get update + - sudo apt-get install $PYTHON-numpy + - wget https://raw.githubusercontent.com/numpy/numpy/master/numpy/_import_tools.py -O /home/travis/virtualenv/python3.2_with_system_site_packages/lib/python3.2/site-packages/numpy/_import_tools.py + - sudo apt-get install $PYTHON-scipy - sudo apt-get install libfreeimage3 From b03d59f736ffcf7ec223704fc440e51632ddbed6 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Mon, 5 May 2014 12:56:07 +0200 Subject: [PATCH 2/5] Print versions of software used in Travis output --- .travis.yml | 3 +++ tools/build_versions.py | 12 ++++++++++++ tools/heading.py | 14 ++++++++++++++ 3 files changed, 29 insertions(+) create mode 100755 tools/build_versions.py create mode 100755 tools/heading.py diff --git a/.travis.yml b/.travis.yml index 0585e9e7..4c35713a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,6 +61,9 @@ before_install: - python check_bento_build.py install: + - tools/header.py "Dependency versions" + - tools/build_versions.py + - python setup.py build_ext --inplace script: diff --git a/tools/build_versions.py b/tools/build_versions.py new file mode 100755 index 00000000..2c0e32ba --- /dev/null +++ b/tools/build_versions.py @@ -0,0 +1,12 @@ +#!/usr/bin/env python + +from __future__ import print_function + +import numpy as np +import scipy as sp +import matplotlib as mpl +import six + +for m in (np, sp, mpl, six): + print(m.__name__.rjust(10), ' ', m.__version__) + diff --git a/tools/heading.py b/tools/heading.py new file mode 100755 index 00000000..d7a4c50b --- /dev/null +++ b/tools/heading.py @@ -0,0 +1,14 @@ +#!/usr/bin/env python + +from __future__ import print_function +import sys + +screen_width = 50 + +print('*' * screen_width) + +if len(sys.argv) > 1: + header = ' '.join(sys.argv[1:]) + print('*', header.center(screen_width - 4), '*') + print('*' * screen_width) + From c666b0f2d666a54e7f7028006b15c05a6b4f6a0f Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Mon, 5 May 2014 15:13:57 +0200 Subject: [PATCH 3/5] Remove deprecated --use-mirrors from pip calls --- .travis.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4c35713a..99b3b8ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,13 +50,13 @@ before_install: - pip install --use-mirrors matplotlib; - fi - - pip install --use-mirrors pillow - - pip install --use-mirrors cython - - pip install --use-mirrors flake8 - - pip install --use-mirrors six + - pip install pillow + - pip install cython + - pip install flake8 + - pip install six - - pip install --use-mirrors nose-cov - - pip install --use-mirrors coveralls + - pip install nose-cov + - pip install coveralls - python check_bento_build.py @@ -92,4 +92,3 @@ after_success: - if [[ $PYVER == '3.x' ]]; then - coveralls - fi - From 1a0228727e6b407a63e0f07786d675e66db8dd5e Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Mon, 5 May 2014 15:35:23 +0200 Subject: [PATCH 4/5] Rename heading -> header --- tools/{heading.py => header.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tools/{heading.py => header.py} (100%) diff --git a/tools/heading.py b/tools/header.py similarity index 100% rename from tools/heading.py rename to tools/header.py From 10459feefcd3c519d9ae2533074256fde5b0fc27 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Mon, 5 May 2014 17:01:27 +0200 Subject: [PATCH 5/5] Don't fail if .matplotlib dir already exists --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 99b3b8ee..169b512b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,7 +68,7 @@ install: script: # Matplotlib settings - - mkdir $HOME/.matplotlib + - mkdir -p $HOME/.matplotlib - touch $HOME/.matplotlib/matplotlibrc - "echo 'backend : Agg' > $HOME/.matplotlib/matplotlibrc" - "echo 'backend.qt4 : PyQt4' >> $HOME/.matplotlib/matplotlibrc"