Skip to content

updated modeltester to allow QBrush as BackgroundColorRole #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 5, 2017
Merged

updated modeltester to allow QBrush as BackgroundColorRole #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aea2c7e
updated modeltester to allow QBrush as BackgroundColorRole and TextCo…
p0las Oct 4, 2017
1e05b89
fixed indentation to what it was previously
p0las Oct 4, 2017
dca91f9
Explicitly add six as a dependency
nicoddemus Oct 5, 2017
f7264ae
Update CHANGELOG
nicoddemus Oct 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -28,7 +28,7 @@ install:
# 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 .
Expand All @@ -41,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:
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
.. _@p0las: https://github.com/p0las


2.2.0
-----

Expand Down
4 changes: 2 additions & 2 deletions pytestqt/modeltest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,8 +448,8 @@ def _test_data(self):
(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
Expand Down