Skip to content

Commit fd45a25

Browse files
committed
Updated docs about requirements
1 parent f3bc549 commit fd45a25

File tree

3 files changed

+23
-2
lines changed

3 files changed

+23
-2
lines changed

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,15 @@ This allows you to test and make sure your view layer is behaving the way you ex
2424
[![downloads](http://img.shields.io/pypi/dm/pytest-qt.svg)](https://crate.io/packages/pytest-qt/)
2525
[![ci](http://img.shields.io/travis/nicoddemus/pytest-qt.svg)](https://travis-ci.org/nicoddemus/pytest-qt)
2626

27+
## Requirements ##
28+
29+
Python 2.7 or 3.4.
30+
31+
Works with either [PySide](https://pypi.python.org/pypi/PySide) or
32+
[PyQt](http://www.riverbankcomputing.com/software/pyqt), picking one that is available giving
33+
preference to `PySide` if both are installed (to force it to use `PyQt`, set
34+
the environment variable `PYTEST_QT_FORCE_PYQT=true`).
35+
2736
## Documentation ##
2837

2938
Full documentation and tutorial available at [Read the Docs](https://pytest-qt.readthedocs.org/en/latest/).

docs/index.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,18 @@ Introduction
1919

2020
.. automodule:: pytestqt
2121

22+
Requirements
23+
============
24+
25+
Python 2.7 or Python 3.4.
26+
27+
Tested with pytest version 2.5.2.
28+
29+
Works with either `PySide` or
30+
`PyQt`, picking one that is available giving
31+
preference to `PySide` if both are installed (to force it to use `PyQt`, set
32+
the environment variable `PYTEST_QT_FORCE_PYQT=true`).
33+
2234
Installation
2335
============
2436

pytestqt/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ def test_hello(qtbot):
2727
'''
2828

2929
# The short X.Y version.
30-
version = '1.0.2'
30+
version = '1.1'
3131
# The full version, including alpha/beta/rc tags.
32-
release = '1.0.2'
32+
release = '1.1'

0 commit comments

Comments
 (0)