[Python-modules-commits] [python-django] 09/09: merge debian/patched-jessie-backports into debian/jessie-backports

[Raphaël Hertzog]

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

hertzog pushed a commit to branch debian/jessie-backports
in repository python-django.

commit 30129182922dc880796cfa73212bec5ac1d1e3ab
Merge: 55dbba8 f014680
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Thu Jul 21 10:02:39 2016 +0200

    merge debian/patched-jessie-backports into debian/jessie-backports

 debian/.git-dpm                                    |  4 +--
 ...-Fixed-tests-with-older-releases-of-numpy.patch | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/template_tests/syntax_tests/test_numpy.py    |  4 ++-
 4 files changed, 42 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index e9611b0,0000000..59a3e7a
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- e608615faa5e0be187c836732cc02dba97bb355f
- e608615faa5e0be187c836732cc02dba97bb355f
++f014680b108081f0db2b084acd09d59985e3cc49
++f014680b108081f0db2b084acd09d59985e3cc49
 +bda91e2a79160524c26fb87ca05f73b0132f5e0c
 +bda91e2a79160524c26fb87ca05f73b0132f5e0c
 +python-django_1.8.14.orig.tar.gz
 +f688e5b85373eaf3cd3af06756ce9d83275a6664
 +7293650
 +debianTag="debian/%e%v"
 +patchedTag="debian/patches/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0004-Fixed-26923-Fixed-tests-with-older-releases-of-numpy.patch
index 0000000,0000000..961a64e
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Fixed-26923-Fixed-tests-with-older-releases-of-numpy.patch
@@@ -1,0 -1,0 +1,36 @@@
++From f014680b108081f0db2b084acd09d59985e3cc49 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog at debian.org>
++Date: Thu, 21 Jul 2016 10:02:05 +0200
++Subject: Fixed #26923 -- Fixed tests with older releases of numpy
++
++numpy.VisibleDeprecationWarning does not exist in older releases
++of numpy that are still widely used (like 1.8.2 in Debian 8)
++and we must deal properly with its non-existence.
++
++Bug: https://code.djangoproject.com/ticket/26923
++---
++ tests/template_tests/syntax_tests/test_numpy.py | 4 +++-
++ 1 file changed, 3 insertions(+), 1 deletion(-)
++
++diff --git a/tests/template_tests/syntax_tests/test_numpy.py b/tests/template_tests/syntax_tests/test_numpy.py
++index 16b4d74..50f4040 100644
++--- a/tests/template_tests/syntax_tests/test_numpy.py
+++++ b/tests/template_tests/syntax_tests/test_numpy.py
++@@ -10,6 +10,8 @@ try:
++     VisibleDeprecationWarning = numpy.VisibleDeprecationWarning
++ except ImportError:
++     numpy = False
+++except AttributeError:
+++    VisibleDeprecationWarning = DeprecationWarning
++ 
++ 
++ @skipIf(numpy is False, "Numpy must be installed to run these tests.")
++@@ -20,7 +22,7 @@ class NumpyTests(SimpleTestCase):
++             "ignore",
++             "Using a non-integer number instead of an "
++             "integer will result in an error in the future",
++-            numpy.VisibleDeprecationWarning
+++            VisibleDeprecationWarning
++         )
++ 
++     @setup({'numpy-array-index01': '{{ var.1 }}'})
diff --cc debian/patches/series
index 4549594,0000000..d87a42f
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
 +02_disable-sources-in-sphinxdoc.diff
 +06_use_debian_geoip_database_as_default.diff
 +fix-25761-add-traceback-attribute.patch
++0004-Fixed-26923-Fixed-tests-with-older-releases-of-numpy.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django.git