[Python-modules-commits] [python-tenacity] 04/05: merge patched into master

[Ondrej Koblizek]

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

kobla-guest pushed a commit to branch master
in repository python-tenacity.

commit c9e58ea7be0c13fa127ed9f42be20b6d8afae41d
Merge: 864592b 264e63c
Author: Ondřej Kobližek <ondrej.koblizek at firma.seznam.cz>
Date:   Sat Aug 5 20:09:12 2017 -0400

    merge patched into master

 .gitignore                                         |   9 -
 .travis.yml                                        |   7 +-
 AUTHORS                                            |  27 ++
 ChangeLog                                          | 261 ++++++++++++++++++
 MANIFEST.in                                        |   1 -
 NOTICE                                             |  13 -
 PKG-INFO                                           | 301 +++++++++++++++++++++
 README.rst                                         | 283 ++++++++++++++++++-
 debian/.git-dpm                                    |   6 +-
 .../0001-Remove-privacy-breach-in-doc.patch        |  10 +-
 doc/source/index.rst                               | 129 +++++++--
 requirements.txt                                   |   2 +-
 setup.cfg                                          |  31 ++-
 tenacity.egg-info/PKG-INFO                         | 301 +++++++++++++++++++++
 tenacity.egg-info/SOURCES.txt                      |  30 ++
 tenacity.egg-info/dependency_links.txt             |   1 +
 tenacity.egg-info/not-zip-safe                     |   1 +
 tenacity.egg-info/pbr.json                         |   1 +
 tenacity.egg-info/requires.txt                     |   3 +
 tenacity.egg-info/top_level.txt                    |   1 +
 tenacity/__init__.py                               | 221 ++++++++++-----
 tenacity/after.py                                  |   8 +-
 tenacity/async.py                                  |  56 ++++
 tenacity/{after.py => nap.py}                      |  26 +-
 tenacity/retry.py                                  |  79 +++++-
 tenacity/stop.py                                   |  65 ++++-
 tenacity/tests/test_async.py                       |  53 ++++
 tenacity/tests/test_tenacity.py                    | 281 ++++++++++++++++++-
 tenacity/wait.py                                   |  78 +++++-
 tox.ini                                            |  16 +-
 30 files changed, 2098 insertions(+), 203 deletions(-)

diff --cc debian/.git-dpm
index 113cb4c,0000000..f622635
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
- b4b82a2219cbb0bad3f4e58c4d781bebb4b388d9
- b4b82a2219cbb0bad3f4e58c4d781bebb4b388d9
- 86ea9f408974b54a1437558b4c088db882970469
++264e63c16b0a98e9f426d31c28c83bbff3f9a110
++264e63c16b0a98e9f426d31c28c83bbff3f9a110
++09a438ca11c118b53dbc5c91a722b41710471fdb
 +09a438ca11c118b53dbc5c91a722b41710471fdb
 +python-tenacity_4.4.0.orig.tar.gz
 +e63de560c9dc06b0c9430190a8faffbfd020eeae
 +26133
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Remove-privacy-breach-in-doc.patch
index 66675d7,0000000..c455283
mode 100644,000000..100644
--- a/debian/patches/0001-Remove-privacy-breach-in-doc.patch
+++ b/debian/patches/0001-Remove-privacy-breach-in-doc.patch
@@@ -1,30 -1,0 +1,30 @@@
- From b4b82a2219cbb0bad3f4e58c4d781bebb4b388d9 Mon Sep 17 00:00:00 2001
++From 264e63c16b0a98e9f426d31c28c83bbff3f9a110 Mon Sep 17 00:00:00 2001
 +From: Thomas Goirand <zigo at debian.org>
 +Date: Fri, 4 Aug 2017 18:45:26 -0400
 +Subject: Remove privacy breach in doc
 +
 +Forwarded: not-needed
 +Last-Update: 2016-09-26
 +---
 + doc/source/index.rst | 9 ---------
 + 1 file changed, 9 deletions(-)
 +
 +diff --git a/doc/source/index.rst b/doc/source/index.rst
- index 0da12ba..67e34ab 100644
++index 497c577..a107fc6 100644
 +--- a/doc/source/index.rst
 ++++ b/doc/source/index.rst
 +@@ -1,14 +1,5 @@
 + Tenacity
 + ========
 +-.. image:: https://img.shields.io/pypi/v/tenacity.svg
 +-    :target: https://pypi.python.org/pypi/tenacity
 +-
 +-.. image:: https://img.shields.io/travis/jd/tenacity.svg
 +-    :target: https://travis-ci.org/jd/tenacity
 +-
- -.. image:: https://img.shields.io/pypi/dm/tenacity.svg
- -    :target: https://pypi.python.org/pypi/tenacity
++-.. image:: https://img.shields.io/badge/SayThanks.io-%E2%98%BC-1EAEDB.svg
++-    :target: https://saythanks.io/to/jd
 +-
 + Tenacity is an Apache 2.0 licensed general-purpose retrying library, written in
 + Python, to simplify the task of adding retry behavior to just about anything.
-  It originates from a fork of `Retrying`_
++ It originates from `a fork of retrying

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