Compliance with new bob.buildout build scheme

bioidiap · Sep 12, 2014 · 31b3300 · 31b3300
1 parent 7561915
commit 31b3300
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,7 @@
+setuptools
+bob.extension
+bob.blitz
+bob.core
+bob.math
+bob.io.base
+matplotlib
diff --git a/setup.py b/setup.py
@@ -6,9 +6,12 @@
 bob_packages = ['bob.core', 'bob.math']
 
 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()
+
 packages = ['blitz >= 0.10', 'boost']
 
 version = '2.0.0a0'
@@ -29,14 +32,8 @@
     include_package_data=True,
     zip_safe=False,
 
-    install_requires=[
-      'setuptools',
-      'bob.blitz',
-      'bob.core',
-      'bob.math',
-      'bob.io.base',
-      'matplotlib',
-    ],
+    setup_requires = build_requires,
+    install_requires = build_requires,
 
     namespace_packages=[
       "bob",