diff --git a/ci/travis/before_install.sh b/ci/travis/before_install.sh
index 5797f090b9a3817e10c0aa1b5ea44e4665fdb05e..ff73d483a7a0c5dd0e22e0cbc48c241069b55769 100755
--- a/ci/travis/before_install.sh
+++ b/ci/travis/before_install.sh
@@ -21,18 +21,17 @@ then
pip install PyQt5
elif [ $TRAVIS_OS_NAME == "linux" ]
then
- # sudo apt-get update
- # sudo apt-get install -qq -y libxcb1 libxcb1-dev libx11-xcb1 libx11-xcb-dev libxcb-keysyms1 libxcb-keysyms1-dev libxcb-image0 \
- # libxcb-image0-dev libxcb-shm0 libxcb-shm0-dev libxcb-icccm4 libxcb-icccm4-dev \
- # libxcb-xfixes0-dev libxrender-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0 \
- # libxcb-render-util0-dev libxcb-glx0-dev libgl1-mesa-dri libegl1-mesa libpcre3 libgles2-mesa-dev \
- # freeglut3-dev libfreetype6-dev xorg-dev xserver-xorg-input-void xserver-xorg-video-dummy xpra libosmesa6-dev \
- # curl libdbus-1-dev libdbus-glib-1-dev autoconf automake libtool libgstreamer-plugins-base0.10-0
- # wget https://download.qt.io/official_releases/qt/5.5/5.5.1/qt-opensource-linux-x64-5.5.1.run
- # chmod +x qt-opensource-linux-x64-5.5.1.run
- # ./qt-opensource-linux-x64-5.5.1.run --script $HOME/build/duniter/sakia/ci/travis/qt-installer-noninteractive.qs
+ sudo apt-get update
+ sudo apt-get install -qq -y libxcb1 libxcb1-dev libx11-xcb1 libx11-xcb-dev libxcb-keysyms1 libxcb-keysyms1-dev libxcb-image0 \
+ libxcb-image0-dev libxcb-shm0 libxcb-shm0-dev libxcb-icccm4 libxcb-icccm4-dev \
+ libxcb-xfixes0-dev libxrender-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0 \
+ libxcb-render-util0-dev libxcb-glx0-dev libgl1-mesa-dri libegl1-mesa libpcre3 libgles2-mesa-dev \
+ freeglut3-dev libfreetype6-dev xorg-dev xserver-xorg-input-void xserver-xorg-video-dummy xpra libosmesa6-dev \
+ curl libdbus-1-dev libdbus-glib-1-dev autoconf automake libtool libgstreamer-plugins-base0.10-0
+ wget https://download.qt.io/official_releases/qt/5.7/5.7.1/qt-opensource-linux-x64-5.7.1.run
+ chmod +x qt-opensource-linux-x64-5.7.1.run
+ ./qt-opensource-linux-x64-5.7.1.run --script $HOME/build/duniter/sakia/ci/travis/qt-installer-noninteractive.qs
- pip install PyQt5
wget http://archive.ubuntu.com/ubuntu/pool/universe/libs/libsodium/libsodium13_1.0.1-1_amd64.deb
sudo dpkg -i libsodium13_1.0.1-1_amd64.deb
rm -r ~/.pyenv
@@ -57,52 +56,3 @@ fi
pyenv shell $PYENV_PYTHON_VERSION
cd $HOME
-
-wget http://ufpr.dl.sourceforge.net/project/pyqt/sip/sip-4.17/sip-4.17.tar.gz
-file sip-4.17.tar.gz
-gzip -t sip-4.17.tar.gz
-tar xzf sip-4.17.tar.gz
-cd sip-4.17/
-python configure.py
-make && make install
-pyenv rehash
-
-cd $HOME
-pyenv shell $PYENV_PYTHON_VERSION
-wget http://ufpr.dl.sourceforge.net/project/pyqt/PyQt5/PyQt-5.5.1/PyQt-gpl-5.5.1.tar.gz
-file PyQt-gpl-5.5.1.tar.gz
-gzip -t PyQt-gpl-5.5.1.tar.gz
-tar xzf PyQt-gpl-5.5.1.tar.gz
-cd PyQt-gpl-5.5.1/
-if [ $TRAVIS_OS_NAME == "osx" ]
-then
- python configure.py --confirm-license \
- --enable QtCore \
- --enable QtWidgets \
- --enable QtGui \
- --enable QtSvg \
- --enable QtWebChannel \
- --enable QtWebEngineWidgets \
- --enable QtNetwork \
- --enable QtPrintSupport \
- --enable QtTest \
- --pyuic5-interpreter /Users/travis/.pyenv/versions/$PYENV_PYTHON_VERSION/bin/python3.5 \
- --sip /Users/travis/.pyenv/versions/$PYENV_PYTHON_VERSION/Python.framework/Versions/3.5/bin/sip
-elif [ $TRAVIS_OS_NAME == "linux" ]
-then
- python configure.py --qmake "/tmp/qt/5.5/5.5/gcc_64/bin/qmake" --confirm-license \
- --enable QtCore \
- --enable QtWidgets \
- --enable QtGui \
- --enable QtSvg \
- --enable QtWebChannel \
- --enable QtWebEngineWidgets \
- --enable QtNetwork \
- --enable QtPrintSupport \
- --enable QtTest \
- --pyuic5-interpreter /home/travis/.pyenv/versions/$PYENV_PYTHON_VERSION/bin/python3.5 \
- --sip /home/travis/.pyenv/versions/3.5.2/bin/sip
-fi
-
-make -j 2 && make install
-pyenv rehash
diff --git a/ci/travis/build.sh b/ci/travis/build.sh
index 4210041ea131a640c8df2ff3aee3707ad648d161..2cd869bb8399bdc0362effa7f2571bf84e3bb140 100755
--- a/ci/travis/build.sh
+++ b/ci/travis/build.sh
@@ -15,7 +15,7 @@ then
pip install -U git+https://github.com/posborne/dbus-python.git
pip install notify2
- export PATH=/tmp/qt/5.5/5.5/gcc_64/bin:$PATH
+ export PATH=/tmp/qt/5.7/5.7/gcc_64/bin:$PATH
fi
if [ $TRAVIS_OS_NAME == "osx" ]
then
diff --git a/ci/travis/qt-installer-noninteractive.qs b/ci/travis/qt-installer-noninteractive.qs
index 30c54f9904c52fdceedbca08b6bf8e634856d14a..be376cd716cfaa6ccd24615614bfeff887f58445 100644
--- a/ci/travis/qt-installer-noninteractive.qs
+++ b/ci/travis/qt-installer-noninteractive.qs
@@ -21,7 +21,7 @@ Controller.prototype.IntroductionPageCallback = function() {
Controller.prototype.TargetDirectoryPageCallback = function()
{
- gui.currentPageWidget().TargetDirectoryLineEdit.setText("/tmp/qt/5.5");
+ gui.currentPageWidget().TargetDirectoryLineEdit.setText("/tmp/qt/5.7");
gui.clickButton(buttons.NextButton);
}
diff --git a/requirements.txt b/requirements.txt
index 34e29cb109b7f7257eb14df7dd4d82fbb4dfac49..1416c67bdc70fbb22cd22142f828310b0110bf8c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,3 +6,4 @@ duniter-mirage
duniterpy>=0.40
pytest
pytest-asyncio
+PyQt5