From 3fdc316703b97e2dab8a1f5d9276d46bff044300 Mon Sep 17 00:00:00 2001 From: Ivan Maslov Date: Fri, 14 Oct 2022 16:07:46 +0300 Subject: [PATCH] requirements fixes + Reports > Logs folder --- Sources/pyOpenRPA/Orchestrator/SettingsTemplate.py | 8 ++++---- Sources/setup.py | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Sources/pyOpenRPA/Orchestrator/SettingsTemplate.py b/Sources/pyOpenRPA/Orchestrator/SettingsTemplate.py index 1a8b46f6..14d40e4e 100755 --- a/Sources/pyOpenRPA/Orchestrator/SettingsTemplate.py +++ b/Sources/pyOpenRPA/Orchestrator/SettingsTemplate.py @@ -331,8 +331,8 @@ def Create(inModeStr="BASIC", inLoggerLevel = None): lResult = __Create__() # Create settings # Создать файл логирования # add filemode="w" to overwrite - if not os.path.exists("Reports"): - os.makedirs("Reports") + if not os.path.exists("Logs"): + os.makedirs("Logs") ########################## # Подготовка логгера Robot ######################### @@ -342,7 +342,7 @@ def Create(inModeStr="BASIC", inLoggerLevel = None): lL.setLevel(logging.INFO) # create the logging file handler mRobotLoggerFH = logging.FileHandler( - CrossOS.PathStr("Reports\\" + datetime.datetime.now().strftime("%Y_%m_%d") + ".log")) + CrossOS.PathStr("Logs\\" + datetime.datetime.now().strftime("%Y_%m_%d") + ".log")) mRobotLoggerFormatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s') mRobotLoggerFH.setFormatter(mRobotLoggerFormatter) # add handler to logger object @@ -361,5 +361,5 @@ def Create(inModeStr="BASIC", inLoggerLevel = None): #mHandlerDumpLogList.setFormatter(mRobotLoggerFormatter) #mRobotLogger.addHandler(mHandlerDumpLogList) else: - if lL: lL.warning("Pay attention! Your code has been call SettingsTemplate.Create - since pyOpenRPA v1.2.7 GSettings is creating automatically") + if lL: lL.warning("Внимание! Вручную была вызвана функция SettingsTemplate.Create - начиная с версии pyOpenRPA v1.2.7 глобальный словарь настроек создается автоматически!") return lResult # return the result dict \ No newline at end of file diff --git a/Sources/setup.py b/Sources/setup.py index e4f35934..66b1d6cc 100755 --- a/Sources/setup.py +++ b/Sources/setup.py @@ -66,7 +66,8 @@ setup(name='pyOpenRPA', 'schedule>=1.1.0', 'Jinja2>=2.2.11.2', 'selenium>=3.141.0', - 'fastapi>=0.81.0' + 'fastapi>=0.81.0', + 'uvicorn>=0.18.3' ], extras_require={ ':sys_platform == "win32"': [