From 6cdb16ff0ce0c94597bbd224d71546276d8cf399 Mon Sep 17 00:00:00 2001
From: Manuel Guenther <manuel.guenther@idiap.ch>
Date: Wed, 3 Sep 2014 14:11:04 +0200
Subject: [PATCH] Now uses our own build_ext (removes compiler warnings).
---
.travis.yml | 3 +--
setup.py | 8 ++++++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 5dc655f..c93c2f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,10 +18,9 @@ before_install:
- sudo apt-get install -qq --force-yes libboost-all-dev libblitz1-dev libhdf5-serial-dev
- sudo apt-get install -qq --force-yes libjpeg8-dev libnetpbm10-dev libpng12-dev libtiff4-dev libgif-dev
- sudo apt-get install -qq --force-yes python-opencv libcv-dev libcvaux-dev libopencv-dev
-- sudo apt-get install -qq --force-yes python-matplotlib
- if [ -n "${NUMPYSPEC}" ]; then sudo apt-get install -qq --force-yes libatlas-dev libatlas-base-dev liblapack-dev gfortran; fi
- if [ -n "${NUMPYSPEC}" ]; then pip install --upgrade pip setuptools; fi
-- if [ -n "${NUMPYSPEC}" ]; then pip install --find-links http://wheels.astropy.org/ --find-links http://wheels2.astropy.org/ --use-wheel numpy$NUMPYSPEC sphinx nose matplotlib; fi
+- if [ -n "${NUMPYSPEC}" ]; then pip install --find-links http://wheels.astropy.org/ --find-links http://wheels2.astropy.org/ --use-wheel numpy$NUMPYSPEC matplotlib==1.3.0 sphinx nose==1.3.0 jinja2==2.6; fi
- pip install cpp-coveralls
install:
- python bootstrap.py
diff --git a/setup.py b/setup.py
index d60e95a..f780856 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ bob_packages = ['bob.core', 'bob.io.base']
from setuptools import setup, find_packages, dist
dist.Distribution(dict(setup_requires=['bob.blitz'] + bob_packages))
-from bob.blitz.extension import Extension
+from bob.blitz.extension import Extension, build_ext
version = '2.0.0a0'
@@ -73,8 +73,12 @@ setup(
),
],
+ cmdclass = {
+ 'build_ext': build_ext
+ },
+
classifiers = [
- 'Development Status :: 5 - Production/Stable',
+ 'Development Status :: 4 - Beta',
'Intended Audience :: Developers',
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
'Natural Language :: English',
--
GitLab