[python-shapely] 130/148: Remove cythonize patch

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository python-shapely.

commit 45c336d056bafa801a5841ba9c25dcf13e563144
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Fri Jun 26 20:59:08 2015 +0200

    Remove cythonize patch
    
    Cython is run anyway since no C sources are present.
---
 .../0001-Use-cythonize-for-cythonization.patch     | 60 ----------------------
 ...ch => 0001-setup.cfg-to-autobuild-sphinx.patch} |  0
 ...atch => 0002-Retrieve-MathJax.js-locally.patch} |  0
 ...e.patch => 0003-Do-not-install-.pxi-file.patch} |  2 +-
 debian/patches/series                              |  7 ++-
 5 files changed, 4 insertions(+), 65 deletions(-)

diff --git a/debian/patches/0001-Use-cythonize-for-cythonization.patch b/debian/patches/0001-Use-cythonize-for-cythonization.patch
deleted file mode 100644
index dfcca7b..0000000
--- a/debian/patches/0001-Use-cythonize-for-cythonization.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Pietro Battiston <me at pietrobattiston.it>
-Date: Mon, 20 Jan 2014 11:16:00 +0100
-Subject: Use "cythonize" for cythonization
-
----
- setup.py | 31 ++-----------------------------
- 1 file changed, 2 insertions(+), 29 deletions(-)
- mode change 100755 => 100644 setup.py
-
-diff --git a/setup.py b/setup.py
-old mode 100755
-new mode 100644
-index ea428c0..2d18d56
---- a/setup.py
-+++ b/setup.py
-@@ -15,6 +15,7 @@ from distutils.cmd import Command
- from distutils.errors import CCompilerError, DistutilsExecError, \
-     DistutilsPlatformError
- from distutils.sysconfig import get_config_var
-+from Cython.Build import cythonize
- import errno
- import glob
- import os
-@@ -153,35 +154,7 @@ elif sys.platform == 'win32':
- else:
-     libraries = ['geos_c']
- 
--
--if os.path.exists("MANIFEST.in"):
--    pyx_file = "shapely/speedups/_speedups.pyx"
--    c_file = "shapely/speedups/_speedups.c"
--
--    force_cython = False
--    if 'sdist' in sys.argv:
--        force_cython = True
--
--    try:
--        if (force_cython or not os.path.exists(c_file)
--                or os.path.getmtime(pyx_file) > os.path.getmtime(c_file)):
--            print("Updating C extension with Cython.", file=sys.stderr)
--            subprocess.check_call(["cython", "shapely/speedups/_speedups.pyx"])
--    except (subprocess.CalledProcessError, OSError):
--        print("Warning: Could not (re)create C extension with Cython.",
--              file=sys.stderr)
--        if force_cython:
--            raise
--    if not os.path.exists("shapely/speedups/_speedups.c"):
--        print("Warning: speedup extension not found", file=sys.stderr)
--
--ext_modules = [
--    Extension(
--        "shapely.speedups._speedups",
--        ["shapely/speedups/_speedups.c"],
--        libraries=libraries,
--        include_dirs=[get_config_var('INCLUDEDIR')],),
--]
-+ext_modules = cythonize("shapely/speedups/_speedups.pyx")
- 
- try:
-     import numpy as np
diff --git a/debian/patches/0002-setup.cfg-to-autobuild-sphinx.patch b/debian/patches/0001-setup.cfg-to-autobuild-sphinx.patch
similarity index 100%
rename from debian/patches/0002-setup.cfg-to-autobuild-sphinx.patch
rename to debian/patches/0001-setup.cfg-to-autobuild-sphinx.patch
diff --git a/debian/patches/0003-Retrieve-MathJax.js-locally.patch b/debian/patches/0002-Retrieve-MathJax.js-locally.patch
similarity index 100%
rename from debian/patches/0003-Retrieve-MathJax.js-locally.patch
rename to debian/patches/0002-Retrieve-MathJax.js-locally.patch
diff --git a/debian/patches/0004-Do-not-install-.pxi-file.patch b/debian/patches/0003-Do-not-install-.pxi-file.patch
similarity index 95%
rename from debian/patches/0004-Do-not-install-.pxi-file.patch
rename to debian/patches/0003-Do-not-install-.pxi-file.patch
index 4ad10b6..15cf9ee 100644
--- a/debian/patches/0004-Do-not-install-.pxi-file.patch
+++ b/debian/patches/0003-Do-not-install-.pxi-file.patch
@@ -9,7 +9,7 @@ shapely, and it makes the Python 2 and 3 versions clash.
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 2d18d56..fabe936 100644
+index 9748470..7529165 100755
 --- a/setup.py
 +++ b/setup.py
 @@ -85,8 +85,7 @@ setup_args = dict(
diff --git a/debian/patches/series b/debian/patches/series
index 4c67f98..5390610 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0001-Use-cythonize-for-cythonization.patch
-0002-setup.cfg-to-autobuild-sphinx.patch
-0003-Retrieve-MathJax.js-locally.patch
-0004-Do-not-install-.pxi-file.patch
+0001-setup.cfg-to-autobuild-sphinx.patch
+0002-Retrieve-MathJax.js-locally.patch
+0003-Do-not-install-.pxi-file.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git