[Python-modules-commits] [exam] 03/03: * Create DPMT git repository and refresh patches using gbp pq

Sat Jul 8 03:33:25 UTC 2017

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

kitterman pushed a commit to branch debian/master
in repository exam.

commit f1263fa545f3767a42d25dad76488b879b42a820
Author: Scott Kitterman <scott at kitterman.com>
Date:   Fri Jul 7 23:26:42 2017 -0400

    * Create DPMT git repository and refresh patches using gbp pq
---
 debian/changelog                                   |  7 +++++
 ...-7c3f150a38076b48717cf08567c3e4809bf22a3d.patch | 32 +++++++++++++++++++++
 ...ling-on-3.5 => 0002-Tests-failing-on-3.5.patch} | 31 ++++++--------------
 ...stream-7c3f150a38076b48717cf08567c3e4809bf22a3d | 33 ----------------------
 debian/patches/series                              |  4 +--
 5 files changed, 50 insertions(+), 57 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 146e32a..6100f53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+exam (0.10.5-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Create DPMT git repository and refresh patches using gbp pq
+
+ -- Scott Kitterman <scott at kitterman.com>  Fri, 07 Jul 2017 23:25:57 -0400
+
 exam (0.10.5-1) unstable; urgency=low
 
   * Initial release. (Closes: #825822)
diff --git a/debian/patches/0001-Upstream-7c3f150a38076b48717cf08567c3e4809bf22a3d.patch b/debian/patches/0001-Upstream-7c3f150a38076b48717cf08567c3e4809bf22a3d.patch
new file mode 100644
index 0000000..51ccaf7
--- /dev/null
+++ b/debian/patches/0001-Upstream-7c3f150a38076b48717cf08567c3e4809bf22a3d.patch
@@ -0,0 +1,32 @@
+From: Debian Python Modules Team <python-modules-team at 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/debian/gbp.conf b/debian/gbp.conf
+new file mode 100644
+index 0000000..89e1176
+--- /dev/null
++++ b/debian/gbp.conf
+@@ -0,0 +1,3 @@
++[DEFAULT]
++debian-branch=debian/master
++
+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 --git a/debian/patches/Tests-failing-on-3.5 b/debian/patches/0002-Tests-failing-on-3.5.patch
similarity index 54%
rename from debian/patches/Tests-failing-on-3.5
rename to debian/patches/0002-Tests-failing-on-3.5.patch
index 5e70706..ee43744 100644
--- a/debian/patches/Tests-failing-on-3.5
+++ b/debian/patches/0002-Tests-failing-on-3.5.patch
@@ -1,28 +1,15 @@
-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 <gilles at wikimedia.org>
+From: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Date: Fri, 7 Jul 2017 23:24:16 -0400
+Subject: Tests-failing-on-3.5
 
 ---
-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:
+ tests/test_mock.py | 6 ++++++
+ 1 file changed, 6 insertions(+)
 
-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
+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
diff --git a/debian/patches/Upstream-7c3f150a38076b48717cf08567c3e4809bf22a3d b/debian/patches/Upstream-7c3f150a38076b48717cf08567c3e4809bf22a3d
deleted file mode 100644
index 10dc71d..0000000
--- a/debian/patches/Upstream-7c3f150a38076b48717cf08567c3e4809bf22a3d
+++ /dev/null
@@ -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 <gilles at 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 --git a/debian/patches/series b/debian/patches/series
index b4dfd5a..01fe8fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-Upstream-7c3f150a38076b48717cf08567c3e4809bf22a3d
-Tests-failing-on-3.5
+0001-Upstream-7c3f150a38076b48717cf08567c3e4809bf22a3d.patch
+0002-Tests-failing-on-3.5.patch

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

