Package: release.debian.org Severity: normal Tags: stretch User: release.debian....@packages.debian.org Usertags: pu
Fixing up the python dependencies. The debdiff is a bit noisy due to the renaming of the patches ... but therefore it's just a rebuild of the package from sid. $ debdiff python3-exam_0.10.5-1_all.deb python3-exam_0.10.5-2~deb9u1_all.deb File lists identical (after any substitutions) Control files: lines which differ (wdiff format) ------------------------------------------------ Depends: [-python-mock-] {+python3-mock, python3:any (>= 3.3.2-2~)+} Version: [-0.10.5-1-] {+0.10.5-2~deb9u1+} $ debdiff python-exam_0.10.5-1_all.deb python-exam_0.10.5-2~deb9u1_all.deb File lists identical (after any substitutions) Control files: lines which differ (wdiff format) ------------------------------------------------ Version: [-0.10.5-1-] {+0.10.5-2~deb9u1+} Andreas
diff -Nru exam-0.10.5/debian/changelog exam-0.10.5/debian/changelog --- exam-0.10.5/debian/changelog 2016-06-14 19:54:12.000000000 +0200 +++ exam-0.10.5/debian/changelog 2017-11-27 01:27:32.000000000 +0100 @@ -1,3 +1,23 @@ +exam (0.10.5-2~deb9u1) stretch; urgency=medium + + * Non-maintainer upload. + * Rebuild for stretch + + -- Andreas Beckmann <a...@debian.org> Mon, 27 Nov 2017 01:27:32 +0100 + +exam (0.10.5-2) unstable; urgency=medium + + * Team upload. + * Create DPMT git repository and refresh patches using gbp pq + * Correct Vcs-* fields in debian/control to point to the correct package + name + * Use correct substitution varial for python3-exam so python3 interpreter + depends are correctly generated (Closes: #867404) + * Let dh_python determine the mock depends (corrects issue where python- + exam incorrectly depended on python-mock instead of python3-mock) + + -- Scott Kitterman <sc...@kitterman.com> Fri, 07 Jul 2017 23:47:09 -0400 + exam (0.10.5-1) unstable; urgency=low * Initial release. (Closes: #825822) diff -Nru exam-0.10.5/debian/control exam-0.10.5/debian/control --- exam-0.10.5/debian/control 2016-06-14 19:54:12.000000000 +0200 +++ exam-0.10.5/debian/control 2017-07-08 05:47:06.000000000 +0200 @@ -21,12 +21,12 @@ X-Python-Version: >= 2.6 X-Python3-Version: >= 3.2 Homepage: https://github.com/fluxx/exam -Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/python-exam.git -Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/python-exam.git +Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/exam.git +Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/exam.git Package: python-exam Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, python-mock +Depends: ${misc:Depends}, ${python:Depends} Description: Python module to help write better tests Exam is a Python toolkit for writing better tests. It aims to remove a lot of the boiler plate testing code one often writes, while still @@ -59,7 +59,7 @@ Package: python3-exam Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, python-mock +Depends: ${misc:Depends}, ${python3:Depends} Description: Python module to help write better tests Exam is a Python toolkit for writing better tests. It aims to remove a lot of the boiler plate testing code one often writes, while still diff -Nru exam-0.10.5/debian/gbp.conf exam-0.10.5/debian/gbp.conf --- exam-0.10.5/debian/gbp.conf 1970-01-01 01:00:00.000000000 +0100 +++ exam-0.10.5/debian/gbp.conf 2017-07-08 05:40:25.000000000 +0200 @@ -0,0 +1,3 @@ +[DEFAULT] +debian-branch=debian/master + diff -Nru exam-0.10.5/debian/patches/0001-Upstream-7c3f150a38076b48717cf08567c3e4809bf22a3d.patch exam-0.10.5/debian/patches/0001-Upstream-7c3f150a38076b48717cf08567c3e4809bf22a3d.patch --- exam-0.10.5/debian/patches/0001-Upstream-7c3f150a38076b48717cf08567c3e4809bf22a3d.patch 1970-01-01 01:00:00.000000000 +0100 +++ exam-0.10.5/debian/patches/0001-Upstream-7c3f150a38076b48717cf08567c3e4809bf22a3d.patch 2017-07-08 05:39:14.000000000 +0200 @@ -0,0 +1,23 @@ +From: Debian Python Modules Team <python-modules-t...@lists.alioth.debian.org> +Date: Fri, 7 Jul 2017 23:24:16 -0400 +Subject: Upstream-7c3f150a38076b48717cf08567c3e4809bf22a3d + +--- + debian/gbp.conf | 3 +++ + setup.py | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + create mode 100644 debian/gbp.conf + +diff --git a/setup.py b/setup.py +index fcc1ecc..f534585 100755 +--- a/setup.py ++++ b/setup.py +@@ -27,7 +27,7 @@ setup( + url='https://github.com/fluxx/exam', + description='Helpers for better testing.', + license='MIT', +- packages=find_packages(), ++ packages=find_packages(exclude=['tests', 'tests.*']), + install_requires=install_requires, + tests_require=tests_require, + setup_requires=setup_requires, diff -Nru exam-0.10.5/debian/patches/0002-Tests-failing-on-3.5.patch exam-0.10.5/debian/patches/0002-Tests-failing-on-3.5.patch --- exam-0.10.5/debian/patches/0002-Tests-failing-on-3.5.patch 1970-01-01 01:00:00.000000000 +0100 +++ exam-0.10.5/debian/patches/0002-Tests-failing-on-3.5.patch 2017-07-08 05:24:33.000000000 +0200 @@ -0,0 +1,43 @@ +From: Debian Python Modules Team <python-modules-t...@lists.alioth.debian.org> +Date: Fri, 7 Jul 2017 23:24:16 -0400 +Subject: Tests-failing-on-3.5 + +--- + tests/test_mock.py | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/tests/test_mock.py b/tests/test_mock.py +index 5489311..f6910c0 100644 +--- a/tests/test_mock.py ++++ b/tests/test_mock.py +@@ -1,3 +1,6 @@ ++import sys ++import unittest ++ + from tests import TestCase + + from exam.mock import Mock +@@ -28,6 +31,7 @@ class MockTest(TestCase): + self.mock.reset_mock() + self.mock.assert_not_called() + ++ @unittest.skipIf(sys.version_info > (3,4), "fails on 3.5") + def test_assert_not_called_with_asserts_not_called_with_args(self): + self.mock(1, 2, three=4) + self.mock.assert_called_with(1, 2, three=4) +@@ -42,6 +46,7 @@ class MockTest(TestCase): + self.mock('foo') + self.mock.assert_not_called_with(1, 2, three=4) # not the latest call + ++ @unittest.skipIf(sys.version_info > (3,4), "fails on 3.5") + def test_assert_not_called_once_with_asserts_one_call_with_args(self): + self.mock.assert_not_called_once_with(1, 2, three=4) # 0 times + +@@ -53,6 +58,7 @@ class MockTest(TestCase): + self.mock(1, 2, three=4) + self.mock.assert_not_called_once_with(1, 2, three=4) # 2 times + ++ @unittest.skipIf(sys.version_info > (3,4), "fails on 3.5") + def test_assert_not_any_call_asserts_never_called_with_args(self): + self.mock.assert_not_any_call(1, 2, three=4) + diff -Nru exam-0.10.5/debian/patches/Tests-failing-on-3.5 exam-0.10.5/debian/patches/Tests-failing-on-3.5 --- exam-0.10.5/debian/patches/Tests-failing-on-3.5 2016-06-14 19:54:12.000000000 +0200 +++ exam-0.10.5/debian/patches/Tests-failing-on-3.5 1970-01-01 01:00:00.000000000 +0100 @@ -1,56 +0,0 @@ -Description: Tests failing on 3.5 - Skips some tests that fail due to syntax deprecated in 3.5. - . - exam (0.10.5-1) UNRELEASED; urgency=medium - . - * Initial release. -Author: Gilles Dubuc <gil...@wikimedia.org> - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: https://bugs.debian.org/<bugnumber> -Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> -Last-Update: <YYYY-MM-DD> - -Index: exam-0.10.5/tests/test_mock.py -=================================================================== ---- exam-0.10.5.orig/tests/test_mock.py -+++ exam-0.10.5/tests/test_mock.py -@@ -1,3 +1,6 @@ -+import sys -+import unittest -+ - from tests import TestCase - - from exam.mock import Mock -@@ -28,6 +31,7 @@ class MockTest(TestCase): - self.mock.reset_mock() - self.mock.assert_not_called() - -+ @unittest.skipIf(sys.version_info > (3,4), "fails on 3.5") - def test_assert_not_called_with_asserts_not_called_with_args(self): - self.mock(1, 2, three=4) - self.mock.assert_called_with(1, 2, three=4) -@@ -42,6 +46,7 @@ class MockTest(TestCase): - self.mock('foo') - self.mock.assert_not_called_with(1, 2, three=4) # not the latest call - -+ @unittest.skipIf(sys.version_info > (3,4), "fails on 3.5") - def test_assert_not_called_once_with_asserts_one_call_with_args(self): - self.mock.assert_not_called_once_with(1, 2, three=4) # 0 times - -@@ -53,6 +58,7 @@ class MockTest(TestCase): - self.mock(1, 2, three=4) - self.mock.assert_not_called_once_with(1, 2, three=4) # 2 times - -+ @unittest.skipIf(sys.version_info > (3,4), "fails on 3.5") - def test_assert_not_any_call_asserts_never_called_with_args(self): - self.mock.assert_not_any_call(1, 2, three=4) - diff -Nru exam-0.10.5/debian/patches/Upstream-7c3f150a38076b48717cf08567c3e4809bf22a3d exam-0.10.5/debian/patches/Upstream-7c3f150a38076b48717cf08567c3e4809bf22a3d --- exam-0.10.5/debian/patches/Upstream-7c3f150a38076b48717cf08567c3e4809bf22a3d 2016-06-14 19:54:12.000000000 +0200 +++ exam-0.10.5/debian/patches/Upstream-7c3f150a38076b48717cf08567c3e4809bf22a3d 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -Description: Upstream fix 7c3f150a38076b48717cf08567c3e4809bf22a3d - The module used to install its tests folder in the global namespace. - This upstream commit fixes that. - . - exam (0.10.5-1) UNRELEASED; urgency=medium - . - * Initial release. -Author: Gilles Dubuc <gil...@wikimedia.org> - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: https://bugs.debian.org/<bugnumber> -Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> -Last-Update: <YYYY-MM-DD> - ---- exam-0.10.5.orig/setup.py -+++ exam-0.10.5/setup.py -@@ -27,7 +27,7 @@ setup( - url='https://github.com/fluxx/exam', - description='Helpers for better testing.', - license='MIT', -- packages=find_packages(), -+ packages=find_packages(exclude=['tests', 'tests.*']), - install_requires=install_requires, - tests_require=tests_require, - setup_requires=setup_requires, diff -Nru exam-0.10.5/debian/patches/series exam-0.10.5/debian/patches/series --- exam-0.10.5/debian/patches/series 2016-06-14 19:54:12.000000000 +0200 +++ exam-0.10.5/debian/patches/series 2017-07-08 05:24:33.000000000 +0200 @@ -1,2 +1,2 @@ -Upstream-7c3f150a38076b48717cf08567c3e4809bf22a3d -Tests-failing-on-3.5 +0001-Upstream-7c3f150a38076b48717cf08567c3e4809bf22a3d.patch +0002-Tests-failing-on-3.5.patch