Skip to content
Snippets Groups Projects
Commit f6a3986d authored by inso's avatar inso
Browse files

Squashed commit of the following:

commit b3d5d716bcaea5ccb76b013959449f529a9b2b25
Author: inso <insomniak.fr@gmaiL.com>
Date:   Sat Jan 14 15:58:35 2017 +0100

    Use sys.path

commit 55e4236a0a194a7ca1f438147eba97ef735f90d2
Author: inso <insomniak.fr@gmaiL.com>
Date:   Sat Jan 14 15:40:01 2017 +0100

    Python path on appveyor

commit 3e0ff3cf3ceae00b45a52ed4acf6d4cd9382e20f
Author: inso <insomniak.fr@gmaiL.com>
Date:   Sat Jan 14 15:33:51 2017 +0100

    Run tests on appveyor

commit 6ec6adfc7ac7ef9bab30d9491cd7b5e94fc3fc7d
Author: inso <insomniak.fr@gmaiL.com>
Date:   Sat Jan 14 10:51:52 2017 +0100

    Install dunst on ubuntu

commit e6eba8a2ee85d4b5552e8bd50d5617ce25139e8a
Author: inso <insomniak.fr@gmaiL.com>
Date:   Sat Jan 14 10:42:17 2017 +0100

    Move tests

commit 95fe8829e9c0bfe4ea52e604390c95ffa316c1c5
Author: inso <insomniak.fr@gmaiL.com>
Date:   Sat Jan 14 10:05:14 2017 +0100

    py.test on linux + Qt 5.6 on window

commit 8c14f9d5608ab95a0c7abbfc8e3c78d3c98e61f4
Author: inso <insomniak.fr@gmaiL.com>
Date:   Fri Jan 13 23:41:50 2017 +0100

    pytest on linux

commit 5243b1af38ccac7b427c328512a3c09a1343a879
Author: inso <insomniak.fr@gmaiL.com>
Date:   Fri Jan 13 23:38:32 2017 +0100

    Fix appveyor

commit 5cd764969b15650b82bef24bf123b3f01ce307ee
Author: inso <insomniak.fr@gmaiL.com>
Date:   Fri Jan 13 23:36:20 2017 +0100

    Fix ci
parent f23d0015
No related branches found
No related tags found
No related merge requests found
Showing
with 17 additions and 16 deletions
...@@ -11,7 +11,7 @@ environment: ...@@ -11,7 +11,7 @@ environment:
PYTHON_ARCH: "64" PYTHON_ARCH: "64"
CONDA_PY: "35" CONDA_PY: "35"
CONDA_NPY: "18" CONDA_NPY: "18"
QTDIR: "C:\\Qt\\5.7\\msvc2015_64" QTDIR: "C:\\Qt\\5.6\\msvc2015_64"
platform: x64 platform: x64
- PYTHON: "C:\\Python35_32" - PYTHON: "C:\\Python35_32"
...@@ -19,7 +19,7 @@ environment: ...@@ -19,7 +19,7 @@ environment:
PYTHON_ARCH: "32" PYTHON_ARCH: "32"
CONDA_PY: "35" CONDA_PY: "35"
CONDA_NPY: "18" CONDA_NPY: "18"
QTDIR: "C:\\Qt\\5.7\\msvc2015" QTDIR: "C:\\Qt\\5.6\\msvc2015"
platform: x86 platform: x86
install: install:
...@@ -36,10 +36,7 @@ install: ...@@ -36,10 +36,7 @@ install:
#- choco install -y vcredist2015 #- choco install -y vcredist2015
- "%CMD_IN_ENV% conda config --set always_yes yes --set changeps1 no" - "%CMD_IN_ENV% conda config --set always_yes yes --set changeps1 no"
- "%CMD_IN_ENV% conda config --add channels inso/channel/sakia" - "%CMD_IN_ENV% conda config --add channels inso/channel/sakia"
- "%CMD_IN_ENV% conda create -q -n test-environment python=%PYTHON_VERSION% libsodium=1.0.3 setuptools=19.2" - "%CMD_IN_ENV% conda create -q -n test-environment python=%PYTHON_VERSION% pyqt5=5.6 libsodium=1.0.3 setuptools=19.2"
cache:
- C:\Qt\5.7\5.7
build_script: build_script:
- ".\\ci\\appveyor\\build.cmd" - ".\\ci\\appveyor\\build.cmd"
......
...@@ -5,12 +5,12 @@ call activate test-environment ...@@ -5,12 +5,12 @@ call activate test-environment
echo "%PATH%" echo "%PATH%"
echo "%QT_PLUGIN_PATH%" echo "%QT_PLUGIN_PATH%"
python -V python -V
call pyuic5 --version
pyrcc5 -version
lrelease -version lrelease -version
call pyuic5 --version
pyrcc5 -version
pip install -r requirements.txt pip install -r requirements.txt
pip install pyinstaller pip install pyinstaller
pip install six pip install six
......
...@@ -11,8 +11,7 @@ pyrcc5 -version ...@@ -11,8 +11,7 @@ pyrcc5 -version
lrelease -version lrelease -version
echo "%CWD%" echo "%cd%"
py.test tests/
py.test
if %errorlevel% neq 0 exit /b 1 if %errorlevel% neq 0 exit /b 1
\ No newline at end of file
...@@ -27,7 +27,7 @@ then ...@@ -27,7 +27,7 @@ then
libxcb-xfixes0-dev libxrender-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0 \ 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 \ 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 \ 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 curl libdbus-1-dev libdbus-glib-1-dev autoconf automake libtool libgstreamer-plugins-base0.10-0 dunst
wget https://download.qt.io/official_releases/qt/5.7/5.7.1/qt-opensource-linux-x64-5.7.1.run 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 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 ./qt-opensource-linux-x64-5.7.1.run --script $HOME/build/duniter/sakia/ci/travis/qt-installer-noninteractive.qs
......
...@@ -8,6 +8,7 @@ pyenv shell $PYENV_PYTHON_VERSION ...@@ -8,6 +8,7 @@ pyenv shell $PYENV_PYTHON_VERSION
pip install --upgrade pip pip install --upgrade pip
pyenv rehash pyenv rehash
pip install coveralls pip install coveralls
pip install pytest-cov
pip install pyinstaller pip install pyinstaller
pip install PyQt5 pip install PyQt5
pip install -r requirements.txt pip install -r requirements.txt
......
...@@ -6,7 +6,7 @@ if [ $TRAVIS_OS_NAME == "linux" ] ...@@ -6,7 +6,7 @@ if [ $TRAVIS_OS_NAME == "linux" ]
then then
export XVFBARGS="-screen 0 1280x1024x24" export XVFBARGS="-screen 0 1280x1024x24"
export DISPLAY=:99.0 export DISPLAY=:99.0
sudo sh -e /etc/init.d/xvfb restart sh -e /etc/init.d/xvfb start
sleep 3 sleep 3
fi fi
...@@ -14,7 +14,7 @@ cd $HOME/build/duniter/sakia ...@@ -14,7 +14,7 @@ cd $HOME/build/duniter/sakia
pyenv shell $PYENV_PYTHON_VERSION pyenv shell $PYENV_PYTHON_VERSION
if [ $TRAVIS_OS_NAME == "linux" ] if [ $TRAVIS_OS_NAME == "linux" ]
then then
coverage run --source=sakia.core,sakia.gui,sakia.models py.test py.test --cov=sakia tests/
else else
py.test py.test
fi fi
......
File moved
...@@ -3,6 +3,11 @@ import asyncio ...@@ -3,6 +3,11 @@ import asyncio
import quamash import quamash
import sqlite3 import sqlite3
import mirage import mirage
import sys
import os
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'src')))
from duniterpy.documents import BlockUID from duniterpy.documents import BlockUID
from sakia.app import Application from sakia.app import Application
from sakia.options import SakiaOptions from sakia.options import SakiaOptions
...@@ -11,7 +16,6 @@ from sakia.data.entities import * ...@@ -11,7 +16,6 @@ from sakia.data.entities import *
from sakia.data.repositories import * from sakia.data.repositories import *
from sakia.services import DocumentsService from sakia.services import DocumentsService
_application_ = [] _application_ = []
......
File moved
File moved
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment