[Python-modules-commits] [pytest-qt] 02/07: Merge tag 'upstream/2.2.0'

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository pytest-qt.

commit 86230c35ae7190cf20f6890c468683d36f11e9a6
Merge: a66fe10 9334eb3
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Sep 19 22:20:22 2017 +0200

    Merge tag 'upstream/2.2.0'
    
    Upstream version 2.2.0
    
    # gpg: Signature made Tue 19 Sep 2017 22:20:22 CEST
    # gpg:                using RSA key F3DB8E7525060E1BDB84C20D6A990FB3DDEB910A
    # gpg:                issuer "ghisvail at gmail.com"
    # gpg: Good signature from "Ghislain Antony Vaillant <ghisvail at gmail.com>" [ultimate]

 .pydevproject                  |  1 +
 .travis.yml                    | 50 ++++++++++++------------
 CHANGELOG.rst                  |  8 ++++
 PKG-INFO                       | 11 ++++--
 README.rst                     |  9 +++--
 appveyor.yml                   | 78 +++++++++++++++++++++++++++----------
 docs/intro.rst                 |  5 ++-
 pytest_qt.egg-info/PKG-INFO    | 11 ++++--
 pytest_qt.egg-info/SOURCES.txt |  1 -
 pytestqt/_version.py           |  2 +-
 pytestqt/qt_compat.py          | 57 +++++++++++++++++++--------
 pytestqt/qtbot.py              |  2 +-
 scripts/install-qt.py          | 88 ------------------------------------------
 tests/test_basics.py           |  4 +-
 tests/test_logging.py          |  2 +
 tests/test_qtest_proxies.py    |  4 +-
 tests/test_wait_signal.py      | 16 ++++----
 17 files changed, 169 insertions(+), 180 deletions(-)

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