[Python-modules-commits] [python-qtpy] 02/04: Merge tag 'upstream/1.1.2'

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository python-qtpy.

commit 0a7ae8f1c212ada3464aece12a56104b21117d67
Merge: c370069 3dc0eef
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Aug 10 10:45:25 2016 +0100

    Merge tag 'upstream/1.1.2'
    
    Upstream version 1.1.2
    
    # gpg: Signature made Wed 10 Aug 2016 10:45:22 BST using RSA key ID DDEB910A
    # gpg: Good signature from "Ghislain Antony Vaillant <ghisvail at gmail.com>"
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: 1282 871F 5C7F 0CB6 BBA1  0BD9 A930 D81A 46EC 4F9B
    #      Subkey fingerprint: F3DB 8E75 2506 0E1B DB84  C20D 6A99 0FB3 DDEB 910A

 .coveralls.yml                                |  3 +++
 .gitignore                                    |  2 +-
 .travis.yml                                   | 27 ++++++++++++++--------
 CHANGELOG.md                                  | 20 ++++++++++++++++
 README.md                                     | 19 ++++++++++++++-
 appveyor.yml                                  | 33 +++++++++++++++++----------
 circle.yml                                    | 33 +++++++++++++++++++++++++++
 conda.recipe/meta.yaml                        | 11 ++++-----
 qtpy/QtCore.py                                |  8 +++++++
 qtpy/QtWidgets.py                             |  2 ++
 qtpy/__init__.py                              |  2 +-
 qtpy/_version.py                              |  2 +-
 {tests => qtpy/tests}/conftest.py             |  0
 qtpy/tests/runtests.py                        | 26 +++++++++++++++++++++
 {tests => qtpy/tests}/test.ui                 |  0
 {tests => qtpy/tests}/test_custom.ui          |  0
 {tests => qtpy/tests}/test_main.py            |  0
 {tests => qtpy/tests}/test_patch_qcombobox.py |  1 +
 {tests => qtpy/tests}/test_uic.py             |  0
 tests/__init__.py                             |  0
 20 files changed, 158 insertions(+), 31 deletions(-)

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