[Python-modules-commits] [django-sitetree] 03/06: Drop patch to unmask test failures, merged upstream.

[Michael Fladischer]

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

fladi pushed a commit to branch debian/master
in repository django-sitetree.

commit c9b47dd240b1c80666219f6a49788c4d18ba0965
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Wed Dec 20 10:13:43 2017 +0100

    Drop patch to unmask test failures, merged upstream.
---
 debian/changelog                                   |  6 ++++++
 ...-Do-not-mask-test-failures-in-runtests.py.patch | 24 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f466944..7a450b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+django-sitetree (1.8.0+dfsg-3) UNRELEASED; urgency=medium
+
+  * Drop patch to unmask test failures, merged upstream.
+
+ -- Michael Fladischer <fladi at debian.org>  Wed, 20 Dec 2017 10:13:34 +0100
+
 django-sitetree (1.8.0+dfsg-2) unstable; urgency=low
 
   * Refresh patches after git-dpm to gbp pq conversion
diff --git a/debian/patches/0002-Do-not-mask-test-failures-in-runtests.py.patch b/debian/patches/0002-Do-not-mask-test-failures-in-runtests.py.patch
deleted file mode 100644
index 78f44ab..0000000
--- a/debian/patches/0002-Do-not-mask-test-failures-in-runtests.py.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Michael Fladischer <FladischerMichael at fladi.at>
-Date: Mon, 11 Dec 2017 15:05:42 +0100
-Subject: Do not mask test failures in runtests.py.
-
-Author: Chris Lamb <lamby at debian.org>
-Forwarded: https://github.com/idlesign/django-sitetree/pull/240
-Bug: 877321
----
- sitetree/runtests.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/sitetree/runtests.py b/sitetree/runtests.py
-index be464ba..0ff3aff 100755
---- a/sitetree/runtests.py
-+++ b/sitetree/runtests.py
-@@ -1,5 +1,7 @@
- #! /usr/bin/env python
- 
-+import sys
-+
- if __name__ == '__main__':
-     from pytest import main as pytest_main
--    pytest_main()
-+    sys.exit(pytest_main())
diff --git a/debian/patches/series b/debian/patches/series
index 3d50d4a..46884be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-Fix-value-of-Language-fields-for-django.po-files.patch
-0002-Do-not-mask-test-failures-in-runtests.py.patch

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