Skip to content

Commit

Permalink
Fix setup.py cascade
Browse files Browse the repository at this point in the history
  • Loading branch information
jni committed Feb 3, 2015
1 parent d2d50e9 commit 0087758
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 3 deletions.
30 changes: 30 additions & 0 deletions skimage/future/graph/setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/usr/bin/env python

from skimage._build import cython
import os.path

base_path = os.path.abspath(os.path.dirname(__file__))


def configuration(parent_package='', top_path=None):
from numpy.distutils.misc_util import Configuration, get_numpy_include_dirs

config = Configuration('graph', parent_package, top_path)
config.add_data_dir('tests')

# This function tries to create C files from the given .pyx files. If
# it fails, try to build with pre-generated .c files.
cython(['_ncut_cy.pyx'], working_path=base_path)
config.add_extension('_ncut_cy', sources=['_ncut_cy.c'],
include_dirs=[get_numpy_include_dirs()])
return config

if __name__ == '__main__':
from numpy.distutils.core import setup
setup(maintainer='scikit-image Developers',
maintainer_email='scikit-image@googlegroups.com',
description='Graph-based Image-processing Algorithms',
url='https://github.com/scikit-image/scikit-image',
license='Modified BSD',
**(configuration(top_path='').todict())
)
12 changes: 12 additions & 0 deletions skimage/future/setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@

def configuration(parent_package='skimage', top_path=None):
from numpy.distutils.misc_util import Configuration
config = Configuration('future', parent_package, top_path)
config.add_subpackage('graph')
return config

if __name__ == "__main__":
from numpy.distutils.core import setup

config = configuration(top_path='').todict()
setup(**config)
3 changes: 0 additions & 3 deletions skimage/graph/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,13 @@ def configuration(parent_package='', top_path=None):
cython(['_spath.pyx'], working_path=base_path)
cython(['_mcp.pyx'], working_path=base_path)
cython(['heap.pyx'], working_path=base_path)
cython(['_ncut_cy.pyx'], working_path=base_path)

config.add_extension('_spath', sources=['_spath.c'],
include_dirs=[get_numpy_include_dirs()])
config.add_extension('_mcp', sources=['_mcp.c'],
include_dirs=[get_numpy_include_dirs()])
config.add_extension('heap', sources=['heap.c'],
include_dirs=[get_numpy_include_dirs()])
config.add_extension('_ncut_cy', sources=['_ncut_cy.c'],
include_dirs=[get_numpy_include_dirs()])
return config

if __name__ == '__main__':
Expand Down
1 change: 1 addition & 0 deletions skimage/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ def configuration(parent_package='', top_path=None):
config.add_subpackage('feature')
config.add_subpackage('restoration')
config.add_subpackage('filters')
config.add_subpackage('future')
config.add_subpackage('graph')
config.add_subpackage('io')
config.add_subpackage('measure')
Expand Down

0 comments on commit 0087758

Please sign in to comment.