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

Rename to sakia

parent 3fb275ae
No related branches found
No related tags found
No related merge requests found
...@@ -38,7 +38,7 @@ nosetests.xml ...@@ -38,7 +38,7 @@ nosetests.xml
.idea .idea
# Generated files # Generated files
src/cutecoin/gen_resources/* src/sakia/gen_resources/*
src/icons_rc.py src/icons_rc.py
src/i18n_rc.py src/i18n_rc.py
res/i18n/qm res/i18n/qm
......
...@@ -40,7 +40,7 @@ before_install: ...@@ -40,7 +40,7 @@ before_install:
- export PATH="$HOME/miniconda/bin:$PATH" - export PATH="$HOME/miniconda/bin:$PATH"
- hash -r - hash -r
- conda config --set always_yes yes --set changeps1 no - conda config --set always_yes yes --set changeps1 no
- conda config --add channels inso/channel/cutecoin - conda config --add channels inso/channel/sakia
- conda config --add channels pyzo - conda config --add channels pyzo
- conda update -q conda - conda update -q conda
# Useful for debugging any issues with conda # Useful for debugging any issues with conda
...@@ -68,7 +68,7 @@ script: ...@@ -68,7 +68,7 @@ script:
- export QT_QPA_PLATFORM_PLUGIN_PATH=$HOME/miniconda/envs/test-environment/lib/qt5/plugins/platforms; - export QT_QPA_PLATFORM_PLUGIN_PATH=$HOME/miniconda/envs/test-environment/lib/qt5/plugins/platforms;
- export QT_PLUGIN_PATH=$HOME/miniconda/envs/test-environment/lib/qt5/plugins - export QT_PLUGIN_PATH=$HOME/miniconda/envs/test-environment/lib/qt5/plugins
- export QT_XKB_CONFIG_ROOT=/usr/share/X11/xkb - export QT_XKB_CONFIG_ROOT=/usr/share/X11/xkb
- coverage run --source=cutecoin.core,cutecoin.gui,cutecoin.models run_tests.py - coverage run --source=sakia.core,sakia.gui,sakia.models run_tests.py
after_success: after_success:
- coverage -rm - coverage -rm
......
<!-- Landscape | [![Code Health](https://landscape.io/github/ucoin-io/cutecoin/dev/landscape.svg?style=flat)](https://landscape.io/github/ucoin-io/cutecoin/dev) --> <!-- Landscape | [![Code Health](https://landscape.io/github/ucoin-io/sakia/dev/landscape.svg?style=flat)](https://landscape.io/github/ucoin-io/sakia/dev) -->
![cutecoin logo](https://raw.github.com/ucoin-io/cutecoin/master/cutecoin.png) ![sakia logo](https://raw.github.com/ucoin-io/sakia/master/sakia.png)
Cutecoin [![Coverage Status](https://coveralls.io/repos/ucoin-io/cutecoin/badge.svg?branch=dev)](https://coveralls.io/r/ucoin-io/cutecoin) [![Build Status](https://travis-ci.org/ucoin-io/cutecoin.svg?branch=travis)](https://travis-ci.org/ucoin-io/cutecoin) [![Build status](https://ci.appveyor.com/api/projects/status/0wmo0rk5mds5t3lr/branch/dev)](https://ci.appveyor.com/project/Insoleet/cutecoin/branch/dev) [![Translation status](http://weblate.ucoin.io/widgets/cutecoin/-/svg-badge.svg)](http://weblate.ucoin.io/engage/cutecoin/?utm_source=widget) sakia [![Coverage Status](https://coveralls.io/repos/ucoin-io/sakia/badge.svg?branch=dev)](https://coveralls.io/r/ucoin-io/sakia) [![Build Status](https://travis-ci.org/ucoin-io/sakia.svg?branch=travis)](https://travis-ci.org/ucoin-io/sakia) [![Build status](https://ci.appveyor.com/api/projects/status/0wmo0rk5mds5t3lr/branch/dev)](https://ci.appveyor.com/project/Insoleet/sakia/branch/dev) [![Translation status](http://weblate.ucoin.io/widgets/sakia/-/svg-badge.svg)](http://weblate.ucoin.io/engage/sakia/?utm_source=widget)
======== ========
Qt Client for [uCoin](http://www.ucoin.io) project. Qt Client for [uCoin](http://www.ucoin.io) project.
...@@ -29,7 +29,7 @@ Qt Client for [uCoin](http://www.ucoin.io) project. ...@@ -29,7 +29,7 @@ Qt Client for [uCoin](http://www.ucoin.io) project.
* Multiple wallets management * Multiple wallets management
### How to build ### How to build
* __git clone --recursive https://github.com/ucoin-io/cutecoin.git__ * __git clone --recursive https://github.com/ucoin-io/sakia.git__
* Dependencies : * Dependencies :
* [python3](https://www.python.org/downloads/) * [python3](https://www.python.org/downloads/)
* [cx_freeze for python 3](http://cx-freeze.sourceforge.net/) * [cx_freeze for python 3](http://cx-freeze.sourceforge.net/)
...@@ -40,16 +40,16 @@ Qt Client for [uCoin](http://www.ucoin.io) project. ...@@ -40,16 +40,16 @@ Qt Client for [uCoin](http://www.ucoin.io) project.
* __pip install libnacl__ * __pip install libnacl__
* __pip install requests__ * __pip install requests__
* __pip install base58__ * __pip install base58__
* Run __python3 gen_resources.py__ in cutecoin folder * Run __python3 gen_resources.py__ in sakia folder
* Run __python3 gen_translations.py__ in cutecoin folder * Run __python3 gen_translations.py__ in sakia folder
* Run __python3 setup.py build__ in cutecoin folder * Run __python3 setup.py build__ in sakia folder
* The executable is generated in "build" folder, named "cutecoin" * The executable is generated in "build" folder, named "sakia"
### Download latest release ### Download latest release
* Go to [current release](https://github.com/ucoin-io/cutecoin/release) * Go to [current release](https://github.com/ucoin-io/sakia/release)
* Download corresponding package to your operating system * Download corresponding package to your operating system
* Unzip and start "cutecoin" :) * Unzip and start "sakia" :)
* Join our beta community by contacting us on [uCoin forum](http://forum.ucoin.io/) * Join our beta community by contacting us on [uCoin forum](http://forum.ucoin.io/)
## License ## License
This software is distributed under [GNU GPLv3](https://raw.github.com/ucoin-io/cutecoin/dev/LICENSE). This software is distributed under [GNU GPLv3](https://raw.github.com/ucoin-io/sakia/dev/LICENSE).
...@@ -28,7 +28,7 @@ install: ...@@ -28,7 +28,7 @@ install:
- "SET QT_QPA_PLATFORM_PLUGIN_PATH=%PYTHON%\\envs\\test-environment\\Scripts\\plugins" - "SET QT_QPA_PLATFORM_PLUGIN_PATH=%PYTHON%\\envs\\test-environment\\Scripts\\plugins"
- choco install -y vcredist2013 - choco install -y vcredist2013
- "%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/cutecoin" - "%CMD_IN_ENV% conda config --add channels inso/channel/sakia"
- "%CMD_IN_ENV% conda config --add channels pyzo" - "%CMD_IN_ENV% conda config --add channels pyzo"
- "%CMD_IN_ENV% conda create -q -n test-environment python=%PYTHON_VERSION% cx_freeze pyqt5 libsodium=1.0.3" - "%CMD_IN_ENV% conda create -q -n test-environment python=%PYTHON_VERSION% cx_freeze pyqt5 libsodium=1.0.3"
...@@ -41,14 +41,14 @@ build_script: ...@@ -41,14 +41,14 @@ build_script:
artifacts: artifacts:
- path: build - path: build
name: Cutecoin-win$(PYTHON_ARCH) name: sakia-win$(PYTHON_ARCH)
# upload to releases # upload to releases
deploy: deploy:
release: Cutecoin $(APPVEYOR_REPO_TAG_NAME) release: sakia $(APPVEYOR_REPO_TAG_NAME)
provider: GitHub provider: GitHub
auth_token: auth_token:
secure: wbzlh6nx1zY1J1avlB0C3hKGm1abFNHBdM60u/U09i5Nam//D6kazvnv5ZBKdR89 secure: wbzlh6nx1zY1J1avlB0C3hKGm1abFNHBdM60u/U09i5Nam//D6kazvnv5ZBKdR89
artifact: Cutecoin-win$(PYTHON_ARCH) artifact: sakia-win$(PYTHON_ARCH)
draft: true draft: true
prerelease: true prerelease: true
on: on:
......
cutecoin.ico

13.6 KiB

cutecoin.png

13 KiB

File deleted
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
import sys, os, multiprocessing, subprocess import sys, os, multiprocessing, subprocess
resources = os.path.abspath(os.path.join(os.path.dirname(__file__), 'res')) resources = os.path.abspath(os.path.join(os.path.dirname(__file__), 'res'))
gen_ui = os.path.abspath(os.path.join(os.path.dirname(__file__), 'src', 'cutecoin', 'gen_resources')) gen_ui = os.path.abspath(os.path.join(os.path.dirname(__file__), 'src', 'sakia', 'gen_resources'))
gen_resources = os.path.abspath(os.path.join(os.path.dirname(__file__), 'src')) gen_resources = os.path.abspath(os.path.join(os.path.dirname(__file__), 'src'))
def convert_ui(args, **kwargs): def convert_ui(args, **kwargs):
......
This diff is collapsed.
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<file alias="add_community">noun_139613_cc.svg</file> <file alias="add_community">noun_139613_cc.svg</file>
<file alias="connect_icon">noun_152997_cc.svg</file> <file alias="connect_icon">noun_152997_cc.svg</file>
<file alias="home_icon">iconmonstr-home-icon.svg</file> <file alias="home_icon">iconmonstr-home-icon.svg</file>
<file alias="cutecoin_logo">logo.svg</file> <file alias="sakia_logo">logo.svg</file>
<file alias="add_account_icon">noun_7440_cc.svg</file> <file alias="add_account_icon">noun_7440_cc.svg</file>
<file alias="ucoin_info_icon">noun_76373_cc.svg</file> <file alias="ucoin_info_icon">noun_76373_cc.svg</file>
<file alias="import_icon">noun_62479_cc.svg</file> <file alias="import_icon">noun_62479_cc.svg</file>
......
This diff is collapsed.
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<customwidget> <customwidget>
<class>WotView</class> <class>WotView</class>
<extends>QGraphicsView</extends> <extends>QGraphicsView</extends>
<header>cutecoin.gui.views.wot</header> <header>sakia.gui.views.wot</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
......
...@@ -16,7 +16,7 @@ sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), 'lib'))) ...@@ -16,7 +16,7 @@ sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), 'lib')))
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), 'src'))) sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), 'src')))
try: try:
print("Run") print("Run")
runner = unittest.TextTestRunner().run(unittest.defaultTestLoader.discover(start_dir='cutecoin.tests', pattern='test_*')) runner = unittest.TextTestRunner().run(unittest.defaultTestLoader.discover(start_dir='sakia.tests', pattern='test_*'))
finally: finally:
print("Terminate") print("Terminate")
os.kill(p.pid, signal.SIGINT) os.kill(p.pid, signal.SIGINT)
......
sakia.ico 0 → 100644
sakia.ico

176 KiB

sakia.png 0 → 100644
sakia.png

176 KiB

...@@ -99,15 +99,15 @@ options = {"path": sys.path, ...@@ -99,15 +99,15 @@ options = {"path": sys.path,
# preparation des cibles # preparation des cibles
base = None base = None
file_type="" file_type=""
icon="cutecoin.png" icon="sakia.png"
if sys.platform == "win32": if sys.platform == "win32":
base = "Win32GUI" base = "Win32GUI"
file_type=".exe" file_type=".exe"
icon="cutecoin.ico" icon="sakia.ico"
target = Executable( target = Executable(
script = "src/cutecoin/main.py", script = "src/sakia/main.py",
targetName="cutecoin"+file_type, targetName="sakia"+file_type,
base = base, base = base,
icon = icon, icon = icon,
) )
...@@ -115,7 +115,7 @@ target = Executable( ...@@ -115,7 +115,7 @@ target = Executable(
############################################################################# #############################################################################
# creation du setup # creation du setup
setup( setup(
name = "cutecoin", name = "sakia",
version = "0.11", version = "0.11",
description = "UCoin client", description = "UCoin client",
author = "Inso", author = "Inso",
......
"""
Created on 11 mars 2014
@author: inso
"""
File moved
File moved
...@@ -45,10 +45,10 @@ class Account(QObject): ...@@ -45,10 +45,10 @@ class Account(QObject):
is OK by comparing (salt, given_passwd) = (pubkey, privkey) \ is OK by comparing (salt, given_passwd) = (pubkey, privkey) \
with known pubkey with known pubkey
:param str name: The account name, same as network identity uid :param str name: The account name, same as network identity uid
:param list of cutecoin.core.Community communities: Community objects referenced by this account :param list of sakia.core.Community communities: Community objects referenced by this account
:param list of cutecoin.core.Wallet wallets: Wallet objects owned by this account :param list of sakia.core.Wallet wallets: Wallet objects owned by this account
:param list of dict contacts: Contacts of this account :param list of dict contacts: Contacts of this account
:param cutecoin.core.registry.IdentitiesRegistry: The identities registry intance :param sakia.core.registry.IdentitiesRegistry: The identities registry intance
.. warnings:: The class methods create and load should be used to create an account .. warnings:: The class methods create and load should be used to create an account
""" """
...@@ -82,10 +82,10 @@ class Account(QObject): ...@@ -82,10 +82,10 @@ class Account(QObject):
def load(cls, json_data, identities_registry): def load(cls, json_data, identities_registry):
""" """
Factory method to create an Account object from its json view. Factory method to create an Account object from its json view.
:rtype : cutecoin.core.account.Account :rtype : sakia.core.account.Account
:param dict json_data: The account view as a json dict :param dict json_data: The account view as a json dict
:param PyQt5.QtNetwork import QNetworkManager: network_manager :param PyQt5.QtNetwork import QNetworkManager: network_manager
:param cutecoin.core.registry.self._identities_registry: identities_registry :param sakia.core.registry.self._identities_registry: identities_registry
:return: A new account object created from the json datas :return: A new account object created from the json datas
""" """
salt = json_data['salt'] salt = json_data['salt']
...@@ -244,9 +244,9 @@ class Account(QObject): ...@@ -244,9 +244,9 @@ class Account(QObject):
def identity(self, community): def identity(self, community):
""" """
Get the account identity in the specified community Get the account identity in the specified community
:param cutecoin.core.community.Community community: The community where to look after the identity :param sakia.core.community.Community community: The community where to look after the identity
:return: The account identity in the community :return: The account identity in the community
:rtype: cutecoin.core.registry.Identity :rtype: sakia.core.registry.Identity
""" """
identity = yield from self._identities_registry.future_find(self.pubkey, community) identity = yield from self._identities_registry.future_find(self.pubkey, community)
if identity.local_state == LocalState.NOT_FOUND: if identity.local_state == LocalState.NOT_FOUND:
...@@ -314,7 +314,7 @@ class Account(QObject): ...@@ -314,7 +314,7 @@ class Account(QObject):
def check_registered(self, community): def check_registered(self, community):
""" """
Checks for the pubkey and the uid of an account in a community Checks for the pubkey and the uid of an account in a community
:param cutecoin.core.Community community: The community we check for registration :param sakia.core.Community community: The community we check for registration
:return: (True if found, local value, network value) :return: (True if found, local value, network value)
""" """
def _parse_uid_certifiers(data): def _parse_uid_certifiers(data):
...@@ -472,7 +472,7 @@ class Account(QObject): ...@@ -472,7 +472,7 @@ class Account(QObject):
Certify an other identity Certify an other identity
:param str password: The account SigningKey password :param str password: The account SigningKey password
:param cutecoin.core.community.Community community: The community target of the certification :param sakia.core.community.Community community: The community target of the certification
:param str pubkey: The certified identity pubkey :param str pubkey: The certified identity pubkey
""" """
logging.debug("Certdata") logging.debug("Certdata")
...@@ -512,7 +512,7 @@ class Account(QObject): ...@@ -512,7 +512,7 @@ class Account(QObject):
Revoke self-identity on server, not in blockchain Revoke self-identity on server, not in blockchain
:param str password: The account SigningKey password :param str password: The account SigningKey password
:param cutecoin.core.community.Community community: The community target of the revocation :param sakia.core.community.Community community: The community target of the revocation
""" """
revoked = yield from self._identities_registry.future_find(self.pubkey, community) revoked = yield from self._identities_registry.future_find(self.pubkey, community)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment