diff --git a/readme.md b/readme.md index 14ecb218..c3bc6938 100644 --- a/readme.md +++ b/readme.md @@ -106,8 +106,12 @@ MyOpenhabRule() ``` # Changelog +#### 1.0.2 (29.07.2022) +- Fixed setup issues +- Fixed unnecessary long tracebacks + #### 1.0.1 (25.07.2022) -- Dockerfile is Python 3.10 and non slim +- Dockerfile is Python 3.10 and non slim #### 1.0.0 (25.07.2022) - OpenHAB >= 3.3 and Python >= 3.8 only! diff --git a/requirements_setup.txt b/requirements_setup.txt index 206b5261..20aeaf3e 100644 --- a/requirements_setup.txt +++ b/requirements_setup.txt @@ -7,7 +7,7 @@ ujson >= 5.4, < 5.5 paho-mqtt >= 1.6, < 1.7 immutables == 0.18 -eascheduler == 0.1.5 +eascheduler == 0.1.6 easyconfig == 0.2.4 stack_data == 0.3.0 diff --git a/src/HABApp/__version__.py b/src/HABApp/__version__.py index cd7ca498..a6221b3d 100644 --- a/src/HABApp/__version__.py +++ b/src/HABApp/__version__.py @@ -1 +1 @@ -__version__ = '1.0.1' +__version__ = '1.0.2' diff --git a/src/HABApp/core/lib/exceptions/format_frame.py b/src/HABApp/core/lib/exceptions/format_frame.py index a4dd7936..8f32dbed 100644 --- a/src/HABApp/core/lib/exceptions/format_frame.py +++ b/src/HABApp/core/lib/exceptions/format_frame.py @@ -21,7 +21,7 @@ SUPPRESSED_PATHS = ( # Libraries of base installation - re.compile(r'[/\\](?:python\d\.\d+|python\d{2,3})[/\\](?:lib[/\\]|\w+\.py.*$)', re.IGNORECASE), + re.compile(r'[/\\](?:python\d\.\d+|python\d{2,3})[/\\](?:lib[/\\]|site-packages[/\\]|\w+\.py.*$)', re.IGNORECASE), # Libraries in venv re.compile(r'[/\\]lib[/\\]site-packages[/\\]', re.IGNORECASE), ) diff --git a/tests/test_core/test_lib/test_format_traceback.py b/tests/test_core/test_lib/test_format_traceback.py index bb0006de..13bffcd0 100644 --- a/tests/test_core/test_lib/test_format_traceback.py +++ b/tests/test_core/test_lib/test_format_traceback.py @@ -167,4 +167,5 @@ def test_regex(pytestconfig): assert skip_file(r'\Python310\lib\runpy.py') assert skip_file(r'/usr/lib/python3.10/runpy.py') + assert skip_file(r'/opt/habapp/lib/python3.8/site-packages/aiohttp/client.py') assert skip_file(r'\Python310\lib\asyncio\tasks.py') diff --git a/tox.ini b/tox.ini index 62522de8..b6b1ccc3 100644 --- a/tox.ini +++ b/tox.ini @@ -47,7 +47,3 @@ asyncio_mode = auto norecursedirs = run docs markers = no_internals: Does not set up the item registry and event bus - -log_file_level = 0 -log_file_format = [%(asctime)s] [%(name)25s] %(levelname)8s | %(message)s -log_file= ./run/conf_testing/log/pytest.log