Commit 14615e1f authored by GROUAZEL's avatar GROUAZEL
Browse files

fix bug in setup.py and resampler.py

parent e01e8365
......@@ -27,7 +27,8 @@ from cerbere.datamodel.image import Image
from cerbere.datamodel.trajectory import Trajectory
try:
from cerbereutils.resampling import fastregrid
# from cerbereutils.resampling import fastregrid
import fastregrid
except ImportError:
logging.warning(
"This cerbere instance doesn't include a compiled Cython "
......@@ -36,7 +37,8 @@ except ImportError:
"Building 'pyx' implace...")
import pyximport
pyximport.install(setup_args={'include_dirs': numpy.get_include()})
from cerbereutils.resampling import fastregrid
# from cerbereutils.resampling import fastregrid
import fastregrid
logging.warning("'pyx' is available but built inplace.")
......
......@@ -20,7 +20,7 @@ from numpy import get_include
# The name an location of Cython modules
EXT_MODULES = [Extension("cerbereutils.resampling.fastregrid", ["cerbereutils/resampling/fastregrid.pyx"])]
EXT_MODULES = [Extension("cerinterp.fastregrid", ["cerinterp/fastregrid.pyx"])]
setup(
zip_safe=False,
......@@ -29,7 +29,7 @@ setup(
author='Jeff Piolle <jfpiolle@ifremer.fr>',
author_email='jfpiolle@ifremer.fr',
url = "http://cersat.ifremer.fr",
packages=['cerinterp']
packages=['cerinterp'],
scripts=['bin/cerresample'],
license='LICENSE.txt',
description='A collection of tools and packages complementary to cerbere for interpolation and resampling',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment