From 48071453a3b048d90617791110cf2e1d908934a5 Mon Sep 17 00:00:00 2001 From: Inso <insomniak.fr@gmail.com> Date: Fri, 11 Dec 2015 19:12:21 +0100 Subject: [PATCH] Version 0.11.2 --- setup.py | 7 +------ src/sakia/__init__.py | 2 +- src/sakia/core/app.py | 9 --------- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/setup.py b/setup.py index 64b2d9bf..fb1a7ce1 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,3 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- - -# source d'inspiration: http://wiki.wxpython.org/cx_freeze - import sys, os, subprocess, multiprocessing, site from cx_Freeze import setup, Executable from PyQt5 import QtCore @@ -116,7 +111,7 @@ target = Executable( # creation du setup setup( name = "sakia", - version = "0.11.1", + version = "0.11.2", description = "UCoin client", author = "Inso", options = {"build_exe": options}, diff --git a/src/sakia/__init__.py b/src/sakia/__init__.py index b8029089..03e0055e 100644 --- a/src/sakia/__init__.py +++ b/src/sakia/__init__.py @@ -1,2 +1,2 @@ -__version_info__ = ('0', '11', '1') +__version_info__ = ('0', '11', '2') __version__ = '.'.join(__version_info__) diff --git a/src/sakia/core/app.py b/src/sakia/core/app.py index b8625c4b..34905892 100644 --- a/src/sakia/core/app.py +++ b/src/sakia/core/app.py @@ -278,19 +278,13 @@ class Application(QObject): if os.path.exists(network_path): with open(network_path, 'r') as json_data: data = json.load(json_data) - if 'version' in data and data['version'] == __version__: logging.debug("Merging network : {0}".format(data)) community.network.merge_with_json(data['network']) - else: - os.remove(network_path) if os.path.exists(bma_path): with open(bma_path, 'r') as json_data: data = json.load(json_data) - if 'version' in data and data['version'] == __version__: community.bma_access.load_from_json(data['cache']) - else: - os.remove(bma_path) for wallet in account.wallets: for c in account.communities: @@ -300,10 +294,7 @@ class Application(QObject): if os.path.exists(wallet_path): with open(wallet_path, 'r') as json_data: data = json.load(json_data) - if 'version' in data and data['version'] == __version__: wallet.load_caches(self, data) - else: - os.remove(wallet_path) def load_preferences(self): """ -- GitLab