From e2ae7a2b68eec9f14a2bebc3471777dcdc4e9736 Mon Sep 17 00:00:00 2001 From: Christoph Schmidt <christoph.,schmidt@tugraz.at> Date: Thu, 4 Jan 2024 15:00:24 +0100 Subject: [PATCH] Fixed logging issues. Optimized Imports. Released Version 1.0.0 --- pyproject.toml | 2 +- src/cmp/CBase.py | 2 -- src/cmp/CProcess.py | 6 +++--- src/cmp/CProcessControl.py | 9 ++------- src/cmp/CProperty.py | 3 --- src/cmp/CResultRecord.py | 1 - src/cmp/__init__.py | 6 +----- 7 files changed, 7 insertions(+), 22 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 167365c..0772872 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "cmp" -version = "0.2.0" +version = "1.0.0" authors = [ { name="Christoph Schmidt", email="cschmidt.fs@gmail.com" }, ] diff --git a/src/cmp/CBase.py b/src/cmp/CBase.py index 2966d2c..e4f872f 100644 --- a/src/cmp/CBase.py +++ b/src/cmp/CBase.py @@ -1,5 +1,4 @@ import logging -import time from rich.logging import RichHandler @@ -31,7 +30,6 @@ class CBase: """ formatter = logging.Formatter(logger_format) if logger_handler is None: - time.sleep(1) logger_handler = RichHandler(rich_tracebacks=True) logger_handler.setLevel(level) diff --git a/src/cmp/CProcess.py b/src/cmp/CProcess.py index 5a065f8..b9a0c05 100644 --- a/src/cmp/CProcess.py +++ b/src/cmp/CProcess.py @@ -1,15 +1,15 @@ -import logging.handlers import logging +import logging.handlers import multiprocessing import os -import sys import time import traceback -from multiprocessing import Process, Queue, Value +from multiprocessing import Process, Queue import cmp from cmp.CBase import CBase + # This is a Queue that behaves like stdout diff --git a/src/cmp/CProcessControl.py b/src/cmp/CProcessControl.py index 65f2433..6074f46 100644 --- a/src/cmp/CProcessControl.py +++ b/src/cmp/CProcessControl.py @@ -1,21 +1,16 @@ -import inspect +import logging import logging import logging.handlers import os import re -import signal import time -import traceback -from multiprocessing import Queue, Process, Value -from typing import Type +from multiprocessing import Queue, Value from PySide6.QtCore import QObject, QThreadPool, Signal from PySide6.QtGui import QWindow from PySide6.QtWidgets import QWidget, QMessageBox -from rich.logging import RichHandler import cmp -from cmp import CException from cmp.CBase import CBase diff --git a/src/cmp/CProperty.py b/src/cmp/CProperty.py index 9f7c597..9fef87b 100644 --- a/src/cmp/CProperty.py +++ b/src/cmp/CProperty.py @@ -1,6 +1,3 @@ -import datetime -from functools import wraps - import cmp diff --git a/src/cmp/CResultRecord.py b/src/cmp/CResultRecord.py index 0bf3742..ffadf2a 100644 --- a/src/cmp/CResultRecord.py +++ b/src/cmp/CResultRecord.py @@ -1,5 +1,4 @@ import logging -from inspect import Signature, Parameter from cmp import CProcessControl as CProcessControl diff --git a/src/cmp/__init__.py b/src/cmp/__init__.py index 9195dd6..c970e01 100644 --- a/src/cmp/__init__.py +++ b/src/cmp/__init__.py @@ -1,14 +1,10 @@ -import logging import os import sys -from rich.logging import RichHandler - from .CCommandRecord import CCommandRecord -from .CResultRecord import CResultRecord from .CException import CException - from .CProcess import CProcess from .CProcessControl import CProcessControl +from .CResultRecord import CResultRecord sys.path.append(os.path.join(os.path.dirname(__file__), '../')) -- GitLab