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

[Ondrej Novy]

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

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

commit 1750bd95c1571530ea4ff5a373030b799e1081bb
Merge: d626c5c c7c0050
Author: Ondřej Nový <onovy at debian.org>
Date:   Tue Jan 16 13:38:42 2018 +0100

    merge patched into master

 .gitignore                                         |  13 --
 CHANGELOG.rst                                      |  30 ++++
 Makefile                                           |  70 --------
 PKG-INFO                                           |  98 +++++++++++
 debian/.git-dpm                                    |   6 +-
 .../0001-Don-t-require-pymongo-for-tests.patch     |   4 +-
 docs/_static/mask.jpg                              | Bin 56791 -> 0 bytes
 docs/_static/sidebar.js                            | 193 ---------------------
 docs/installation.rst                              |  14 +-
 docs/pydoctheme/static/pydoctheme.css              | 178 -------------------
 docs/pydoctheme/theme.conf                         |  23 ---
 mockupdb.egg-info/PKG-INFO                         |  98 +++++++++++
 mockupdb.egg-info/SOURCES.txt                      |  45 +++++
 mockupdb.egg-info/dependency_links.txt             |   1 +
 mockupdb.egg-info/not-zip-safe                     |   1 +
 mockupdb.egg-info/top_level.txt                    |   1 +
 mockupdb/__init__.py                               |  52 +++---
 setup.cfg                                          |   5 +
 setup.py                                           |   2 +-
 tests/test_mockupdb.py                             |  54 +++---
 tox.ini                                            |  18 --
 21 files changed, 343 insertions(+), 563 deletions(-)

diff --cc debian/.git-dpm
index 7b449ae,0000000..9f156a1
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
- 611275d75e0b4b53528263da74473b63a8a5bc01
- 611275d75e0b4b53528263da74473b63a8a5bc01
- d0ec7e392d12c77e3c756a71312c09d98df031d1
++c7c00506a50764bf3947fa6ce458de7d1c3209f8
++c7c00506a50764bf3947fa6ce458de7d1c3209f8
++d6f07f2f2fdbefd39786177726b936c44e53d050
 +d6f07f2f2fdbefd39786177726b936c44e53d050
 +python-mockupdb_1.2.1.orig.tar.gz
 +0b3ee2d39fb218d42253016e0d3e50a3b3298e1a
 +60530
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Don-t-require-pymongo-for-tests.patch
index a4c7d1f,0000000..d286ef4
mode 100644,000000..100644
--- a/debian/patches/0001-Don-t-require-pymongo-for-tests.patch
+++ b/debian/patches/0001-Don-t-require-pymongo-for-tests.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 611275d75e0b4b53528263da74473b63a8a5bc01 Mon Sep 17 00:00:00 2001
++From c7c00506a50764bf3947fa6ce458de7d1c3209f8 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
++index f71ba0a..5d09ae4 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')

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