diff --git a/appveyor.yml b/appveyor.yml index 864366c3a569f3ac69259ea632d2f484a3c999f8..9120382070e3bfdfc143e11ac8475ff6d41c649f 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 3dc5d2f86900f54ced64fe8dc950e80342d5ff0f..7379ff328751ea8dafc866431cdc8a576be676eb 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 1e943f4487be50a31485d1abcbeab05d3f3ac4f1..148160f71e3dce61607e5fa5153947bc5a874a11 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 f5438ce23f1221bdfbc3dbb976e5c2e668f6c924..b09c555f19a311604780e44a3521582580f7c293 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