[Python-modules-commits] [kombu] 04/08: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Mon Oct 12 10:45:24 UTC 2015
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to annotated tag debian/3.0.27-1
in repository kombu.
commit d09f8c22fa5b88849181cd58543021330a21b849
Merge: 5da1d83 fe957b2
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Sun Oct 11 12:33:51 2015 +0200
merge patched into master
AUTHORS | 2 +
Changelog | 51 +++-
PKG-INFO | 4 +-
README.rst | 2 +-
debian/.git-dpm | 6 +-
debian/patches/fix_mock_tests.patch | 92 -------
debian/patches/fix_test_pymongo_uri_options.patch | 58 -----
debian/patches/remove_logo.patch | 6 +-
debian/patches/series | 2 -
docs/_ext/applyxrefs.py | 2 -
docs/changelog.rst | 51 +++-
docs/conf.py | 4 +-
docs/introduction.rst | 2 +-
docs/userguide/serialization.rst | 4 +-
examples/experimental/async_consume.py | 2 +-
extra/release/bump_version.py | 5 +-
funtests/tests/test_SLMQ.py | 4 +-
funtests/tests/test_SQS.py | 5 +-
funtests/tests/test_qpid.py | 3 +-
kombu.egg-info/PKG-INFO | 4 +-
kombu.egg-info/requires.txt | 2 +-
kombu/__init__.py | 10 +-
kombu/abstract.py | 7 +-
kombu/clocks.py | 12 +-
kombu/five.py | 2 +-
kombu/messaging.py | 6 +-
kombu/mixins.py | 14 +-
kombu/serialization.py | 4 +-
kombu/tests/test_messaging.py | 10 +
kombu/tests/transport/test_SQS.py | 22 +-
kombu/tests/transport/test_mongodb.py | 20 +-
kombu/tests/transport/test_qpid.py | 187 +++++++++------
kombu/tests/transport/test_redis.py | 16 +-
kombu/tests/utils/test_utils.py | 10 +-
kombu/transport/amqplib.py | 33 ++-
kombu/transport/base.py | 4 +-
kombu/transport/django/__init__.py | 18 +-
kombu/transport/django/migrations/0001_initial.py | 114 ++++-----
kombu/transport/mongodb.py | 5 -
kombu/transport/qpid.py | 280 +++++++++++++---------
kombu/transport/redis.py | 21 +-
kombu/utils/amq_manager.py | 4 +-
kombu/utils/eventio.py | 23 +-
requirements/default.txt | 2 +-
setup.py | 16 +-
45 files changed, 621 insertions(+), 530 deletions(-)
diff --cc debian/.git-dpm
index a415cff,0000000..e75e78a
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
- 7c7ea10d5b48ea5123153dfb294a7084c437716e
- 7c7ea10d5b48ea5123153dfb294a7084c437716e
- 02b93be02502cb52c71acc910cf62003dc0f3d26
++fe957b28f3b25e8cd88640ecc84ca27e6289feb9
++fe957b28f3b25e8cd88640ecc84ca27e6289feb9
++b8b31aa3b85e7eee198c73f2db20fd8cf714a484
+b8b31aa3b85e7eee198c73f2db20fd8cf714a484
+kombu_3.0.27.orig.tar.gz
+0be9e8da61de5188918301eef9c302fb43ba937e
+376721
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/remove_logo.patch
index f9066dd,0000000..6e0cbf6
mode 100644,000000..100644
--- a/debian/patches/remove_logo.patch
+++ b/debian/patches/remove_logo.patch
@@@ -1,40 -1,0 +1,40 @@@
- From 4ad4251e3106c2edb5a693aba1a7924968a1e940 Mon Sep 17 00:00:00 2001
++From fe957b28f3b25e8cd88640ecc84ca27e6289feb9 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 09:29:19 -0700
+Subject: Remove github-hosted logo from documentation
+
+Last-Update: 2014-04-10
+Forwarded: not-needed
+
+Patch-Name: remove_logo.patch
+---
+ docs/conf.py | 4 ++--
+ docs/introduction.rst | 4 ----
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
- index a61b832..be0fb72 100644
++index 7904861..5e55d81 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -69,7 +69,7 @@ latex_documents = [
+ html_theme = "celery"
+ html_theme_path = ["_theme"]
+ html_sidebars = {
+- 'index': ['sidebarintro.html', 'sourcelink.html', 'searchbox.html'],
+- '**': ['sidebarlogo.html', 'localtoc.html', 'relations.html',
++ 'index': ['sourcelink.html', 'searchbox.html'],
++ '**': ['localtoc.html', 'relations.html',
+ 'sourcelink.html', 'searchbox.html'],
+ }
+diff --git a/docs/introduction.rst b/docs/introduction.rst
- index 97fde73..2ed57e1 100644
++index acab4b6..e3d606f 100644
+--- a/docs/introduction.rst
++++ b/docs/introduction.rst
+@@ -324,7 +324,3 @@ License
+
+ This software is licensed under the `New BSD License`. See the `LICENSE`
+ file in the top distribution directory for the full license text.
+-
+-.. image:: https://d2weczhvl823v0.cloudfront.net/celery/kombu/trend.png
+- :alt: Bitdeli badge
+- :target: https://bitdeli.com/free
diff --cc debian/patches/series
index 718d1ee,0000000..f9a10c3
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,1 @@@
- fix_mock_tests.patch
+remove_logo.patch
- fix_test_pymongo_uri_options.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/kombu.git
More information about the Python-modules-commits
mailing list