Skip to content

Commit 38ad57c

Browse files
committed
use qt5 instead of qt4 - travis update
1 parent 272d90f commit 38ad57c

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ virtualenv:
66
system_site_packages: true
77

88
install:
9-
- sudo apt-get install -y python3-pyqt4 python3-sip
109
- pip install -r requirements.txt | cat
1110

1211
script:

docs/code.md

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,16 @@ The following steps will help you prepare an appropriate Python environment to r
1313
* enum [only if using Python v2.7]
1414
* numpy
1515
* scipy
16-
* OpenCV
17-
* PyQt4
16+
* opencv-python==3.1.0.5
17+
* PyQt5
1818

19-
* Some of these packages can be installed using `pip`. To do this:
19+
* All of these packages can be installed using `pip`. To do this:
2020
* Open cmd.exe (being sure to ‘Run as Administrator’)
2121
* Upgrade pip by typing `pip install –-upgrade pip`
2222
* Install pyperclip by typing `pip install pyperclip`
2323
* Install enum by typing `pip install enum` [only if using Python 2.7]
24-
25-
* The easiest way to install the other packages is to download the precompiled binaries from <http://www.lfd.uci.edu/~gohlke/pythonlibs/>. To install each one, open cmd.exe and type `pip install filename`. Download the most recent version of each for your version of Python (3.5, 32bit), e.g.:
26-
* numpy-1.11.0+mkl-cp35-cp35m-win32.whl
27-
* opencv_python-3.1.0-cp35-cp35m-win32.whl
28-
* scipy-0.17.1-cp35-cp35m-win32.whl
29-
* PyQt4-4.11.4-cp35-none-win32.whl
3024

31-
NOTE: there is a requirements.txt file that was created for use by the CI server Travis. It works in Travis but it wasn't tested locally. It contains all of the above dependencies except for enum and PyQt4.
25+
NOTE: there is a requirements.txt file that was created for use by the CI server Travis. It contains all of the above dependencies except for enum.
3226

3327
* Download the source code for the Barcode scanner program from <https://github.com/DiamondLightSource/PuckBarcodeReader> - use the ‘Download ZIP’ link. Open the zip and extract the contents to a suitable folder.
3428

0 commit comments

Comments
 (0)