[python-fabio] 31/31: rework the patch
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Fri Dec 27 19:05:50 UTC 2013
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository python-fabio.
commit 435224ced0a432c365a4857f07cf367ab4110cdd
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Fri Dec 27 19:45:38 2013 +0100
rework the patch
---
...0001-forwarded-upstream-cythonize-during-the-build.patch | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/debian/patches/0001-forwarded-upstream-cythonize-during-the-build.patch b/debian/patches/0001-forwarded-upstream-cythonize-during-the-build.patch
index 3857ad6..97bd755 100644
--- a/debian/patches/0001-forwarded-upstream-cythonize-during-the-build.patch
+++ b/debian/patches/0001-forwarded-upstream-cythonize-during-the-build.patch
@@ -1,30 +1,29 @@
From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Fri, 27 Dec 2013 18:47:46 +0100
+Date: Fri, 27 Dec 2013 19:45:08 +0100
Subject: forwarded upstream cythonize during the build
---
- setup.py | 20 ++++++++++++++++----
- 1 file changed, 16 insertions(+), 4 deletions(-)
+ setup.py | 18 +++++++++++++++---
+ 1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/setup.py b/setup.py
-index ebae18c..b38be00 100644
+index ebae18c..221123f 100644
--- a/setup.py
+++ b/setup.py
@@ -13,21 +13,33 @@ except ImportError:
from distutils.core import Extension, Command
from numpy.distutils.misc_util import get_numpy_include_dirs
--
+# Check for Cython and use it if it is available
+USE_CYTHON = False
-+ext = '.c'
+try:
+ from Cython.Build import cythonize
+ USE_CYTHON = True
-+ ext = ".pyx"
+except ImportError:
+ pass
++ext = ".pyx" if USE_CYTHON else ".c"
+
cf_backend = Extension('cf_io', include_dirs=get_numpy_include_dirs(),
sources=['src/cf_iomodule.c', 'src/columnfile.c'])
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-fabio.git
More information about the debian-science-commits
mailing list