From 041f29281876ceaa5120597ab82aba0b8b24ae38 Mon Sep 17 00:00:00 2001
From: inso <insomniak.fr@gmaiL.com>
Date: Tue, 20 Feb 2018 18:09:02 +0100
Subject: [PATCH] Squashed commit of the following:
commit 846b651318c0d8614178392230c994082d6d1a58
Author: inso <insomniak.fr@gmaiL.com>
Date: Tue Feb 20 15:40:00 2018 +0100
Fix qt script and
commit 4b152889197c475ea961c3a23c02789f7bd2247d
Author: inso <insomniak.fr@gmaiL.com>
Date: Tue Feb 20 14:28:51 2018 +0100
Fix ci
---
appveyor.yml | 4 ++--
ci/travis/before_install.sh | 6 +++---
ci/travis/qt-installer-noninteractive.qs | 2 +-
requirements.txt | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml
index 864366c3..91203820 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,7 +11,7 @@ environment:
PYTHON_ARCH: "64"
CONDA_PY: "35"
CONDA_NPY: "18"
- QTDIR: "C:\\Qt\\5.6\\msvc2015_64"
+ QTDIR: "C:\\Qt\\5.9\\msvc2015_64"
platform: x64
- PYTHON: "C:\\Python35_32"
@@ -19,7 +19,7 @@ environment:
PYTHON_ARCH: "32"
CONDA_PY: "35"
CONDA_NPY: "18"
- QTDIR: "C:\\Qt\\5.6\\msvc2015"
+ QTDIR: "C:\\Qt\\5.9\\msvc2015"
platform: x86
install:
diff --git a/ci/travis/before_install.sh b/ci/travis/before_install.sh
index 3dc5d2f8..7379ff32 100755
--- a/ci/travis/before_install.sh
+++ b/ci/travis/before_install.sh
@@ -29,9 +29,9 @@ then
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 dunst fakeroot \
dbus-x11
- wget https://download.qt.io/official_releases/qt/5.8/5.8.0/qt-opensource-linux-x64-5.8.0.run
- chmod +x qt-opensource-linux-x64-5.8.0.run
- ./qt-opensource-linux-x64-5.8.0.run --script $HOME/build/duniter/sakia/ci/travis/qt-installer-noninteractive.qs
+ wget https://download.qt.io/official_releases/qt/5.9/5.9.4/qt-opensource-linux-x64-5.9.4.run
+ chmod +x qt-opensource-linux-x64-5.9.4.run
+ ./qt-opensource-linux-x64-5.9.4.run --script $HOME/build/duniter/sakia/ci/travis/qt-installer-noninteractive.qs
wget http://archive.ubuntu.com/ubuntu/pool/universe/libs/libsodium/libsodium18_1.0.13-1_amd64.deb
sudo dpkg -i libsodium18_1.0.13-1_amd64.deb
diff --git a/ci/travis/qt-installer-noninteractive.qs b/ci/travis/qt-installer-noninteractive.qs
index 1e943f44..148160f7 100644
--- a/ci/travis/qt-installer-noninteractive.qs
+++ b/ci/travis/qt-installer-noninteractive.qs
@@ -8,7 +8,7 @@ function Controller() {
}
Controller.prototype.WelcomePageCallback = function() {
- gui.clickButton(buttons.NextButton);
+ gui.clickButton(buttons.NextButton, 3000);
}
Controller.prototype.CredentialsPageCallback = function() {
diff --git a/requirements.txt b/requirements.txt
index f5438ce2..b09c555f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,4 +9,4 @@ pytest-asyncio<0.6
pyyaml
aiohttp
async_timeout
-PyQt5>=5.5
\ No newline at end of file
+PyQt5>=5.9,<5.10
\ No newline at end of file
--
GitLab