[Python-modules-commits] [python-requests-cache] 04/07: 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 040c86fdafc0a6818424b75ade170e17b9a0e7f3
Merge: d3ecafd ec99de0
Author: Sandro Tosi <morph at debian.org>
Date:   Mon Apr 25 22:25:57 2016 +0100

    merge patched into master

 HISTORY.rst                                        |  11 ++
 PKG-INFO                                           |  19 +++-
 README.rst                                         |   6 +-
 debian/.git-dpm                                    |   6 +-
 .../patches/tests_dont_import_toplevel_dir.patch   |   6 +-
 docs/index.rst                                     |   3 +-
 docs/make.bat                                      |   0
 docs/user_guide.rst                                |  43 ++++----
 requests_cache.egg-info/PKG-INFO                   |  19 +++-
 requests_cache.egg-info/SOURCES.txt                |   1 +
 requests_cache/__init__.py                         |   2 +-
 requests_cache/backends/__init__.py                |  19 +++-
 requests_cache/backends/base.py                    |  50 ++++++++-
 requests_cache/compat.py                           |   4 +-
 requests_cache/core.py                             |  30 ++++--
 setup.cfg                                          |   3 +
 setup.py                                           |   2 +-
 tests/test_cache.py                                | 112 +++++++++++++++++++++
 tests/test_monkey_patch.py                         |  14 +++
 19 files changed, 294 insertions(+), 56 deletions(-)

diff --cc debian/.git-dpm
index 8430bd0,0000000..e69a527
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
- b917cb44ebfaef61285c52d5f386f27cc4470fd7
- b917cb44ebfaef61285c52d5f386f27cc4470fd7
- 28c86001c1c741c25e3ba8108a2a3914e40a0e85
++ec99de0ad75323054d1091aee55feed57ad5a4b0
++ec99de0ad75323054d1091aee55feed57ad5a4b0
++b7bf9ae0ce33f9ae11e559273f95ac3364541cd8
 +b7bf9ae0ce33f9ae11e559273f95ac3364541cd8
 +python-requests-cache_0.4.12.orig.tar.gz
 +ad33b0d5d32424f7f4598b0ac9980e504feb4340
 +30218
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/tests_dont_import_toplevel_dir.patch
index 8bd6b44,0000000..7f4fe12
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 b917cb44ebfaef61285c52d5f386f27cc4470fd7 Mon Sep 17 00:00:00 2001
++From ec99de0ad75323054d1091aee55feed57ad5a4b0 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 56a2858..e2a679a 100644
++index 31dd671..8198d46 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 f944014..26ec87b 100644
++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