From 85e9f757b4d07c58b1fc8992b3e217f6f4c1bead Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Fri, 12 Sep 2014 15:55:10 +0200
Subject: [PATCH] Compliance with the new buildout requirements
---
requirements.txt | 13 +++++++++++++
setup.py | 17 ++++++-----------
2 files changed, 19 insertions(+), 11 deletions(-)
create mode 100644 requirements.txt
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..2298a23
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,13 @@
+setuptools
+bob.extension
+bob.blitz
+bob.core
+bob.io.base
+
+# For tests
+bob.io.image
+bob.ip.color
+
+# For documentation generation
+bob.ip.draw
+matplotlib
diff --git a/setup.py b/setup.py
index f780856..48ef219 100644
--- a/setup.py
+++ b/setup.py
@@ -9,9 +9,12 @@
bob_packages = ['bob.core', 'bob.io.base']
from setuptools import setup, find_packages, dist
-dist.Distribution(dict(setup_requires=['bob.blitz'] + bob_packages))
+dist.Distribution(dict(setup_requires=['bob.extension', 'bob.blitz'] + bob_packages))
from bob.blitz.extension import Extension, build_ext
+from bob.extension.utils import load_requirements
+build_requires = load_requirements()
+
version = '2.0.0a0'
packages = ['boost', 'opencv>=2.0']
@@ -32,16 +35,8 @@ setup(
include_package_data=True,
zip_safe=False,
- install_requires=[
- 'setuptools',
- 'bob.blitz',
- 'bob.core',
- 'bob.io.base',
- 'bob.io.image', #for tests
- 'bob.ip.color', #for tests
- 'bob.ip.draw', #for doc generation
- 'matplotlib', #for doc generation
- ],
+ setup_requires = build_requires,
+ install_requires = build_requires,
namespace_packages=[
"bob",
--
GitLab