[Python-modules-commits] [python-flaky] 01/02: Merge branch 'master' into jessie-backports

[Tristan Seligmann]

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

mithrandi pushed a commit to tag debian/3.3.0-1_bpo8+1
in repository python-flaky.

commit 4adf04d48db905d5a02c032352e82267e43be7c6
Merge: e8220e8 78ab122
Author: Tristan Seligmann <mithrandi at mithrandi.net>
Date:   Sat Jun 10 17:24:51 2017 +0200

    Merge branch 'master' into jessie-backports

 AUTHORS.rst                              |   1 +
 HISTORY.rst                              |  27 ++++++
 MANIFEST.in                              |   1 +
 debian/.git-dpm                          |  14 ++--
 debian/changelog                         |  21 +++++
 debian/control                           |   5 +-
 flaky/_flaky_plugin.py                   |  41 +++++++--
 flaky/flaky_nose_plugin.py               |  31 ++-----
 flaky/flaky_pytest_plugin.py             | 139 ++++++++++++++-----------------
 setup.cfg                                |   5 ++
 setup.py                                 |  32 ++++++-
 test/test_nose/test_flaky_nose_plugin.py |   4 +-
 test/test_pytest/test_pytest_example.py  |   8 +-
 tox.ini                                  |   1 +
 14 files changed, 207 insertions(+), 123 deletions(-)

diff --cc debian/changelog
index b525747,bbb22fd..b41c447
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,24 +1,32 @@@
+ python-flaky (3.3.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Bump Standards-Version to 3.9.8 (no changes).
+ 
+  -- Tristan Seligmann <mithrandi at debian.org>  Sat, 27 Aug 2016 13:22:28 +0200
+ 
+ python-flaky (3.1.1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Bump Standards-Version to 3.9.7 (no changes).
+ 
+  -- Tristan Seligmann <mithrandi at debian.org>  Wed, 06 Apr 2016 23:02:32 +0200
+ 
+ python-flaky (3.1.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Drop XB-Python-Egg-Name.
+ 
+  -- Tristan Seligmann <mithrandi at debian.org>  Wed, 17 Feb 2016 18:02:43 +0200
+ 
 +python-flaky (3.0.2-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * Version pytest dependency correctly.
 +  * Fix test invocation for older pybuild.
 +
 + -- Tristan Seligmann <mithrandi at debian.org>  Sat, 30 Jan 2016 05:04:05 +0200
 +
  python-flaky (3.0.2-1) unstable; urgency=medium
  
    * New upstream version.
diff --cc debian/control
index 80c9cde,6aacd60..00b44a5
--- a/debian/control
+++ b/debian/control
@@@ -18,9 -18,9 +18,9 @@@ Build-Depends
   python3-genty,
   python3-mock,
   python3-nose,
 - python3-pytest,
 + python3-pytest (>= 2.8.0),
   python3-setuptools,
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.8
  Homepage: https://github.com/box/flaky
  
  Package: python-flaky

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