From 9ad506a3139d6718654f10ce0e4e07ad7cd5155c Mon Sep 17 00:00:00 2001 From: UpstreamData Date: Fri, 13 May 2022 15:35:11 -0600 Subject: [PATCH] remove board util --- board_util.py | 4 -- make_board_tool_exe.py | 44 ------------------- .../__init__.py | 2 +- .../func/__init__.py | 0 .../func/decorators.py | 2 +- .../func/files.py | 6 +-- .../func/miners.py | 6 +-- .../func/pdf.py | 6 +-- .../func/ui.py | 2 +- .../img/__init__.py | 0 .../layout.py | 0 .../ui.py | 14 +++--- 12 files changed, 21 insertions(+), 65 deletions(-) delete mode 100644 board_util.py delete mode 100644 make_board_tool_exe.py rename tools/{bad_board_util => bad_board_util_old}/__init__.py (93%) rename tools/{bad_board_util => bad_board_util_old}/func/__init__.py (100%) rename tools/{bad_board_util => bad_board_util_old}/func/decorators.py (93%) rename tools/{bad_board_util => bad_board_util_old}/func/files.py (94%) rename tools/{bad_board_util => bad_board_util_old}/func/miners.py (98%) rename tools/{bad_board_util => bad_board_util_old}/func/pdf.py (98%) rename tools/{bad_board_util => bad_board_util_old}/func/ui.py (98%) rename tools/{bad_board_util => bad_board_util_old}/img/__init__.py (100%) rename tools/{bad_board_util => bad_board_util_old}/layout.py (100%) rename tools/{bad_board_util => bad_board_util_old}/ui.py (90%) diff --git a/board_util.py b/board_util.py deleted file mode 100644 index ab342455..00000000 --- a/board_util.py +++ /dev/null @@ -1,4 +0,0 @@ -from tools.bad_board_util import main - -if __name__ == "__main__": - main() diff --git a/make_board_tool_exe.py b/make_board_tool_exe.py deleted file mode 100644 index 36e9dd8e..00000000 --- a/make_board_tool_exe.py +++ /dev/null @@ -1,44 +0,0 @@ -""" -Make a build of the board tool. - -Usage: make_board_tool_exe.py build - -The build will show up in the build directory. -""" -import datetime -import sys -import os -from cx_Freeze import setup, Executable - -base = None -if sys.platform == "win32": - base = "Win32GUI" - -version = datetime.datetime.now() -version = version.strftime("%y.%m.%d") -print(version) - - -setup( - name="UpstreamBoardUtil.exe", - version=version, - description="Upstream Data Board Utility Build", - options={ - "build_exe": { - "build_exe": f"{os.getcwd()}\\build\\board_util\\UpstreamBoardUtil-{version}-{sys.platform}\\", - "include_files": [ - os.path.join(os.getcwd(), "settings/settings.toml"), - ], - "include_msvcr": True, - "add_to_path": True, - }, - }, - executables=[ - Executable( - "board_util.py", - base=base, - icon="icon.ico", - target_name="UpstreamBoardUtil.exe", - ) - ], -) diff --git a/tools/bad_board_util/__init__.py b/tools/bad_board_util_old/__init__.py similarity index 93% rename from tools/bad_board_util/__init__.py rename to tools/bad_board_util_old/__init__.py index c4df0632..2e104be9 100644 --- a/tools/bad_board_util/__init__.py +++ b/tools/bad_board_util_old/__init__.py @@ -1,4 +1,4 @@ -from tools.bad_board_util.ui import ui +from tools.bad_board_util_old.ui import ui import asyncio import sys diff --git a/tools/bad_board_util/func/__init__.py b/tools/bad_board_util_old/func/__init__.py similarity index 100% rename from tools/bad_board_util/func/__init__.py rename to tools/bad_board_util_old/func/__init__.py diff --git a/tools/bad_board_util/func/decorators.py b/tools/bad_board_util_old/func/decorators.py similarity index 93% rename from tools/bad_board_util/func/decorators.py rename to tools/bad_board_util_old/func/decorators.py index e591e879..b7fc8d4d 100644 --- a/tools/bad_board_util/func/decorators.py +++ b/tools/bad_board_util_old/func/decorators.py @@ -1,4 +1,4 @@ -from tools.bad_board_util.layout import window +from tools.bad_board_util_old.layout import window def disable_buttons(func): diff --git a/tools/bad_board_util/func/files.py b/tools/bad_board_util_old/func/files.py similarity index 94% rename from tools/bad_board_util/func/files.py rename to tools/bad_board_util_old/func/files.py index 00b2cd37..bd336a1d 100644 --- a/tools/bad_board_util/func/files.py +++ b/tools/bad_board_util_old/func/files.py @@ -5,9 +5,9 @@ import xlsxwriter import aiofiles -from tools.bad_board_util.func.ui import update_ui_with_data -from tools.bad_board_util.layout import window -from tools.bad_board_util.func.decorators import disable_buttons +from tools.bad_board_util_old.func.ui import update_ui_with_data +from tools.bad_board_util_old.layout import window +from tools.bad_board_util_old.func.decorators import disable_buttons from miners.miner_factory import MinerFactory diff --git a/tools/bad_board_util/func/miners.py b/tools/bad_board_util_old/func/miners.py similarity index 98% rename from tools/bad_board_util/func/miners.py rename to tools/bad_board_util_old/func/miners.py index b5f8ddaf..ba7934c7 100644 --- a/tools/bad_board_util/func/miners.py +++ b/tools/bad_board_util_old/func/miners.py @@ -2,14 +2,14 @@ import asyncio import ipaddress import warnings -from tools.bad_board_util.func.ui import ( +from tools.bad_board_util_old.func.ui import ( update_ui_with_data, update_prog_bar, set_progress_bar_len, ) -from tools.bad_board_util.layout import window +from tools.bad_board_util_old.layout import window from miners.miner_factory import MinerFactory -from tools.bad_board_util.func.decorators import disable_buttons +from tools.bad_board_util_old.func.decorators import disable_buttons @disable_buttons diff --git a/tools/bad_board_util/func/pdf.py b/tools/bad_board_util_old/func/pdf.py similarity index 98% rename from tools/bad_board_util/func/pdf.py rename to tools/bad_board_util_old/func/pdf.py index 72d81a5d..a98da86f 100644 --- a/tools/bad_board_util/func/pdf.py +++ b/tools/bad_board_util_old/func/pdf.py @@ -28,9 +28,9 @@ from matplotlib.ticker import FormatStrFormatter from miners.miner_factory import MinerFactory -from tools.bad_board_util.func.decorators import disable_buttons -from tools.bad_board_util.img import IMAGE_SELECTION_MATRIX, LOGO -from tools.bad_board_util.layout import window +from tools.bad_board_util_old.func.decorators import disable_buttons +from tools.bad_board_util_old.img import IMAGE_SELECTION_MATRIX, LOGO +from tools.bad_board_util_old.layout import window IP_STYLE = ParagraphStyle( "IP Style", diff --git a/tools/bad_board_util/func/ui.py b/tools/bad_board_util_old/func/ui.py similarity index 98% rename from tools/bad_board_util/func/ui.py rename to tools/bad_board_util_old/func/ui.py index 88c0800c..a3c21952 100644 --- a/tools/bad_board_util/func/ui.py +++ b/tools/bad_board_util_old/func/ui.py @@ -1,7 +1,7 @@ import ipaddress import re -from tools.bad_board_util.layout import window +from tools.bad_board_util_old.layout import window import pyperclip diff --git a/tools/bad_board_util/img/__init__.py b/tools/bad_board_util_old/img/__init__.py similarity index 100% rename from tools/bad_board_util/img/__init__.py rename to tools/bad_board_util_old/img/__init__.py diff --git a/tools/bad_board_util/layout.py b/tools/bad_board_util_old/layout.py similarity index 100% rename from tools/bad_board_util/layout.py rename to tools/bad_board_util_old/layout.py diff --git a/tools/bad_board_util/ui.py b/tools/bad_board_util_old/ui.py similarity index 90% rename from tools/bad_board_util/ui.py rename to tools/bad_board_util_old/ui.py index e3e50d32..80930d22 100644 --- a/tools/bad_board_util/ui.py +++ b/tools/bad_board_util_old/ui.py @@ -2,15 +2,19 @@ import asyncio import sys import PySimpleGUI as sg -from tools.bad_board_util.layout import window -from tools.bad_board_util.func.miners import ( +from tools.bad_board_util_old.layout import window +from tools.bad_board_util_old.func.miners import ( refresh_data, scan_and_get_data, miner_light, ) -from tools.bad_board_util.func.files import import_iplist, export_iplist -from tools.bad_board_util.func.pdf import save_report -from tools.bad_board_util.func.ui import sort_data, copy_from_table, table_select_all +from tools.bad_board_util_old.func.files import import_iplist, export_iplist +from tools.bad_board_util_old.func.pdf import save_report +from tools.bad_board_util_old.func.ui import ( + sort_data, + copy_from_table, + table_select_all, +) from network import MinerNetwork