[Python-modules-commits] [python-pytest-benchmark] 04/04: Merge tag 'upstream/3.1.0a2'

[Hugo Lefeuvre]

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

hle pushed a commit to branch master
in repository python-pytest-benchmark.

commit 995c15a0647c02ea9489c46bf469550aae48bb47
Merge: d85aa13 af97190
Author: Hugo Lefeuvre <hle at debian.org>
Date:   Wed Apr 12 13:01:44 2017 +0200

    Merge tag 'upstream/3.1.0a2'
    
    Upstream version 3.1.0a2

 .bumpversion.cfg                  |    4 +-
 .cookiecutterrc                   |    8 +-
 .travis.yml                       |  893 ++++++++++++--------------
 AUTHORS.rst                       |    2 +
 CHANGELOG.rst                     |   19 +
 LICENSE                           |    2 +-
 README.rst                        |   19 +-
 appveyor.yml                      | 1264 ++++++++++++++-----------------------
 ci/appveyor-bootstrap.py          |   27 +-
 ci/templates/.travis.yml          |   23 +-
 ci/templates/appveyor.yml         |    2 +-
 ci/templates/tox.ini              |   22 +-
 docs/conf.py                      |    4 +-
 docs/usage.rst                    |   13 +
 setup.cfg                         |    1 +
 setup.py                          |    7 +-
 src/pytest_benchmark/__init__.py  |    2 +-
 src/pytest_benchmark/cli.py       |    8 +-
 src/pytest_benchmark/fixture.py   |    1 +
 src/pytest_benchmark/histogram.py |    5 +-
 src/pytest_benchmark/logger.py    |    4 +-
 src/pytest_benchmark/plugin.py    |   30 +-
 src/pytest_benchmark/session.py   |    8 +-
 src/pytest_benchmark/stats.py     |    2 +
 src/pytest_benchmark/table.py     |    1 -
 src/pytest_benchmark/utils.py     |  129 +++-
 tests/test_benchmark.py           |   42 +-
 tests/test_cli.py                 |  194 ++++++
 tests/test_storage.py             |    1 +
 tests/test_utils.py               |   96 ++-
 tox.ini                           |  302 +--------
 31 files changed, 1460 insertions(+), 1675 deletions(-)

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