From ad103e75b12791d602a97d8decd8a416efa69b9d Mon Sep 17 00:00:00 2001
From: inso <insomniak.fr@gmaiL.com>
Date: Fri, 1 Jun 2018 18:18:28 +0200
Subject: [PATCH] Fix gitlab
---
.gitlab-ci.yml | 2 ++
setup.py | 8 --------
src/sakia/gui/dialogs/connection_cfg/view.py | 2 +-
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1482ffb1..b5ef70a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,5 +58,7 @@ releases:
- pip install -r requirements.txt
- pip install wheel
- pip install twine
+ - python gen_resources.py
+ - python gen_translations.py --lrelease
- python setup.py bdist_wheel
- twine upload dist/* --username duniter --password $PYPI_PASSWORD
diff --git a/setup.py b/setup.py
index b0d53e4f..b98e1e67 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,6 @@
from setuptools import setup, find_packages
import os
import re
-import subprocess
import sys
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), 'src')))
import sakia
@@ -31,13 +30,6 @@ def which(program):
path = os.path.abspath(os.path.join(os.path.dirname(__file__)))
-subprocess.call(
- "python {0}/gen_resources.py".format(path), shell=True
-)
-subprocess.call(
- "python {0}/gen_translations.py".format(path), shell=True
-)
-
EDITABLE_REQUIREMENT = re.compile(r'^-e (?P<link>(?P<vcs>git|svn|hg|bzr).+#egg=(?P<package>.+)-(?P<version>\d(?:\.\d)*))$')
install_requires = []
diff --git a/src/sakia/gui/dialogs/connection_cfg/view.py b/src/sakia/gui/dialogs/connection_cfg/view.py
index bd76efd0..8d884357 100644
--- a/src/sakia/gui/dialogs/connection_cfg/view.py
+++ b/src/sakia/gui/dialogs/connection_cfg/view.py
@@ -133,7 +133,7 @@ class ConnectionConfigView(QDialog, Ui_ConnectionConfigurationDialog):
def action_show_pubkey(self):
salt = self.edit_salt.text()
password = self.edit_password.text()
- pubkey = SigningKey(salt, password, self.scrypt_params).pubkey
+ pubkey = SigningKey(salt, password, self.scrypt_params).pubkey.decode("utf-8")
self.label_info.setText(pubkey)
def account_name(self):
--
GitLab