[Python-modules-commits] [python-flaky] 02/03: record new upstream branch created by importing python-flaky_3.0.2.orig.tar.gz and merge it

[Tristan Seligmann]

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

mithrandi pushed a commit to branch master
in repository python-flaky.

commit b915cb41ec9f6d937435330f3d77285e18903e25
Merge: cbcd6f6 0c2dd2c
Author: Tristan Seligmann <mithrandi at mithrandi.net>
Date:   Wed Jan 20 01:35:32 2016 +0200

    record new upstream branch created by importing python-flaky_3.0.2.orig.tar.gz and merge it

 .pylintrc                                          |  22 +-
 HISTORY.rst                                        |  25 ++
 README.rst                                         |  14 +
 debian/.git-dpm                                    |  14 +-
 flaky.iml                                          |   1 +
 flaky/_flaky_plugin.py                             | 231 +++++++-----
 flaky/defaults.py                                  |   1 +
 flaky/flaky_decorator.py                           |   1 +
 flaky/flaky_nose_plugin.py                         |  12 +-
 flaky/flaky_pytest_plugin.py                       | 412 ++++++++++-----------
 setup.py                                           |   2 +-
 test/test_flaky_plugin.py                          |   5 +-
 test/test_multiprocess_string_io.py                |   3 +-
 test/test_nose/__init__.py                         |   3 +
 test/{ => test_nose}/test_flaky_nose_plugin.py     |   0
 test/{ => test_nose}/test_nose_example.py          |   0
 test/{ => test_nose}/test_nose_options_example.py  |   0
 test/test_pytest/__init__.py                       |   3 +
 .../pytest_generate_example/__init__.py            |   0
 .../pytest_generate_example/conftest.py            |   3 +
 .../test_pytest_generate_example.py                |   6 +-
 test/{ => test_pytest}/test_flaky_pytest_plugin.py |  45 +--
 test/{ => test_pytest}/test_pytest_example.py      |  60 ++-
 .../test_pytest_options_example.py                 |  14 +-
 test/test_pytest/test_pytester_plugin.py           |  20 +
 test/test_utils.py                                 |   4 +-
 tox.ini                                            |  22 +-
 27 files changed, 527 insertions(+), 396 deletions(-)

diff --cc debian/.git-dpm
index 5e45871,0000000..fcfde46
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
- 9ab554730a34ba8665eca2903fe13c05fda3a5f8
- 9ab554730a34ba8665eca2903fe13c05fda3a5f8
- 9ab554730a34ba8665eca2903fe13c05fda3a5f8
- 9ab554730a34ba8665eca2903fe13c05fda3a5f8
- python-flaky_2.4.1.orig.tar.gz
- be486034d7ee5e43fbdc6b5d23422e8376943c4f
- 33176
++0c2dd2ce9a80825c775fe19c2c40f59e5130b1c7
++0c2dd2ce9a80825c775fe19c2c40f59e5130b1c7
++0c2dd2ce9a80825c775fe19c2c40f59e5130b1c7
++0c2dd2ce9a80825c775fe19c2c40f59e5130b1c7
++python-flaky_3.0.2.orig.tar.gz
++cc451cdde17e07ac752762b3f3d58a0c8057e1cf
++34181
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

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