diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1482ffb1d08624a1dfbf61925c9e82207b878a4b..b5ef70a55a849976f7307f96b9984085e6bae64c 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 b0d53e4f92310688775138848c88157b57ab61e7..b98e1e6752d5fdc45af00096bebb414853579d67 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 bd76efd0dd6ed74934d823233ff9fe698b11c6d2..8d884357d315732341fca6e88f518609ce353bca 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):