Squashed commit of the following:

commit 7f0b8dc6
Author: Inso <insomniak.fr@gmail.com>
Date:   Sun Dec 20 00:08:14 2015 +0100

    Cp python to build dir

commit d1f4decf
Author: Inso <insomniak.fr@gmail.com>
Date:   Sat Dec 19 22:18:51 2015 +0100

    Test deploy

commit 6330616d
Author: Inso <insomniak.fr@gmail.com>
Date:   Sat Dec 19 22:04:40 2015 +0100

    Remove jsonschema

commit 93f898c9
Author: Inso <insomniak.fr@gmail.com>
Date:   Sat Dec 19 21:56:46 2015 +0100

    Include jsonschema in main

commit dc1dd3fb
Author: Inso <insomniak.fr@gmail.com>
Date:   Sat Dec 19 21:46:22 2015 +0100

    Include libsodium

commit a252de97
Author: Inso <insomniak.fr@gmail.com>
Date:   Sat Dec 19 20:40:15 2015 +0100

    With notify2

commit 113e02bd
Author: Inso <insomniak.fr@gmail.com>
Date:   Sat Dec 19 17:27:58 2015 +0100

    No need of qt-menu-nib

commit 3e40dc4f
Author: Inso <insomniak.fr@gmail.com>
Date:   Sat Dec 19 17:21:40 2015 +0100

    Try with python 3.4.3

commit 53d0cdaf
Author: Inso <insomniak.fr@gmail.com>
Date:   Sat Dec 19 17:12:29 2015 +0100

    Fix cx_Freeze

commit 0949c99d
Author: Inso <insomniak.fr@gmail.com>
Date:   Sat Dec 19 17:06:04 2015 +0100

    Set qt-menu.nib and fix tests

commit 2812a721
Author: Inso <insomniak.fr@gmail.com>
Date:   Sat Dec 19 16:51:58 2015 +0100

    Try with cx_Freeze sources

commit 4ca6ff53
Author: Inso <insomniak.fr@gmail.com>
Date:   Sat Dec 19 15:45:53 2015 +0100

    Remove one line conditionals

commit e37f0b67
Author: Inso <insomniak.fr@gmail.com>
Date:   Sat Dec 19 15:28:21 2015 +0100

    Enhance test script

commit eb8f3b27
Author: Inso <insomniak.fr@gmail.com>
Date:   Sat Dec 19 14:34:20 2015 +0100

    Fix multi os

commit 91541c96
Author: Inso <insomniak.fr@gmail.com>
Date:   Sat Dec 19 11:28:51 2015 +0100

    Build PyQt5 on trusty

commit a0804954
Author: Inso <insomniak.fr@gmail.com>
Date:   Sat Dec 19 11:20:58 2015 +0100

    -y switch

commit c79294ba
Author: Inso <insomniak.fr@gmail.com>
Date:   Sat Dec 19 11:06:55 2015 +0100

    Remove libxcbsync0

commit 597ba7fc
Author: Inso <insomniak.fr@gmail.com>
Date:   Sat Dec 19 11:03:27 2015 +0100

    Fix .travis.yml

commit 767bd54f
Author: Inso <insomniak.fr@gmail.com>
Date:   Sat Dec 19 11:01:38 2015 +0100

    Update apt

commit 1ab5d993
Author: Inso <insomniak.fr@gmail.com>
Date:   Sat Dec 19 10:56:01 2015 +0100

    Build on dist travis

commit 698ffa90
Author: Inso <insomniak.fr@gmail.com>
Date:   Sat Dec 19 10:29:57 2015 +0100

    Deploy multi os

commit b147d16e
Author: Inso <insomniak.fr@gmail.com>
Date:   Sat Dec 19 10:13:49 2015 +0100

    Deploy only dmg file

commit 5a1153d3
Author: Inso <insomniak.fr@gmail.com>
Date:   Sat Dec 19 09:01:08 2015 +0100

    Add missing file

commit 4115e1e1
Author: Inso <insomniak.fr@gmail.com>
Date:   Sat Dec 19 00:14:50 2015 +0100

    Fix build scripts

commit 5f9e8b35
Author: Inso <insomniak.fr@gmail.com>
Date:   Fri Dec 18 23:47:22 2015 +0100

    Add missing file

commit eed7ed4d
Author: Inso <insomniak.fr@gmail.com>
Date:   Fri Dec 18 23:46:06 2015 +0100

    Build everything

commit d2cf9e66
Author: Inso <insomniak.fr@gmail.com>
Date:   Fri Dec 18 23:20:06 2015 +0100

    Enable after success to enable cache

commit ea52c7f8
Author: Inso <insomniak.fr@gmail.com>
Date:   Fri Dec 18 22:56:25 2015 +0100

    Build pyenv

commit 6185a661
Author: Inso <insomniak.fr@gmail.com>
Date:   Fri Dec 18 22:34:17 2015 +0100

    Build pyenv

commit dc59202d
Author: Inso <insomniak.fr@gmail.com>
Date:   Fri Dec 18 20:13:16 2015 +0100

    Remove alias

commit 2db19fef
Author: Inso <insomniak.fr@gmail.com>
Date:   Fri Dec 18 20:06:17 2015 +0100

    Finally ?

commit 2b0dc8fb
Author: Inso <insomniak.fr@gmail.com>
Date:   Fri Dec 18 19:32:12 2015 +0100

    Fix script syntax

commit 022cd0db
Author: Inso <insomniak.fr@gmail.com>
Date:   Fri Dec 18 19:30:16 2015 +0100

    Cache dependencies

commit 5d8f0919
Author: Inso <insomniak.fr@gmail.com>
Date:   Fri Dec 18 19:21:07 2015 +0100

    Fix pyenv version

commit 679fbf15
Author: Inso <insomniak.fr@gmail.com>
Date:   Fri Dec 18 19:16:58 2015 +0100

    Accept licence

commit 9caef707
Author: Inso <insomniak.fr@gmail.com>
Date:   Fri Dec 18 19:10:52 2015 +0100

    Builds

commit 90d1de9a
Author: Inso <insomniak.fr@gmail.com>
Date:   Fri Dec 18 19:08:22 2015 +0100

    Do not precise python version

commit 876f11c1
Author: Inso <insomniak.fr@gmail.com>
Date:   Fri Dec 18 19:00:39 2015 +0100

    Build on osx

commit 83dc1446
Author: Inso <insomniak.fr@gmail.com>
Date:   Fri Dec 18 18:57:37 2015 +0100

    Try to build on travis for osx

.travis.yml

-sudo: false
-language: python
-python:
-  # We don't actually use the Travis Python, but this keeps it organized.
-  - "3.4"
-addons:
-  apt:
-    packages:
-    - libxcb1
-    - libxcb1-dev
-    - libx11-xcb1
-    - libx11-xcb-dev
-    - libxcb-keysyms1
-    - libxcb-keysyms1-dev
-    - libxcb-image0
-    - libxcb-image0-dev
-    - libxcb-shm0
-    - libxcb-shm0-dev
-    - libxcb-icccm4
-    - libxcb-icccm4-dev
-    - libxcb-sync0
-    - libxcb-sync0-dev
-    - 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-dev
+os: linux
+matrix:
+  include:
+    - os: osx
+    - dist: trusty
+      sudo: required
+  exclude:
+    - os: linux
 
-before_install:
-  # Update
-  - pwd
-  # Install and configure conda
-  - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
-  - bash miniconda.sh -b -p $HOME/miniconda
-  - export PATH="$HOME/miniconda/bin:$PATH"
-  - hash -r
-  - conda config --set always_yes yes --set changeps1 no
-  - conda config --add channels inso/channel/sakia
-  - conda config --add channels pyzo
-  - conda update -q conda
-  # Useful for debugging any issues with conda
-  - conda info -a
+env:
+- PYENV_PYTHON_VERSION=3.4.3
 
+before_install:
+- ci/travis/before_install.sh
 install:
-  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION cx_freeze pyqt5 libpng=1.5.13 libsodium=1.0.3
-  - source activate test-environment
-  - ldd $HOME/miniconda/envs/test-environment/lib/qt5/plugins/platforms/*.so
-  - pip install coveralls
-  - pip install -r requirements.txt
-  - python gen_resources.py
-  - python gen_translations.py
-  - python setup.py build
-
-before_script:
- # screen must be 24bpp otherwise pyqt5 crashes
- # see: https://github.com/pytest-dev/pytest-qt/issues/35
-  - export XVFBARGS="-screen 0 1280x1024x24"
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-  - sleep 3
-
+- ci/travis/build.sh
 script:
-  - 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_XKB_CONFIG_ROOT=/usr/share/X11/xkb
-  - coverage run --source=sakia.core,sakia.gui,sakia.models run_tests.py
-
+- ci/travis/test.sh
 after_success:
-  - coverage -rm
-  - coveralls
+- ci/travis/after_success.sh
+before_deploy:
+- ci/travis/before_deploy.sh
+
+deploy:
+  provider: releases
+  api_key:
+    secure: MUdvTDBeCxO9d/EpzIhr+QYra/KxgYkXX6177SjqWCWDqw9xB3fwSUj8I9ht9DGtwVdadtveumtvLw3pbtVIR0GtIPC9pyvtNz4j6T4Ei3TSE6+StXdMK4NnInvPeTRlobGL+9sZt9MwheJwZ8YGewhBcR0F5UzVfxWeSSrxmyk=
+  file: sakia-${TRAVIS_OS_NAME}.zip
+  skip_cleanup: true
+  on:
+    tags: true

ci/travis/after_success.sh

+#!/usr/bin/env bash
+
+eval "$(pyenv init -)"
+eval "$(pyenv virtualenv-init -)"
+
+cd $HOME/build/ucoin-io/sakia
+pyenv activate sakia-env
+
+coverage -rm
+coveralls
\ No newline at end of file

ci/travis/before_deploy.sh

+#!/usr/bin/env bash
+
+if [ $TRAVIS_OS_NAME == "osx" ]
+then
+    zip -r sakia-${TRAVIS_OS_NAME}.zip build/*.dmg
+elif [ $TRAVIS_OS_NAME == "linux" ]
+then
+    zip -r sakia-${TRAVIS_OS_NAME}.zip build/exe*
+fi

ci/travis/before_install.sh

+#!/usr/bin/env bash
+
+if [ $TRAVIS_OS_NAME == "osx" ]
+then
+    brew update
+    brew install libsodium
+    ## Ensure your brew QT version is up to date. (brew install qt -> qt 4.8)
+    brew install qt5
+    brew link --force qt5
+    brew install pyenv-virtualenv
+elif [ $TRAVIS_OS_NAME == "linux" ]
+then
+    sudo apt-get update
+    sudo apt-get install -qq -y libxcb1 libxcb1-dev libx11-xcb1 libx11-xcb-dev libxcb-keysyms1 libxcb-keysyms1-dev libxcb-image0 \
+            libxcb-image0-dev libxcb-shm0 libxcb-shm0-dev libxcb-icccm4 libxcb-icccm4-dev \
+            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-dev \
+            curl qt5-qmake qtbase5-dev qttools5-dev-tools libqt5svg5-dev libdbus-1-dev libdbus-glib-1-dev autoconf automake libtool
+    wget http://archive.ubuntu.com/ubuntu/pool/universe/libs/libsodium/libsodium13_1.0.1-1_amd64.deb
+    sudo dpkg -i libsodium13_1.0.1-1_amd64.deb
+    curl -L https://raw.githubusercontent.com/yyuu/pyenv-installer/master/bin/pyenv-installer | bash
+fi
+
+eval "$(pyenv init -)"
+eval "$(pyenv virtualenv-init -)"
+
+pyenv activate sakia-env
+if [ $? -ne 0 ]
+then
+    echo "Sakia env cache cleared, rebuilding it..."
+    if [ $TRAVIS_OS_NAME == "osx" ]
+    then
+        env PYTHON_CONFIGURE_OPTS="--enable-framework" pyenv install $PYENV_PYTHON_VERSION
+    elif [ $TRAVIS_OS_NAME == "linux" ]
+    then
+        PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYENV_PYTHON_VERSION
+    fi
+
+    pyenv shell $PYENV_PYTHON_VERSION
+    pyenv virtualenv sakia-env
+
+    cd $HOME
+
+    wget http://sourceforge.net/projects/pyqt/files/sip/sip-4.17/sip-4.17.tar.gz
+    tar xzf sip-4.17.tar.gz
+    cd sip-4.17/
+    pyenv activate sakia-env
+    python configure.py
+    make && make install
+    pyenv rehash
+
+    cd $HOME
+
+    wget http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.5.1/PyQt-gpl-5.5.1.tar.gz
+    tar xzf PyQt-gpl-5.5.1.tar.gz
+    cd PyQt-gpl-5.5.1/
+    pyenv activate sakia-env
+    if [ $TRAVIS_OS_NAME == "osx" ]
+    then
+        python configure.py --confirm-license
+    elif [ $TRAVIS_OS_NAME == "linux" ]
+    then
+        python configure.py --qmake "/usr/lib/x86_64-linux-gnu/qt5/bin/qmake" --confirm-license
+    fi
+
+    make -j 2 && make install
+    pyenv rehash
+
+fi
\ No newline at end of file

ci/travis/build.sh

+#!/usr/bin/env bash
+
+eval "$(pyenv init -)"
+eval "$(pyenv virtualenv-init -)"
+
+cd $HOME/build/ucoin-io/sakia
+pyenv activate sakia-env
+pip install coveralls
+pip install cx_Freeze
+pip install -r requirements.txt
+if [ $TRAVIS_OS_NAME == "linux" ]
+then
+    pip install -U git+https://github.com/posborne/dbus-python.git
+    pip install notify2
+fi
+
+python gen_resources.py
+python gen_translations.py
+
+if [ $TRAVIS_OS_NAME == "osx" ]
+then
+    python setup.py bdist_dmg
+elif [ $TRAVIS_OS_NAME == "linux" ]
+then
+    python setup.py build
+    cp ~/.pyenv/versions/$PYENV_PYTHON_VERSION/lib/libpython3.*m.so.1.0 build/exe.linux-x86_64-3.4/
+fi
+

ci/travis/test.sh

+#!/usr/bin/env bash
+
+eval "$(pyenv init -)"
+eval "$(pyenv virtualenv-init -)"
+
+cd $HOME/build/ucoin-io/sakia
+pyenv activate sakia-env
+
+if [ $TRAVIS_OS_NAME == "linux" ]
+then
+    export XVFBARGS="-screen 0 1280x1024x24"
+    export DISPLAY=:99.0
+    sh -e /etc/init.d/xvfb start
+    sleep 3
+fi
+
+coverage run --source=sakia.core,sakia.gui,sakia.models run_tests.py
+

setup.py

@@ -16,7 +16,7 @@ includes = ["sip", "re", "json", "logging",
             "ucoinpy", "pylibscrypt", "aiohttp", "asyncio",
             "quamash", "jsonschema"]
 exclude = ['.git']
-packages = ["libnacl", "encodings", "jsonschema"]
+packages = ["libnacl", "encodings"]
 
 includefiles = []
 zipincludes = []
@@ -53,21 +53,24 @@ if sys.platform == "win32":
             includefiles.append((os.path.join(path, "Scripts", "plugins", "iconengines", f), os.path.join("iconengines", f) ))
     includefiles.append(libEGL_path)
     includefiles.append(libsodium_path)
-elif sys.platform == "darwin":
-    pass
 else:
-    libsodium_path = ""
-    print(QtCore.QCoreApplication.libraryPaths())
     schemas = os.path.join(site.getsitepackages()[0], "jsonschema", "schemas")
     onlyfiles = [ f for f in listdir(schemas) if isfile(join(schemas,f)) ]
     for f in onlyfiles:
         zipincludes.append((os.path.join(schemas, f), os.path.join("jsonschema", "schemas", f)))
 
-    # Check if we are in Conda env
-    if 'CONDA_ENV_PATH' in os.environ:
-        libsodium_path = os.path.join(os.environ['CONDA_ENV_PATH'], "lib",
-                                      "libsodium.so.13")
-        includefiles.append((libsodium_path, "libsodium.so.13"))
+if sys.platform == "darwin":
+    info = subprocess.check_output(["brew", "info", "libsodium"])
+    info = info.decode().splitlines(keepends=False)
+    if len(info) > 1:
+        library_path = info[3].split(" ")[0]
+        libsodium_path = os.path.join(library_path, "lib",
+                                      "libsodium.dylib")
+        includefiles.append(libsodium_path)
+        print(libsodium_path)
+    else:
+        print("Erreur : libsodium not found. Please install it with brew install libsodium.")
+
 
 
 print("Includes : ")
@@ -80,6 +83,7 @@ print("Zip files : ")
 print(zipincludes)
 print("Packages : ")
 print(packages)
+print("Sys.path : ")
 print(sys.path)
 
 options = {"path": sys.path,

src/sakia/gui/import_account.py

@@ -24,6 +24,7 @@ class ImportAccountDialog(QDialog, Ui_ImportAccountDialog):
         self.setupUi(self)
         self.app = app
         self.main_window = parent
+        self.selected_file = ""
         self.button_box.button(QDialogButtonBox.Ok).setEnabled(False)
 
     def accept(self):

src/sakia/main.py

@@ -10,6 +10,9 @@ import logging
 import os
 import traceback
 
+# To debug missing spec
+import jsonschema
+
 # To force cx_freeze import
 import PyQt5.QtSvg