Skip to content

Commit aa65c0f

Browse files
committed
Adding travis build for py27, py34
Installing pyside and pyqt4 using pip fixes #5
1 parent a2ad138 commit aa65c0f

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

.travis.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,25 @@
11
language: python
22
python:
33
- "2.7"
4+
- "3.4"
45
before_script:
56
- "export DISPLAY=:99.0"
67
- "sh -e /etc/init.d/xvfb start"
78
- sleep 3
89

910
env:
10-
- PYTEST_VERSION=2.4.2 PYTEST_QT_FORCE_PYQT=true
1111
- PYTEST_VERSION=2.5.2 PYTEST_QT_FORCE_PYQT=true
12-
- PYTEST_VERSION=2.4.2 PYTEST_QT_FORCE_PYQT=false
1312
- PYTEST_VERSION=2.5.2 PYTEST_QT_FORCE_PYQT=false
1413

1514
install:
1615
# PySide
1716
- if [[ $PYTEST_QT_FORCE_PYQT == 'false' ]]; then
18-
- sudo apt-get install -qq python-pyside
19-
- ln -s /usr/lib/python$TRAVIS_PYTHON_VERSION/dist-packages/PySide /home/travis/virtualenv/python$TRAVIS_PYTHON_VERSION/lib/python$TRAVIS_PYTHON_VERSION/site-packages/PySide -v
17+
- pip install pyside
2018
- fi
2119

2220
# PyQt4
2321
- if [[ $PYTEST_QT_FORCE_PYQT == 'true' ]]; then
24-
- sudo apt-get install -qq python-qt4
25-
- ln -s /usr/lib/python$TRAVIS_PYTHON_VERSION/dist-packages/PyQt4 /home/travis/virtualenv/python$TRAVIS_PYTHON_VERSION/lib/python$TRAVIS_PYTHON_VERSION/site-packages/PyQt4 -v
26-
- ln -s /usr/lib/python$TRAVIS_PYTHON_VERSION/dist-packages/sip* /home/travis/virtualenv/python$TRAVIS_PYTHON_VERSION/lib/python$TRAVIS_PYTHON_VERSION/site-packages -v
22+
- pip install pyqt4
2723
- fi
2824

2925
# PyTest

pytestqt/_tests/test_basics.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def registerEvent(self, event_type, extract_func):
9999

100100

101101
def event(self, ev):
102-
for event_type, extract_func in self._event_types.iteritems():
102+
for event_type, extract_func in self._event_types.items():
103103
if type(ev) is event_type:
104104
self.event_data = extract_func(ev)
105105
return True

pytestqt/qt_compat.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
QtCore = _QtCore
2929

3030
def _pyside_import_module(moduleName):
31-
pyside = __import__('PySide', globals(), locals(), [moduleName], -1)
31+
pyside = __import__('PySide', globals(), locals(), [moduleName], 0)
3232
return getattr(pyside, moduleName)
3333

3434

3535
def _pyqt4_import_module(moduleName):
36-
pyside = __import__('PyQt4', globals(), locals(), [moduleName], -1)
36+
pyside = __import__('PyQt4', globals(), locals(), [moduleName], 0)
3737
return getattr(pyside, moduleName)
3838

3939

0 commit comments

Comments
 (0)