[Python-modules-commits] [celery-haystack] 09/10: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Sat Jan 2 13:02:07 UTC 2016
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository celery-haystack.
commit 12812ea12fa14a891f49709aece422a3c6aa5337
Merge: caa1337 410c322
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Sat Jan 2 13:45:47 2016 +0100
merge patched into master
.gitignore | 11 -
.travis.yml | 48 -----
PKG-INFO | 117 +++++++++++
README.rst | 50 +----
celery_haystack.egg-info/PKG-INFO | 117 +++++++++++
celery_haystack.egg-info/SOURCES.txt | 25 +++
celery_haystack.egg-info/dependency_links.txt | 1 +
celery_haystack.egg-info/not-zip-safe | 1 +
celery_haystack.egg-info/requires.txt | 1 +
celery_haystack.egg-info/top_level.txt | 1 +
celery_haystack/__init__.py | 2 +-
celery_haystack/conf.py | 4 +-
celery_haystack/indexes.py | 50 +----
celery_haystack/tasks.py | 38 +---
celery_haystack/test_settings.py | 23 +--
celery_haystack/tests/search_indexes.py | 14 +-
celery_haystack/tests/tests.py | 4 +-
celery_haystack/utils.py | 25 ++-
debian/.git-dpm | 6 +-
...he-recommended-minimum-MIDDLEWARE_CLASSES.patch | 6 +-
debian/patches/0002-Django-1.9-support.patch | 41 ----
debian/patches/series | 1 -
docs/Makefile | 130 ------------
docs/changelog.rst | 167 ---------------
docs/conf.py | 228 ---------------------
docs/index.rst | 8 -
docs/make.bat | 170 ---------------
requirements/v1.txt | 7 -
requirements/v2.txt | 7 -
setup.cfg | 58 +++---
30 files changed, 346 insertions(+), 1015 deletions(-)
diff --cc debian/.git-dpm
index 30b285a,0000000..2df0f21
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
- 46d0f215dbb1f79fb6de0f6568c3fa3f4203b0e0
- 46d0f215dbb1f79fb6de0f6568c3fa3f4203b0e0
- 4cc4716890b59d0e1b764ea7051522ed2f62ff49
++410c322761b0ea12391a56d587cd5cf634ade205
++410c322761b0ea12391a56d587cd5cf634ade205
++8a058bc8b48df136b3583fba8df9d246ab395c2b
+8a058bc8b48df136b3583fba8df9d246ab395c2b
+celery-haystack_0.10.orig.tar.gz
+5c227a82c052ea84b05b12da0c9f5f3aa4d8e85e
+8299
diff --cc debian/patches/0001-Add-the-recommended-minimum-MIDDLEWARE_CLASSES.patch
index 927d9b8,0000000..b303372
mode 100644,000000..100644
--- a/debian/patches/0001-Add-the-recommended-minimum-MIDDLEWARE_CLASSES.patch
+++ b/debian/patches/0001-Add-the-recommended-minimum-MIDDLEWARE_CLASSES.patch
@@@ -1,27 -1,0 +1,27 @@@
- From ed5a08bde5bfbf8408f994c5ca0e9e6b3d90849f Mon Sep 17 00:00:00 2001
++From 410c322761b0ea12391a56d587cd5cf634ade205 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Fri, 25 Dec 2015 15:02:58 +0100
+Subject: Add the recommended minimum MIDDLEWARE_CLASSES.
+
+ This silences warnings while running the tests.
+Forwarded: no
+Last-Update: 2015-08-11
+---
+ celery_haystack/test_settings.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/celery_haystack/test_settings.py b/celery_haystack/test_settings.py
- index 8dbfb62..dccdf9a 100644
++index def8536..b14c0d7 100644
+--- a/celery_haystack/test_settings.py
++++ b/celery_haystack/test_settings.py
- @@ -28,6 +28,10 @@ DATABASES = {
++@@ -26,6 +26,10 @@ DATABASES = {
+
+ SECRET_KEY = 'really-not-secret'
+
++MIDDLEWARE_CLASSES = (
++ 'django.middleware.common.CommonMiddleware',
++)
++
+ BROKER_TRANSPORT = "memory"
+ CELERY_ALWAYS_EAGER = True
+ CELERY_IGNORE_RESULT = True
diff --cc debian/patches/series
index c95547f,0000000..d68b539
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
+0001-Add-the-recommended-minimum-MIDDLEWARE_CLASSES.patch
- 0002-Django-1.9-support.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/celery-haystack.git
More information about the Python-modules-commits
mailing list