removed mock from setup.py.in as its not needed in python3, added formal script to run coretk gui and remove main line from core/gui/app.py

This commit is contained in:
Blake Harnden 2019-12-19 11:32:59 -08:00
parent 105825808d
commit 793d340668
5 changed files with 17 additions and 14 deletions

View file

@ -5,7 +5,7 @@ verify_ssl = true
[scripts] [scripts]
core = "python scripts/core-daemon -f data/core.conf -l data/logging.conf" core = "python scripts/core-daemon -f data/core.conf -l data/logging.conf"
coretk = "python core/gui/app.py" coretk = "python scripts/coretk-gui"
test = "pytest -v tests" test = "pytest -v tests"
test-mock = "pytest -v --mock tests" test-mock = "pytest -v --mock tests"
test-emane = "pytest -v tests/emane" test-emane = "pytest -v tests/emane"

View file

@ -1,4 +1,3 @@
import logging
import tkinter as tk import tkinter as tk
from tkinter import ttk from tkinter import ttk
@ -96,12 +95,3 @@ class Application(tk.Frame):
def close(self): def close(self):
self.master.destroy() self.master.destroy()
if __name__ == "__main__":
log_format = "%(asctime)s - %(levelname)s - %(module)s:%(funcName)s - %(message)s"
logging.basicConfig(level=logging.DEBUG, format=log_format)
Images.load_all()
appconfig.check_directory()
app = Application()
app.mainloop()

View file

@ -356,7 +356,7 @@ class CanvasGraph(tk.Canvas):
return return
# edge dst must be a node # edge dst must be a node
logging.debug(f"current selected: {self.selected}") logging.debug("current selected: %s", self.selected)
dst_node = self.nodes.get(self.selected) dst_node = self.nodes.get(self.selected)
if not dst_node: if not dst_node:
edge.delete() edge.delete()
@ -631,7 +631,7 @@ class CanvasGraph(tk.Canvas):
selected = self.get_selected(event) selected = self.get_selected(event)
canvas_node = self.nodes.get(selected) canvas_node = self.nodes.get(selected)
if canvas_node: if canvas_node:
logging.debug(f"node context: {selected}") logging.debug("node context: %s", selected)
self.context = canvas_node.create_context() self.context = canvas_node.create_context()
self.context.post(event.x_root, event.y_root) self.context.post(event.x_root, event.y_root)
else: else:

14
daemon/scripts/coretk-gui Executable file
View file

@ -0,0 +1,14 @@
#!/usr/bin/env python
import logging
from core.gui import appconfig
from core.gui.app import Application
from core.gui.images import Images
if __name__ == "__main__":
log_format = "%(asctime)s - %(levelname)s - %(module)s:%(funcName)s - %(message)s"
logging.basicConfig(level=logging.DEBUG, format=log_format)
Images.load_all()
appconfig.check_directory()
app = Application()
app.mainloop()

View file

@ -45,7 +45,6 @@ setup(
], ],
tests_require=[ tests_require=[
"pytest", "pytest",
"mock",
], ],
data_files=data_files, data_files=data_files,
scripts=glob.glob("scripts/*"), scripts=glob.glob("scripts/*"),