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

Working on gitlab integration 

Squashed commit of the following:

commit cb9f20e1
Author: inso <insomniak.fr@gmaiL.com>
Date:   Mon Feb 26 13:19:34 2018 +0100

    Add badge coverage

commit 09b1dd26
Author: inso <insomniak.fr@gmaiL.com>
Date:   Mon Feb 26 13:13:22 2018 +0100

    Build and test

commit ce734175
Author: inso <insomniak.fr@gmaiL.com>
Date:   Mon Feb 26 13:10:17 2018 +0100

    Test coverage in gitlab

commit 29c60781
Author: inso <insomniak.fr@gmaiL.com>
Date:   Mon Feb 26 08:38:15 2018 +0100

    Use image starting xvfb

commit 2de8d861
Author: inso <insomniak.fr@gmaiL.com>
Date:   Mon Feb 26 08:29:07 2018 +0100

    xbfv

commit 28d96585
Author: inso <insomniak.fr@gmaiL.com>
Date:   Mon Feb 26 08:15:07 2018 +0100

    Fix encoding

commit 8b0ce409
Author: inso <insomniak.fr@gmaiL.com>
Date:   Mon Feb 26 08:09:29 2018 +0100

    set locale

commit 996e1c81
Author: inso <insomniak.fr@gmaiL.com>
Date:   Mon Feb 26 07:59:19 2018 +0100

    Test

commit 9a462f3f
Author: inso <insomniak.fr@gmaiL.com>
Date:   Mon Feb 26 07:42:56 2018 +0100

    Build on image 0.0.6

commit 3dd3d113
Author: inso <insomniak.fr@gmaiL.com>
Date:   Sun Feb 25 14:14:57 2018 +0100

    ls in dist

commit 56cb714f
Author: inso <insomniak.fr@gmaiL.com>
Date:   Sun Feb 25 14:12:23 2018 +0100

    ls -l 5..

commit a0e29a27
Author: inso <insomniak.fr@gmaiL.com>
Date:   Sun Feb 25 14:08:04 2018 +0100

    ls -l

commit 11cdebbd
Author: inso <insomniak.fr@gmaiL.com>
Date:   Sun Feb 25 13:38:31 2018 +0100

    Env

commit cd3e2688
Author: inso <insomniak.fr@gmaiL.com>
Date:   Sun Feb 25 13:31:15 2018 +0100

    qt5 env
parent c2cf6fc6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 13
− 25
View file @ 84944ad8
stages:
- github-sync
- prepare
- build
- test
- build_and_test
- release
variables:
PYENV_PYTHON_VERSION: 3.5.5
image: registry.duniter.org/docker/python3/duniterpy-builder:0.0.5
image: registry.duniter.org/docker/python3/duniterpy-builder:0.0.7
push_to_github:
stage: github-sync
......@@ -28,7 +26,7 @@ push_to_github:
- mv packed-refs-new packed-refs
- bash -c "git push --force --mirror github 2>&1 | grep -v duniter-gitlab; echo $?"
.pyenv: &pyenv
.env: &env
tags:
- redshift-docker-python
before_script:
......@@ -36,39 +34,29 @@ push_to_github:
- export PATH="$PYENV_ROOT/bin:$PATH"
- eval "$(pyenv init -)"
- pyenv shell $PYENV_PYTHON_VERSION
- export PATH=/opt/qt/5.9/5.9.4/gcc_64/bin:$PATH
- export DISPLAY=:99
.qt5: &qt5
tags:
- redshift-docker-python
before_script:
- export PATH=/opt/qt/5.9/5.9/gcc_64/bin:$PATH
build: &build
<<: *pyenv
stage: build
script:
- pip install -r requirements.txt
- python gen_resources.py
- python gen_translations.py --lrelease
- python setup.py sdist bdist_wheel
- py.test
test:
<<: *pyenv
stage: test
build_and_test: &build_and_test
<<: *env
stage: build_and_test
script:
- pip install coveralls
- pip install wheel
- pip install pytest-cov
- pip install -r requirements.txt
- python gen_resources.py
- python gen_translations.py --lrelease
- python setup.py bdist_wheel
- py.test --cov=sakia tests/
releases:
<<: *pyenv
<<: *env
stage: release
when: manual
script:
- pip install -r requirements.txt
- pip install wheel
- pip install twine
- python setup.py sdist bdist_wheel
- python setup.py bdist_wheel
- twine upload dist/* --username duniter --password $PYPI_PASSWORD
README.md
+ 2
− 3
View file @ 84944ad8
......@@ -3,11 +3,10 @@
![sakia logo](https://raw.github.com/duniter/sakia/master/sakia.png)
# Sakia
[![Coverage Status](https://coveralls.io/repos/duniter/sakia/badge.svg?branch=dev)](https://coveralls.io/r/duniter/sakia)
[![coverage report](https://git.duniter.org/clients/python/sakia/badges/gitlab/coverage.svg)](https://git.duniter.org/clients/python/sakia/commits/gitlab)
[![pipeline status](https://git.duniter.org/clients/python/sakia/badges/gitlab/pipeline.svg)](https://git.duniter.org/clients/python/sakia/commits/gitlab)
[![Build Status](https://travis-ci.org/duniter/sakia.svg?branch=travis)](https://travis-ci.org/duniter/sakia)
[![Build status](https://ci.appveyor.com/api/projects/status/pvl18xon8pvu2c8w/branch/dev?svg=true)](https://ci.appveyor.com/project/Insoleet/sakia-bee4m/branch/dev)
[![Translation status](http://weblate.duniter.org/widgets/sakia/-/svg-badge.svg)](http://weblate.duniter.org/engage/sakia/?utm_source=widget)
[![Code Issues](https://www.quantifiedcode.com/api/v1/project/3fff212226eb4027a586bc32e32d909b/badge.svg)](https://www.quantifiedcode.com/app/project/3fff212226eb4027a586bc32e32d909b)
========
......
ci/travis/before_install.sh
+ 1
− 1
View file @ 84944ad8
......@@ -29,7 +29,7 @@ then
dbus-x11
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
./qt-opensource-linux-x64-5.9.4.run -v --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
......
ci/travis/qt-installer-noninteractive.qs
+ 2
− 2
View file @ 84944ad8
......@@ -26,9 +26,9 @@ Controller.prototype.TargetDirectoryPageCallback = function()
}
Controller.prototype.ComponentSelectionPageCallback = function() {
//var widget = gui.currentPageWidget();
var widget = gui.currentPageWidget();
//widget.selectAll();
widget.selectAll();
gui.clickButton(buttons.NextButton);
}
......
src/sakia/constants.py
+ 2
− 2
View file @ 84944ad8
......@@ -3,8 +3,8 @@ import yaml
MAX_CONFIRMATIONS = 6
with open(os.path.join(os.path.dirname(__file__), "root_servers.yml"), 'r') as stream:
with open(os.path.join(os.path.dirname(__file__), "root_servers.yml"), 'r', encoding="utf-8") as stream:
ROOT_SERVERS = yaml.load(stream)
with open(os.path.join(os.path.dirname(__file__), "g1_licence.html"), 'r') as stream:
with open(os.path.join(os.path.dirname(__file__), "g1_licence.html"), 'r', encoding="utf-8") as stream:
G1_LICENCE = stream.read()
src/sakia/main.py
+ 1
− 0
View file @ 84944ad8
import locale
import asyncio
import logging
import signal
......
tests/conftest.py
+ 1
− 1
View file @ 84944ad8
......@@ -5,6 +5,7 @@ import sqlite3
import mirage
import sys
import os
import locale
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'src')))
......@@ -20,7 +21,6 @@ from sakia.services import DocumentsService
_application_ = []
@pytest.yield_fixture
def event_loop():
qapplication = get_application()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment