From f530db98ff8fea1225d43a86c0c88a949a1b5227 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 18:08:19 +0200 Subject: [PATCH] Bump cpe from 1.3.0 to 1.3.1 (#5320) * Bump cpe from 1.3.0 to 1.3.1 Bumps [cpe](https://github.com/nilp0inter/cpe) from 1.3.0 to 1.3.1. - [Release notes](https://github.com/nilp0inter/cpe/releases) - [Changelog](https://github.com/nilp0inter/cpe/blob/main/NEWS.txt) - [Commits](https://github.com/nilp0inter/cpe/compare/v1.3.0...v1.3.1) --- updated-dependencies: - dependency-name: cpe dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Revert "Suppress SyntaxWarning from CPE until fixed (#5227)" This reverts commit c95df56e8db545e1ebb8959164a341579ad8f8f8. --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stefan Agner --- requirements.txt | 2 +- supervisor/os/manager.py | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/requirements.txt b/requirements.txt index 753271a6d..260158bfc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ awesomeversion==24.6.0 brotli==1.1.0 ciso8601==2.3.1 colorlog==6.8.2 -cpe==1.3.0 +cpe==1.3.1 cryptography==43.0.1 debugpy==1.8.6 deepmerge==2.0 diff --git a/supervisor/os/manager.py b/supervisor/os/manager.py index f1e71c718..ee37595fd 100644 --- a/supervisor/os/manager.py +++ b/supervisor/os/manager.py @@ -5,23 +5,11 @@ from dataclasses import dataclass from datetime import datetime import errno import logging -import os from pathlib import Path, PurePath -from warnings import catch_warnings, simplefilter import aiohttp from awesomeversion import AwesomeVersion, AwesomeVersionException - -# Fix for https://github.com/home-assistant/supervisor/issues/5226 -# Remove when CPE updated with https://github.com/nilp0inter/cpe/pull/57 -# Continue logging the warning on dev systems at least as this is still a problem -with catch_warnings(): - if not os.environ.get("SUPERVISOR_DEV") and not logging.getLogger( - __name__ - ).isEnabledFor(logging.DEBUG): - simplefilter("ignore", SyntaxWarning) - - from cpe import CPE +from cpe import CPE from ..coresys import CoreSys, CoreSysAttributes from ..dbus.agent.boards.const import BOARD_NAME_SUPERVISED