[Python-modules-commits] [pytest-catchlog] 02/08: Merge tag 'upstream/1.2.2+git20170915' into debian/master

[Gianfranco Costamagna]

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

locutusofborg pushed a commit to branch debian/master
in repository pytest-catchlog.

commit d5257db6f901475392357dd89445c5669e02c265
Merge: c8258a9 23e29cf
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Sep 15 18:42:01 2017 +0200

    Merge tag 'upstream/1.2.2+git20170915' into debian/master
    
    Upstream version 1.2.2+git20170915
    
    # gpg: Signature made ven 15 set 2017 18:42:01 CEST
    # gpg:                using RSA key F34F09744E9F5DD9
    # gpg: Good signature from "Gianfranco Costamagna <locutusofborg at debian.org>" [ultimate]
    # gpg:                 aka "Gianfranco Costamagna <costamagnagianfranco at yahoo.it>" [ultimate]
    # gpg:                 aka "[jpeg image of size 23040]" [ultimate]

 .gitignore                            |   1 +
 .travis.yml                           |  28 ++-
 MANIFEST.in                           |   2 +-
 Makefile                              |   4 +-
 README.rst                            |  69 +++++-
 pytest_catchlog.py                    | 313 --------------------------
 pytest_catchlog/__init__.py           |   2 +
 pytest_catchlog/common.py             |  66 ++++++
 pytest_catchlog/fixture.py            | 154 +++++++++++++
 pytest_catchlog/plugin.py             | 264 ++++++++++++++++++++++
 setup.py                              |   9 +-
 tasks.py                              |   2 +-
 test_pytest_catchlog.py               | 300 -------------------------
 tests/conftest.py                     |  33 +++
 tests/perf/__init__.py                |   0
 tests/perf/bench/conftest.py          |  17 ++
 tests/perf/bench/pytest.ini           |  11 +
 tests/perf/bench/test_log.py          |  11 +
 tests/perf/bench/test_runtest_hook.py |  47 ++++
 tests/perf/conftest.py                | 224 +++++++++++++++++++
 tests/perf/data.py                    |  85 ++++++++
 tests/perf/plot.py                    |  85 ++++++++
 tests/perf/test_perf_run.py           |  98 +++++++++
 tests/test_compat.py                  |  80 +++++++
 tests/test_fixture.py                 |  99 +++++++++
 tests/test_reporting.py               | 398 ++++++++++++++++++++++++++++++++++
 tox.ini                               |  14 +-
 27 files changed, 1779 insertions(+), 637 deletions(-)

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