From fabe77b966e5cbd3d6922197c1dc65a5cf4c59f1 Mon Sep 17 00:00:00 2001 From: Manuel Riel Date: Tue, 20 Nov 2018 13:30:32 +0800 Subject: [PATCH 1/9] Update .travis.yml --- .travis.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 271b9f4f..060a41d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,11 @@ -language: generic +language: python +python: +- '3.6' +addons: + apt: + packages: + - xvfb + - python3-venv cache: - pip From 6026ef9a54e1f854dcf0af4a8ccbb96e758a2a48 Mon Sep 17 00:00:00 2001 From: Manuel Riel Date: Tue, 20 Nov 2018 13:32:51 +0800 Subject: [PATCH 2/9] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 060a41d3..69350017 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ addons: apt: packages: - xvfb - - python3-venv + - python3.6-venv cache: - pip From 3115f4cf4c80251c36a19a03525e66b0797d2f7f Mon Sep 17 00:00:00 2001 From: Manuel Riel Date: Tue, 20 Nov 2018 13:41:11 +0800 Subject: [PATCH 3/9] Update .travis.yml --- .travis.yml | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 69350017..dc9aa68f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,18 @@ addons: apt: packages: - xvfb - - python3.6-venv cache: -- pip + - pip + - directories: + - $HOME/.pyenv_cache + +before_install: + - | + if [[ -n "$PYENV_VERSION" ]]; then + wget https://github.com/praekeltfoundation/travis-pyenv/releases/download/0.4.0/setup-pyenv.sh + source setup-pyenv.sh + fi sudo: required @@ -16,25 +24,15 @@ dist: trusty env: global: - # used by ci-helpers - SETUP_XVFB=true - PIP_DEPENDENCIES='hacking pytest pytest-qt' - - MPLBACKEND=TkAgg # for osx matrix: include: - - os: osx - env: - - PYTEST_QT_API=pyqt5 - - PYQT_PACKAGE='pyqt=5' - - PYTHON_VERSION=3.6 - - RUN_PYINSTALLER=true - os: linux dist: trusty env: - - PYTEST_QT_API=pyqt5 - - PYQT_PACKAGE='pyqt=5' - - PYTHON_VERSION=3.6 + - PYENV_VERSION=py36 - RUN_PYINSTALLER=true install: @@ -47,8 +45,6 @@ install: brew cask install xquartz fi -- python3 -m venv venv -- source activate venv - pip install . - pip install -r requirements-dev.txt From 101749ecdfdbc5d80ba6b3b7ff8f622003680b38 Mon Sep 17 00:00:00 2001 From: Manuel Riel Date: Tue, 20 Nov 2018 14:12:46 +0800 Subject: [PATCH 4/9] Update .travis.yml --- .travis.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index dc9aa68f..dd5488ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,22 +5,14 @@ addons: apt: packages: - xvfb + - python3.6-venv cache: - pip - - directories: - - $HOME/.pyenv_cache - -before_install: - - | - if [[ -n "$PYENV_VERSION" ]]; then - wget https://github.com/praekeltfoundation/travis-pyenv/releases/download/0.4.0/setup-pyenv.sh - source setup-pyenv.sh - fi sudo: required -dist: trusty +dist: bionic env: global: @@ -32,7 +24,6 @@ matrix: - os: linux dist: trusty env: - - PYENV_VERSION=py36 - RUN_PYINSTALLER=true install: From 31cd00a944cfa5d4fab44eb055add09c31040a5c Mon Sep 17 00:00:00 2001 From: Manuel Riel Date: Tue, 20 Nov 2018 14:17:37 +0800 Subject: [PATCH 5/9] Update .travis.yml --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dd5488ed..ae493445 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,14 +5,13 @@ addons: apt: packages: - xvfb - - python3.6-venv cache: - pip sudo: required -dist: bionic +dist: trusty env: global: From a9e54c240c116493b1e381df31916366cca65d0a Mon Sep 17 00:00:00 2001 From: Manuel Riel Date: Tue, 20 Nov 2018 14:20:29 +0800 Subject: [PATCH 6/9] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ae493445..b5c5a412 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,7 @@ before_script: - sleep 1 script: -- pytest +- xvfb-run pytest #after_script: #- | From 26201e7cdeaa106236cc0896625dc9396e75fa08 Mon Sep 17 00:00:00 2001 From: Manuel Riel Date: Tue, 20 Nov 2018 14:29:11 +0800 Subject: [PATCH 7/9] Update .travis.yml --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b5c5a412..25c477c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,8 @@ install: sudo apt-get update # Xvfb / window manager sudo apt-get install -y xvfb herbstluftwm + export DISPLAY=:99.0 + sleep 3 elif [ $TRAVIS_OS_NAME = "osx" ]; then brew cask install xquartz fi @@ -44,7 +46,7 @@ before_script: - sleep 1 script: -- xvfb-run pytest +- pytest #after_script: #- | From 639317b18f8942ec3cc43325bb16c53d6d516300 Mon Sep 17 00:00:00 2001 From: Manuel Riel Date: Tue, 20 Nov 2018 14:35:00 +0800 Subject: [PATCH 8/9] Update .travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 25c477c2..f598fd52 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,7 @@ install: # Xvfb / window manager sudo apt-get install -y xvfb herbstluftwm export DISPLAY=:99.0 + /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1920x1200x24 -ac +extension GLX +render -noreset sleep 3 elif [ $TRAVIS_OS_NAME = "osx" ]; then brew cask install xquartz @@ -43,7 +44,7 @@ install: before_script: - if [ $TRAVIS_OS_NAME = "linux" ]; then (herbstluftwm )& fi - if [ $TRAVIS_OS_NAME = "osx" ]; then (sudo Xvfb :99 -ac -screen 0 1024x768x8 )& fi -- sleep 1 +- sleep 3 script: - pytest From 0bc36762398248925f0db95d67a066238d315761 Mon Sep 17 00:00:00 2001 From: Manuel Riel Date: Tue, 20 Nov 2018 14:42:26 +0800 Subject: [PATCH 9/9] Update .travis.yml --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f598fd52..ab27df9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,11 @@ addons: apt: packages: - xvfb + - libssl-dev + - openssl + - libacl1-dev + - libacl1 + - build-essential cache: - pip @@ -16,7 +21,6 @@ dist: trusty env: global: - SETUP_XVFB=true - - PIP_DEPENDENCIES='hacking pytest pytest-qt' matrix: include: @@ -39,6 +43,7 @@ install: fi - pip install . +- pip install borgbackup - pip install -r requirements-dev.txt before_script: