[Python-modules-commits] [python-requests-cache] 04/08: merge patched into master

[Sandro Tosi]

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

morph pushed a commit to branch master
in repository python-requests-cache.

commit b92ebc9b8d221a76175c36ee97735e3ddb7894eb
Merge: 8483f21 565be33
Author: Sandro Tosi <morph at debian.org>
Date:   Thu Jan 5 13:55:37 2017 -0500

    merge patched into master

 HISTORY.rst                                        |   6 +
 PKG-INFO                                           | 434 +++++++++++----------
 README.rst                                         |   2 +-
 debian/.git-dpm                                    |   6 +-
 .../patches/tests_dont_import_toplevel_dir.patch   |   4 +-
 docs/user_guide.rst                                |   4 +-
 history_issue.py                                   |  27 --
 howdoi_issue.py                                    |  19 -
 requests_cache.egg-info/PKG-INFO                   | 434 +++++++++++----------
 requests_cache.egg-info/SOURCES.txt                |   2 -
 requests_cache/__init__.py                         |   2 +-
 requests_cache/backends/base.py                    |   9 +-
 requests_cache/backends/storage/mongodict.py       |  18 +-
 setup.cfg                                          |  16 +-
 setup.py                                           |   2 +-
 tests/test_cache.py                                |  19 +-
 16 files changed, 499 insertions(+), 505 deletions(-)

diff --cc debian/.git-dpm
index 7308ed1,0000000..8f4573f
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
- ec99de0ad75323054d1091aee55feed57ad5a4b0
- ec99de0ad75323054d1091aee55feed57ad5a4b0
- b7bf9ae0ce33f9ae11e559273f95ac3364541cd8
++565be33084677c557e1af816e423a9e2d63ddfe7
++565be33084677c557e1af816e423a9e2d63ddfe7
++115a2067424052e23f7f905f1047723191a321b9
 +115a2067424052e23f7f905f1047723191a321b9
 +python-requests-cache_0.4.13.orig.tar.gz
 +4ccf9e23886ebf960befb7c28b32e8745da5bc1e
 +29342
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/tests_dont_import_toplevel_dir.patch
index 7f4fe12,0000000..217c30f
mode 100644,000000..100644
--- a/debian/patches/tests_dont_import_toplevel_dir.patch
+++ b/debian/patches/tests_dont_import_toplevel_dir.patch
@@@ -1,103 -1,0 +1,103 @@@
- From ec99de0ad75323054d1091aee55feed57ad5a4b0 Mon Sep 17 00:00:00 2001
++From 565be33084677c557e1af816e423a9e2d63ddfe7 Mon Sep 17 00:00:00 2001
 +From: Sandro Tosi <morph at debian.org>
 +Date: Thu, 8 Oct 2015 13:02:24 -0700
 +Subject: Don't force usage of toplevel dir to run tests
 +
 +Origin: vendor
 +Forwarded: no
 +Last-Update: 2015-04-11
 +Patch-Name: tests_dont_import_toplevel_dir.patch
 +---
 + tests/test_cache.py         | 1 -
 + tests/test_custom_dict.py   | 1 -
 + tests/test_dbdict.py        | 1 -
 + tests/test_mongodict.py     | 1 -
 + tests/test_monkey_patch.py  | 1 -
 + tests/test_redisdict.py     | 1 -
 + tests/test_thread_safety.py | 1 -
 + 7 files changed, 7 deletions(-)
 +
 +diff --git a/tests/test_cache.py b/tests/test_cache.py
- index 31dd671..8198d46 100644
++index a647895..24a6e05 100644
 +--- a/tests/test_cache.py
 ++++ b/tests/test_cache.py
 +@@ -2,7 +2,6 @@
 + # -*- coding: utf-8 -*-
 + # Path hack
 + import os, sys
 +-sys.path.insert(0, os.path.abspath('..'))
 + 
 + try:
 +     import unittest2 as unittest
 +diff --git a/tests/test_custom_dict.py b/tests/test_custom_dict.py
 +index f146d79..0af3d21 100644
 +--- a/tests/test_custom_dict.py
 ++++ b/tests/test_custom_dict.py
 +@@ -2,7 +2,6 @@
 + # -*- coding: utf-8 -*-
 + # Path hack
 + import os, sys
 +-sys.path.insert(0, os.path.abspath('..'))
 + 
 + from requests_cache.backends.storage.dbdict import DbDict, DbPickleDict
 + 
 +diff --git a/tests/test_dbdict.py b/tests/test_dbdict.py
 +index 04987ee..8ce7af9 100644
 +--- a/tests/test_dbdict.py
 ++++ b/tests/test_dbdict.py
 +@@ -2,7 +2,6 @@
 + # -*- coding: utf-8 -*-
 + # Path hack
 + import os, sys
 +-sys.path.insert(0, os.path.abspath('..'))
 + 
 + try:
 +     import unittest2 as unittest
 +diff --git a/tests/test_mongodict.py b/tests/test_mongodict.py
 +index bd7f49e..67aafb7 100644
 +--- a/tests/test_mongodict.py
 ++++ b/tests/test_mongodict.py
 +@@ -2,7 +2,6 @@
 + # -*- coding: utf-8 -*-
 + # Path hack
 + import os, sys
 +-sys.path.insert(0, os.path.abspath('..'))
 + 
 + try:
 +     import unittest2 as unittest
 +diff --git a/tests/test_monkey_patch.py b/tests/test_monkey_patch.py
 +index 596544b..f7167cf 100644
 +--- a/tests/test_monkey_patch.py
 ++++ b/tests/test_monkey_patch.py
 +@@ -2,7 +2,6 @@
 + # -*- coding: utf-8 -*-
 + # Path hack
 + import os, sys
 +-sys.path.insert(0, os.path.abspath('..'))
 + 
 + try:
 +     import unittest2 as unittest
 +diff --git a/tests/test_redisdict.py b/tests/test_redisdict.py
 +index 6dce788..a8013cb 100644
 +--- a/tests/test_redisdict.py
 ++++ b/tests/test_redisdict.py
 +@@ -2,7 +2,6 @@
 + # -*- coding: utf-8 -*-
 + # Path hack
 + import os, sys
 +-sys.path.insert(0, os.path.abspath('..'))
 + 
 + try:
 +     import unittest2 as unittest
 +diff --git a/tests/test_thread_safety.py b/tests/test_thread_safety.py
 +index 3b90e67..0b9f226 100644
 +--- a/tests/test_thread_safety.py
 ++++ b/tests/test_thread_safety.py
 +@@ -2,7 +2,6 @@
 + # -*- coding: utf-8 -*-
 + # Path hack
 + import os, sys
 +-sys.path.insert(0, os.path.abspath('..'))
 + 
 + try:
 +     import unittest2 as unittest

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