[Python-modules-commits] [pytest-qt] 01/05: New upstream version 2.2.1
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Tue Oct 10 14:42:00 UTC 2017
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 8195066241e990ac73c8f91b8644778e368ff256
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Sun Oct 8 20:42:13 2017 +0100
New upstream version 2.2.1
---
.travis.yml | 14 +++++++++-----
CHANGELOG.rst | 10 ++++++++++
PKG-INFO | 4 +++-
appveyor.yml | 10 +++++++++-
pytest_qt.egg-info/PKG-INFO | 4 +++-
pytestqt/_version.py | 2 +-
pytestqt/modeltest.py | 4 ++--
setup.cfg | 1 -
setup.py | 1 +
9 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 8eb3266..de5ecea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ dist: trusty
env:
global:
# used by ci-helpers
- - CONDA_CHANNELS=conda-forge SETUP_XVFB=true DEPS="pytest tox coveralls"
+ - CONDA_CHANNELS=conda-forge SETUP_XVFB=true DEPS="pytest tox coveralls six"
matrix:
- PYTEST_QT_API=pyqt4 PYQT_PACKAGE="pyqt=4.*" PYTHON_VERSION=2.7
@@ -15,16 +15,20 @@ env:
- PYTEST_QT_API=pyqt4 PYQT_PACKAGE="pyqt=4.*" PYTHON_VERSION=3.4
- PYTEST_QT_API=pyqt4v2 PYQT_PACKAGE="pyqt=4.*" PYTHON_VERSION=3.4
- PYTEST_QT_API=pyside PYQT_PACKAGE="pyside=1.*" PYTHON_VERSION=3.4
- - PYTEST_QT_API=pyqt5 PYQT_PACKAGE="pyqt=5.*" PYTHON_VERSION=3.4
+
+ - PYTEST_QT_API=pyqt5 PYQT_PACKAGE="pyqt=5.*" PYTHON_VERSION=3.5
- PYTEST_QT_API=pyside2 PYQT_PACKAGE="pyside2=2.*" PYTHON_VERSION=3.5
+ - PYTEST_QT_API=pyqt5 PYQT_PACKAGE="pyqt=5.*" PYTHON_VERSION=3.6
+ - PYTEST_QT_API=pyside2 PYQT_PACKAGE="pyside2=2.*" PYTHON_VERSION=3.6
+
install:
- sudo apt-get update
# Xvfb / window manager
- sudo apt-get install -y xvfb herbstluftwm
- # Setup miniconda
+ # Setup miniconda
- git clone --depth 1 git://github.com/astropy/ci-helpers.git
- CONDA_DEPENDENCIES="${DEPS} ${PYQT_PACKAGE}" source ci-helpers/travis/setup_conda.sh
- source activate test && pip install -e .
@@ -37,8 +41,8 @@ before_script:
script:
- source activate test && catchsegv coverage run --source=pytestqt -m pytest -v tests
# for some reason tox doesn't get installed with a u+x flag
- - |
- chmod u+x /home/travis/miniconda/envs/test/bin/tox
+ - |
+ chmod u+x /home/travis/miniconda/envs/test/bin/tox
/home/travis/miniconda/envs/test/bin/tox -e lint
after_success:
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 4ea6da1..b772c9e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,13 @@
+2.2.1
+-----
+
+- ``modeltester`` now accepts ``QBrush`` for ``BackgroundColorRole`` and ``TextColorRole`` (`#189`_).
+ Thanks `@p0las`_ for the PR.
+
+.. _#189: https://github.com/pytest-dev/pytest-qt/issues/189
+.. _ at p0las: https://github.com/p0las
+
+
2.2.0
-----
diff --git a/PKG-INFO b/PKG-INFO
index 45ae18f..554410c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,11 +1,12 @@
Metadata-Version: 1.1
Name: pytest-qt
-Version: 2.2.0
+Version: 2.2.1
Summary: pytest support for PyQt and PySide applications
Home-page: http://github.com/pytest-dev/pytest-qt
Author: Bruno Oliveira
Author-email: nicoddemus at gmail.com
License: MIT
+Description-Content-Type: UNKNOWN
Description: =========
pytest-qt
=========
@@ -192,6 +193,7 @@ Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
Classifier: Topic :: Desktop Environment :: Window Managers
Classifier: Topic :: Software Development :: Quality Assurance
Classifier: Topic :: Software Development :: Testing
diff --git a/appveyor.yml b/appveyor.yml
index cd86073..ec9b92f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -30,13 +30,21 @@ environment:
- PYTHON_VERSION: "3.4"
PYTEST_QT_API: "pyside"
CONDA_DEPENDENCIES: "pytest pyside=1.*"
- - PYTHON_VERSION: "3.4"
+
+ - PYTHON_VERSION: "3.5"
PYTEST_QT_API: "pyqt5"
CONDA_DEPENDENCIES: "pytest pyqt=5.*"
- PYTHON_VERSION: "3.5"
PYTEST_QT_API: "pyside2"
CONDA_DEPENDENCIES: "pytest pyside2=2.*"
+ - PYTHON_VERSION: "3.6"
+ PYTEST_QT_API: "pyqt5"
+ CONDA_DEPENDENCIES: "pytest pyqt=5.*"
+ - PYTHON_VERSION: "3.6"
+ PYTEST_QT_API: "pyside2"
+ CONDA_DEPENDENCIES: "pytest pyside2=2.*"
+
platform:
-x64
diff --git a/pytest_qt.egg-info/PKG-INFO b/pytest_qt.egg-info/PKG-INFO
index 45ae18f..554410c 100644
--- a/pytest_qt.egg-info/PKG-INFO
+++ b/pytest_qt.egg-info/PKG-INFO
@@ -1,11 +1,12 @@
Metadata-Version: 1.1
Name: pytest-qt
-Version: 2.2.0
+Version: 2.2.1
Summary: pytest support for PyQt and PySide applications
Home-page: http://github.com/pytest-dev/pytest-qt
Author: Bruno Oliveira
Author-email: nicoddemus at gmail.com
License: MIT
+Description-Content-Type: UNKNOWN
Description: =========
pytest-qt
=========
@@ -192,6 +193,7 @@ Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
Classifier: Topic :: Desktop Environment :: Window Managers
Classifier: Topic :: Software Development :: Quality Assurance
Classifier: Topic :: Software Development :: Testing
diff --git a/pytestqt/_version.py b/pytestqt/_version.py
index bd2332f..895ced4 100644
--- a/pytestqt/_version.py
+++ b/pytestqt/_version.py
@@ -1,4 +1,4 @@
# coding: utf-8
# file generated by setuptools_scm
# don't change, don't track in version control
-version = '2.2.0'
+version = '2.2.1'
diff --git a/pytestqt/modeltest.py b/pytestqt/modeltest.py
index 27d9385..8c5b163 100644
--- a/pytestqt/modeltest.py
+++ b/pytestqt/modeltest.py
@@ -448,8 +448,8 @@ class ModelTester:
(qt_api.QtCore.Qt.WhatsThisRole, str),
(qt_api.QtCore.Qt.SizeHintRole, qt_api.QtCore.QSize),
(qt_api.QtCore.Qt.FontRole, qt_api.QtGui.QFont),
- (qt_api.QtCore.Qt.BackgroundColorRole, qt_api.QtGui.QColor),
- (qt_api.QtCore.Qt.TextColorRole, qt_api.QtGui.QColor),
+ (qt_api.QtCore.Qt.BackgroundColorRole, (qt_api.QtGui.QColor, qt_api.QtGui.QBrush)),
+ (qt_api.QtCore.Qt.TextColorRole, (qt_api.QtGui.QColor, qt_api.QtGui.QBrush)),
]
# General purpose roles with a fixed expected type
diff --git a/setup.cfg b/setup.cfg
index 6f08d0e..adf5ed7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,5 +4,4 @@ universal = 1
[egg_info]
tag_build =
tag_date = 0
-tag_svn_revision = 0
diff --git a/setup.py b/setup.py
index 147f0bc..c6eb4a1 100644
--- a/setup.py
+++ b/setup.py
@@ -52,6 +52,7 @@ setup(
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
+ 'Programming Language :: Python :: 3.6',
'Topic :: Desktop Environment :: Window Managers',
'Topic :: Software Development :: Quality Assurance',
'Topic :: Software Development :: Testing',
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pytest-qt.git
More information about the Python-modules-commits
mailing list