From 7f3182052ec131e3f11c19f92ebfb89615183acb Mon Sep 17 00:00:00 2001
From: Inso <insomniak.fr@gmail.com>
Date: Tue, 23 Dec 2014 23:01:00 +0100
Subject: [PATCH] Revert "Revert "Cutecoin 0.5 arrives !""
This reverts commit ebbbc39093a2ad96c85b3d1616fee2c6499582ed.
---
setup.py | 4 ++--
src/cutecoin/__init__.py | 18 ------------------
bin/cutecoin => src/cutecoin/main.py | 6 +-----
3 files changed, 3 insertions(+), 25 deletions(-)
rename bin/cutecoin => src/cutecoin/main.py (69%)
diff --git a/setup.py b/setup.py
index c19b45b4..d8fe0e3b 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,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')))
print(sys.path)
-includes = ["sip", "re", "json", "logging", "hashlib", "os", "urllib", "ucoinpy", "requests", "cutecoin.core"]
+includes = ["sip", "re", "json", "logging", "hashlib", "os", "urllib", "ucoinpy", "requests"]
excludes = []
packages = ["libnacl", "pylibscrypt"]
@@ -34,7 +34,7 @@ if sys.platform == "win32":
file_type=".exe"
target = Executable(
- script = "src/cutecoin/__init__.py",
+ script = "src/cutecoin/main.py",
targetName="cutecoin"+file_type,
base = base,
compress = False,
diff --git a/src/cutecoin/__init__.py b/src/cutecoin/__init__.py
index 573fb389..e69de29b 100644
--- a/src/cutecoin/__init__.py
+++ b/src/cutecoin/__init__.py
@@ -1,18 +0,0 @@
-'''
-Created on 1 févr. 2014
-
-@author: inso
-'''
-import sys
-from PyQt5.QtWidgets import QApplication, QDialog
-from cutecoin.gui.mainWindow import MainWindow
-from cutecoin.core.app import Application
-
-
-if __name__ == '__main__':
- cutecoin = QApplication(sys.argv)
- app = Application(sys.argv)
- window = MainWindow(app)
- window.show()
- sys.exit(cutecoin.exec_())
- pass
diff --git a/bin/cutecoin b/src/cutecoin/main.py
similarity index 69%
rename from bin/cutecoin
rename to src/cutecoin/main.py
index e8fa6c9d..873445e9 100755
--- a/bin/cutecoin
+++ b/src/cutecoin/main.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
"""
Created on 1 févr. 2014
@@ -9,8 +6,7 @@ Created on 1 févr. 2014
import signal
import sys
import os
-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')))
+
from PyQt5.QtWidgets import QApplication, QDialog
from cutecoin.gui.mainWindow import MainWindow
from cutecoin.core.app import Application
--
GitLab