[Python-modules-commits] [python-mockupdb] 04/05: merge patched into master

[Ondřej Nový]

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

onovy pushed a commit to branch master
in repository python-mockupdb.

commit 832c686c305834277908dc1fb2694527483fe59c
Merge: d127bd6 611275d
Author: Ondřej Nový <onovy at debian.org>
Date:   Thu Nov 10 22:00:36 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../0001-Don-t-require-pymongo-for-tests.patch     | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 92151b3,0000000..4172110
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- d0ec7e392d12c77e3c756a71312c09d98df031d1
- d0ec7e392d12c77e3c756a71312c09d98df031d1
++611275d75e0b4b53528263da74473b63a8a5bc01
++611275d75e0b4b53528263da74473b63a8a5bc01
 +d0ec7e392d12c77e3c756a71312c09d98df031d1
 +d0ec7e392d12c77e3c756a71312c09d98df031d1
 +python-mockupdb_1.1.0.orig.tar.gz
 +62d0eb9a573c94d07bd11ad089b0dc31e37ef0fb
 +123024
diff --cc debian/patches/0001-Don-t-require-pymongo-for-tests.patch
index 0000000,0000000..a4c7d1f
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Don-t-require-pymongo-for-tests.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 611275d75e0b4b53528263da74473b63a8a5bc01 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
++Date: Thu, 10 Nov 2016 22:00:16 +0100
++Subject: Don't require pymongo for tests
++
++---
++ setup.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/setup.py b/setup.py
++index dd165e1..6685c20 100755
++--- a/setup.py
+++++ b/setup.py
++@@ -16,7 +16,7 @@ with open('CHANGELOG.rst') as changelog_file:
++     changelog = changelog_file.read().replace('.. :changelog:', '')
++ 
++ requirements = []
++-test_requirements = ['pymongo>=3']
+++test_requirements = []
++ 
++ if sys.version_info[:2] == (2, 6):
++     requirements.append('ordereddict')
diff --cc debian/patches/series
index 0000000,0000000..238baf6
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Don-t-require-pymongo-for-tests.patch

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