Skip to content

Commit f0c8baf

Browse files
committed
Remove unnecessary Travis dependency on pytest-qt
The gui tests that depend on pytest-qt are disabled using the pytest marker 'guitest'.
1 parent 9f79a41 commit f0c8baf

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

.travis.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,14 @@ python:
33
- "2.7"
44
before_install:
55
- pip install -U setuptools
6-
- sudo add-apt-repository -y ppa:pyside/ppa
7-
- sudo apt-get update -qq
8-
- sudo apt-get install -qq libusb-dev python-pyside libffi-dev libjpeg8-dev libudev-dev libusb-1.0-0-dev python-dbus liblua5.2-dev libusb-dev
9-
- ln -s /usr/lib/python2.7/dist-packages/PySide /usr/lib/python2.7/dist-packages/*dbus* ~/virtualenv/python2.7/lib/python2.7/site-packages/
10-
- "export DISPLAY=:99.0"
11-
- "sh -e /etc/init.d/xvfb start"
12-
- sleep 3
6+
- sudo apt-get install -qq libusb-dev libffi-dev libjpeg8-dev libudev-dev libusb-1.0-0-dev python-dbus liblua5.2-dev
7+
- ln -s /usr/lib/python2.7/dist-packages/*dbus* ~/virtualenv/python2.7/lib/python2.7/site-packages/
138
install:
149
- pip install lupa --install-option='--no-luajit'
1510
- pip install cffi flake8 pyflakes pep8-naming
1611
- pip install -e ".[web,hidtrigger,autorotate,chdkcamera]"
17-
- pip install -r test-requirements.txt
12+
# remove pytest and whitespace from the test requirements
13+
- pip install $(sed -e '/pytest-qt/d;s/ //g' test-requirements.txt)
1814
- pip install -e .
1915
script:
2016
- flake8 spreads spreadsplug tests --exclude=vendor

test-requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# pytest-qt is only needed for the gui tests
12
pytest-qt >= 1.0
23
pytest-cov >= 1.6
34
pytest >= 2.5.1

0 commit comments

Comments
 (0)