Skip to content

Commit 18ca45c

Browse files
committedJul 31, 2016
Simplify travis-ci setup
Disable system site package and install PyQt 5.7 from pypi We don't test pyqt4 anymore (pyqt4 is not supported and support for pyqt4 and pyside will be removed in pyqode 3.0)
1 parent 7ec85e2 commit 18ca45c

File tree

4 files changed

+19
-62
lines changed

4 files changed

+19
-62
lines changed
 

‎.travis.yml

+13-32
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,26 @@
11
language: python
2-
sudo: required
3-
dist: trusty
42

53
python:
6-
- "2.7"
7-
- "3.4"
8-
9-
virtualenv:
10-
system_site_packages: true
11-
12-
matrix:
13-
exclude:
14-
- env: QT_API=pyqt5
15-
python: "2.7"
4+
- "3.5"
165

176
env:
18-
- QT_API=pyqt4
19-
- QT_API=pyqt5
7+
- QT_API=pyqt5
208

219
before_install:
22-
- "export DISPLAY=:99.0"
23-
- "sh -e /etc/init.d/xvfb start"
10+
- export DISPLAY=:99.0
11+
- sh -e /etc/init.d/xvfb start
2412

2513
install:
26-
- sudo apt-get update
27-
28-
# Qt
29-
- python scripts/install-qt.py
30-
31-
# pytest
32-
- pip install --quiet pytest pytest-xdist pytest-cov
33-
34-
# coveralls
35-
- pip install --quiet coveralls --use-wheel
36-
37-
# install pyqode.qt
38-
- bash scripts/install-pyqode.sh
14+
# install libegl1-mesa package for the missing libEGL shared object that prevents qt from starting
15+
- sudo apt-get update
16+
- sudo apt-get --yes --force-yes install libegl1-mesa
17+
# make sure pip is up to date so that it can install wheels
18+
- pip install pip --upgrade
19+
- pip install -e .
20+
- pip install -r requirements-dev.txt
3921

4022
script:
41-
- pip install -e .
42-
- catchsegv py.test --cov pyqode
23+
- py.test --cov pyqode
4324

4425
after_success:
45-
- coveralls
26+
- coveralls

‎requirements-dev.txt

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
PyQt5
2+
-e git://github.com/pyQode/pyqode.qt.git#egg=pyqode.qt
3+
-e git://github.com/pyQode/pyqode.core.git#egg=pyqode.core
4+
pytest
5+
pytest-cov
6+
coveralls

‎scripts/install-pyqode.sh

-8
This file was deleted.

‎scripts/install-qt.py

-22
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.