[Python-modules-commits] [cysignals] 04/04: Debian patch 1.6.4+ds-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Sat Jun 10 08:02:56 UTC 2017
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository cysignals.
commit 30894c9f38744241446c5a0abbb03dcc731cb8aa
Author: Jerome Benoit <calculus at rezozer.net>
Date: Sat Jun 10 11:52:56 2017 +0400
Debian patch 1.6.4+ds-1
---
debian/adhoc/examples/doctest/Makefile | 11 +++++++----
debian/adhoc/examples/example/Makefile | 4 ++--
debian/changelog | 18 ++++++++++++++----
debian/clean | 1 +
debian/control | 2 +-
debian/patches/debianization.patch | 14 +++++++-------
.../upstream-autotoolization-harden-generic.patch | 6 +++---
.../upstream-autotoolization-harden-pari_gp.patch | 16 ++++++++--------
...ization_pytoolization-harden-build_directory.patch | 19 +++++++++----------
...stream-source-tools-gdb-handling_enhancement.patch | 18 +++++++++---------
debian/python-cysignals-bare.pyinstall | 1 -
debian/python-cysignals-pari.pyinstall | 1 -
debian/tests/check | 2 +-
debian/tests/control | 2 ++
14 files changed, 64 insertions(+), 51 deletions(-)
diff --git a/debian/adhoc/examples/doctest/Makefile b/debian/adhoc/examples/doctest/Makefile
index 52df4bd..3863915 100644
--- a/debian/adhoc/examples/doctest/Makefile
+++ b/debian/adhoc/examples/doctest/Makefile
@@ -16,18 +16,21 @@
#
# written for Debian by Jerome Benoit <calculus at rezozer.net>
# on behalf of the Debian Python Modules Team
-# copyright: 2016 Jerome Benoit <calculus at rezozer.net>
+# copyright: 2016-2017 Jerome Benoit <calculus at rezozer.net>
# distributed under the terms and conditions of GPL version 3 or later
#
-DOCTESTS = $(sort $(wildcard *.pyx))
+DOCTESTS = $(foreach pyx,$(sort $(wildcard *.pyx)),$(basename $(pyx)))
default: all
all: check
-check:
- @$(foreach tst, $(DOCTESTS), echo "*** $(tst) ***" ; $(PYTHON) -m doctest $(tst) ; )
+check: $(foreach tst, $(DOCTESTS), check-$(tst))
+
+check-%:
+ @echo "*** $(subst check-,,$@) ***"
+ $(PYTHON) -m doctest $(subst check-,,$@).pyx
clean:
diff --git a/debian/adhoc/examples/example/Makefile b/debian/adhoc/examples/example/Makefile
index 663ce99..6c4a9bd 100644
--- a/debian/adhoc/examples/example/Makefile
+++ b/debian/adhoc/examples/example/Makefile
@@ -16,7 +16,7 @@
#
# written for Debian by Jerome Benoit <calculus at rezozer.net>
# on behalf of the Debian Python Modules Team
-# copyright: 2016 Jerome Benoit <calculus at rezozer.net>
+# copyright: 2016-2017 Jerome Benoit <calculus at rezozer.net>
# distributed under the terms and conditions of GPL version 3 or later
#
@@ -34,7 +34,7 @@ build: setup.py cysignals_example.pyx
check: build
clean:
- $(RM) cysignals_example.c
+ $(RM) cysignals_example.cpp
$(RM) -rf build
maintainer-clean: clean
diff --git a/debian/changelog b/debian/changelog
index b78e73f..51f7526 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,20 @@
-cysignals (1.6.4+ds-0) UNRELEASED; urgency=medium
+cysignals (1.6.4+ds-1) experimental; urgency=medium
* New upstream release.
* Debianization:
- - debian/copyright, update.
-
- -- Jerome Benoit <calculus at rezozer.net> Fri, 09 Jun 2017 14:27:33 +0000
+ - debian/copyright, update;
+ - debian/control, refresh;
+ - debian/patches/*, refresh;
+ - debian/python-cysignals-(bare|pari).pyinstall, ignore egg-info;
+ - debian/tests/*:
+ - d/t/controls:
+ - tests 3, 4: allow-stderr to work around C/C+ mismatch warnings;
+ - d/t/check, add [--]keep-going option to make ;
+ - debian/adhoc/examples/example/Makefile, migrate from C to C++;
+ - debian/adhoc/examples/doctest/Makefile, harden;
+ - debian/clean, harden.
+
+ -- Jerome Benoit <calculus at rezozer.net> Sat, 10 Jun 2017 07:17:54 +0000
cysignals (1.3.2+ds-1) unstable; urgency=medium
diff --git a/debian/clean b/debian/clean
index 5c69975..d72526a 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,4 +1,5 @@
.pybuild/
+cysignals.egg-info/
src/config.h.in
configure
cysignals-CSI.1
diff --git a/debian/control b/debian/control
index a22d51e..06427e9 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
python-sphinx,
libpython-dev,
libpari-dev (>= 2.9),
- cython (>= 0.24),
+ cython (>= 0.25),
gdb
Build-Depends-Indep:
python-docutils,
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 9eda988..7d6d71b 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -4,21 +4,21 @@ Description: debianization
Origin: vendor, Debian
Forwarded: not-needed
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-11-04
+Last-Update: 2017-06-09
--- a/src/scripts/cysignals-CSI
+++ b/src/scripts/cysignals-CSI
-@@ -97,6 +97,7 @@
- """
+@@ -101,6 +101,7 @@
+
# Preload the right Python library
- libpython = os.path.join(sysconfig.get_config_var('exec_prefix'), 'lib',
+ libpython = os.path.join(sysconfig.get_config_var('LIBDIR'),
+ sysconfig.get_config_var('MULTIARCH'),
sysconfig.get_config_var('INSTSONAME'))
- env = dict(os.environ)
if sys.platform == 'macosx':
+ env['DYLD_INSERT_LIBRARIES'] = libpython
--- a/setup.py
+++ b/setup.py
-@@ -24,6 +24,8 @@
+@@ -35,6 +35,8 @@
ac_configure_flags = "--with-pari"
sys.argv.remove("--with-pari")
@@ -27,7 +27,7 @@ Last-Update: 2016-11-04
cythonize_dir = "build/XXXX"
if "--without-pari" in ac_configure_flags:
cythonize_dir = "build/bare"
-@@ -132,8 +134,12 @@
+@@ -133,8 +135,12 @@
# The variable "init_pxd" is the string which should be written to
# __init__.pxd
init_pxd = "# distutils: include_dirs = {0}\n".format(install_dir)
diff --git a/debian/patches/upstream-autotoolization-harden-generic.patch b/debian/patches/upstream-autotoolization-harden-generic.patch
index c856291..bc460d6 100644
--- a/debian/patches/upstream-autotoolization-harden-generic.patch
+++ b/debian/patches/upstream-autotoolization-harden-generic.patch
@@ -6,12 +6,12 @@ Description: autotoolization: harden: generic
Origin: vendor, Debian
Forwarded: https://github.com/sagemath/cysignals/pull/38
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-10-10
+Last-Update: 2017-06-09
--- a/Makefile
+++ b/Makefile
-@@ -46,8 +46,8 @@
- test: check
+@@ -136,8 +136,8 @@
+ #####################
configure: configure.ac
- autoconf
diff --git a/debian/patches/upstream-autotoolization-harden-pari_gp.patch b/debian/patches/upstream-autotoolization-harden-pari_gp.patch
index e70a973..3c18321 100644
--- a/debian/patches/upstream-autotoolization-harden-pari_gp.patch
+++ b/debian/patches/upstream-autotoolization-harden-pari_gp.patch
@@ -8,7 +8,7 @@ Description: autotoolization: harden: PARI/GP
Origin: vendor, Debian
Forwarded: https://github.com/sagemath/cysignals/pull/38
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-11-02
+Last-Update: 2017-06-09
--- /dev/null
+++ b/m4/pari.m4
@@ -315,8 +315,8 @@ Last-Update: 2016-11-02
--- a/setup.py
+++ b/setup.py
-@@ -12,11 +12,22 @@
- import os
+@@ -23,11 +23,22 @@
+
from glob import glob
+import sys
@@ -338,12 +338,12 @@ Last-Update: 2016-11-02
kwds = dict(include_dirs=[opj("src", "cysignals"),
opj(cythonize_dir, "src"),
opj(cythonize_dir, "src", "cysignals")],
-@@ -136,7 +147,7 @@
- except IOError:
+@@ -79,7 +90,7 @@
+ if not os.path.isfile(config_h):
import subprocess
subprocess.check_call(["make", "configure"])
- subprocess.check_call(["sh", "configure"])
+ subprocess.check_call(["sh", "configure" + ac_configure_flags ])
- f = open(configure_init_pxd_file, "r")
- with f:
- return f.read()
+
+ self.create_init_pxd()
+
diff --git a/debian/patches/upstream-autotoolization_pytoolization-harden-build_directory.patch b/debian/patches/upstream-autotoolization_pytoolization-harden-build_directory.patch
index de28a7f..2117f51 100644
--- a/debian/patches/upstream-autotoolization_pytoolization-harden-build_directory.patch
+++ b/debian/patches/upstream-autotoolization_pytoolization-harden-build_directory.patch
@@ -8,11 +8,11 @@ Description: autotoolization/pytoolization: harden: build directory
Origin: vendor, Debian
Forwarded: https://github.com/sagemath/cysignals/pull/38
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-11-02
+Last-Update: 2017-06-09
--- a/setup.py
+++ b/setup.py
-@@ -16,10 +16,7 @@
+@@ -27,10 +27,7 @@
opj = os.path.join
@@ -24,7 +24,7 @@ Last-Update: 2016-11-02
if "--without-pari" in sys.argv:
ac_configure_flags = "--without-pari"
sys.argv.remove("--without-pari")
-@@ -27,6 +24,11 @@
+@@ -38,6 +35,11 @@
ac_configure_flags = "--with-pari"
sys.argv.remove("--with-pari")
@@ -36,20 +36,19 @@ Last-Update: 2016-11-02
kwds = dict(include_dirs=[opj("src", "cysignals"),
opj(cythonize_dir, "src"),
-@@ -146,8 +148,11 @@
- f = open(configure_init_pxd_file, "r")
- except IOError:
+@@ -90,7 +92,11 @@
+ if not os.path.isfile(config_h):
import subprocess
-- subprocess.check_call(["make", "configure"])
+ subprocess.check_call(["make", "configure"])
- subprocess.check_call(["sh", "configure" + ac_configure_flags ])
+ subprocess.check_call(
+ "make configure && mkdir -p " + cythonize_dir +
+ " && " +
+ "{ cd " + cythonize_dir + " ; ../../configure " + ac_configure_flags + " ; }" ,
+ shell=True)
- f = open(configure_init_pxd_file, "r")
- with f:
- return f.read()
+
+ self.create_init_pxd()
+
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
diff --git a/debian/patches/upstream-source-tools-gdb-handling_enhancement.patch b/debian/patches/upstream-source-tools-gdb-handling_enhancement.patch
index e881fc0..c5b5cb5 100644
--- a/debian/patches/upstream-source-tools-gdb-handling_enhancement.patch
+++ b/debian/patches/upstream-source-tools-gdb-handling_enhancement.patch
@@ -6,12 +6,12 @@ Description: enhance helper handling in cysignals-CSI
Origin: vendor, Debian
Forwarded: https://github.com/sagemath/cysignals/pull/39
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-11-02
+Last-Update: 2017-06-09
--- a/setup.py
+++ b/setup.py
-@@ -170,11 +170,13 @@
- platforms=["POSIX"],
+@@ -208,11 +208,13 @@
+ setup_requires=["Cython"],
ext_modules=extensions,
- packages=["cysignals"],
@@ -19,18 +19,18 @@ Last-Update: 2016-11-02
package_dir={"cysignals": opj("src", "cysignals"),
- "cysignals-cython": opj(cythonize_dir, "src", "cysignals")},
+ "cysignals-cython": opj(cythonize_dir, "src", "cysignals"),
-+ "cysignals_gdb": opj("src", "scripts")},
++ "cysignals_gdb": opj("src", "scripts")},
package_data={"cysignals": ["*.pxi", "*.pxd", "*.h"],
- "cysignals-cython": ["*.h"]},
- scripts=glob(opj("src", "scripts", "*")),
+ "cysignals-cython": ["*.h"],
-+ "cysignals_gdb": ["cysignals-CSI-helper.py"]},
-+ scripts=[opj("src", "scripts", "cysignals-CSI")],
- cmdclass=dict(build_py=build_py, build_ext=build_ext),
++ "cysignals_gdb": ["cysignals-CSI-helper.py"]},
++ scripts=glob(opj("src", "scripts", "cysignals-CSI")),
+ cmdclass=dict(build=build, build_py=build_py, install=install, bdist_egg=no_egg)
)
--- a/src/scripts/cysignals-CSI
+++ b/src/scripts/cysignals-CSI
-@@ -64,6 +64,8 @@
+@@ -66,6 +66,8 @@
def gdb_commands(pid, color):
@@ -39,7 +39,7 @@ Last-Update: 2016-11-02
cmds = b('')
cmds += b('set prompt (cysignals-gdb-prompt)\n')
cmds += b('set verbose off\n')
-@@ -75,7 +77,7 @@
+@@ -77,7 +79,7 @@
cmds += b('import sys; sys.stdout.flush()\n')
cmds += b('end\n')
cmds += b('bt full\n')
diff --git a/debian/python-cysignals-bare.pyinstall b/debian/python-cysignals-bare.pyinstall
index 1bde5cd..4a6a165 100644
--- a/debian/python-cysignals-bare.pyinstall
+++ b/debian/python-cysignals-bare.pyinstall
@@ -1,2 +1 @@
debian/tmp/bare/usr/lib/python2*/dist-packages/cysignals/*.* cysignals
-debian/tmp/bare/usr/lib/python2*/dist-packages/*.egg-info cysignals
diff --git a/debian/python-cysignals-pari.pyinstall b/debian/python-cysignals-pari.pyinstall
index f45fa7b..5e52282 100644
--- a/debian/python-cysignals-pari.pyinstall
+++ b/debian/python-cysignals-pari.pyinstall
@@ -1,2 +1 @@
debian/tmp/pari/usr/lib/python2*/dist-packages/cysignals/*.* cysignals
-debian/tmp/pari/usr/lib/python2*/dist-packages/*.egg-info cysignals
diff --git a/debian/tests/check b/debian/tests/check
index a174ec6..15293a3 100755
--- a/debian/tests/check
+++ b/debian/tests/check
@@ -10,6 +10,6 @@ cp -pr "/usr/share/doc/python-cysignals-doc/examples/$testname" "$ADTTMP"
cd "$ADTTMP/$testname"
-make check
+make -k check
exit 0
diff --git a/debian/tests/control b/debian/tests/control
index bee2789..e1a032c 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -6,6 +6,8 @@ Depends: python-cysignals-pari, cysignals-tools, python-cysignals-doc
Test-Command: debian/tests/check example bare
Depends: python-cysignals-bare, python-cysignals-doc, cython, libpython-dev, build-essential
+Restrictions: allow-stderr
Test-Command: debian/tests/check example pari
Depends: python-cysignals-pari, python-cysignals-doc, cython, libpython-dev, build-essential
+Restrictions: allow-stderr
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/cysignals.git
More information about the Python-modules-commits
mailing list