diff --git a/pyproject.toml b/pyproject.toml index 167365c4ac5ab4d4dfc200952b41d4c6558c114b..0772872513cb32dac04fa2c3223081884cc862fa 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 2966d2c8932040230822236b1823f2dfb3a177dd..e4f872f12b3cb4d499535abde9cc8b418a92c032 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 5a065f8dac3420dab083e5fa42978c22c8d5e051..b9a0c0524be36fc8f12b745a164ba0b3fa1fdc97 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 65f2433ead4247d47d81170d24535d5a22fe5122..6074f468fe8a1b7400ac092c3b025ee2af509a08 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 9f7c597b771b72a82455ab35af608e1782788074..9fef87bfcbd755426e1537bbdc07c0e96eb5fb0f 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 0bf374218d5e421f04a219963225232ac7c26bcd..ffadf2a9fa0755a3ef17d8d27b48c6cf08c71e9e 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 9195dd6eff14f87dd37e094db908a6059a636a05..c970e01fe7c70f6ac74de4ef26569f47fb4ebd7c 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__), '../'))