[Python-modules-commits] [python-qtpy] 02/08: Merge tag 'upstream/1.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 python-qtpy.

commit 1f351901bd7ed2fcb2a7338bd79e1d54909ca609
Merge: 722c7b5 99b1c37
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Mar 24 09:45:30 2016 +0000

    Merge tag 'upstream/1.0'
    
    Upstream version 1.0
    
    # gpg: Signature made Thu 24 Mar 2016 09:45:25 GMT 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

 .travis.yml                   |  2 +-
 CHANGELOG.md                  |  5 +++++
 CHANGELOG.rst                 |  0
 CONTRIBUTING.rst              |  0
 README.md                     | 44 ++++++++++++++++++++++++-------------------
 RELEASE.md                    | 30 ++++++++++++-----------------
 conda.recipe/meta.yaml        |  3 ++-
 docs/index.md                 |  0
 qtpy/QtWebEngineWidgets.py    | 40 +++++++++++++++++++++++++++++++++++++++
 qtpy/QtWebKit.py              | 30 -----------------------------
 qtpy/QtWidgets.py             | 10 ++++++++++
 qtpy/_version.py              |  2 +-
 qtpy/widgets/__init__.py      |  0
 tests/README.md               |  0
 tests/{travis.py => tests.py} |  3 ++-
 15 files changed, 98 insertions(+), 71 deletions(-)

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