From 23a84dda04f597390f6bc6d69ab30954816122c3 Mon Sep 17 00:00:00 2001 From: Robert Resch Date: Thu, 25 Aug 2022 11:08:04 +0200 Subject: [PATCH] update pre-commit --- .pre-commit-config.yaml | 20 ++++++++++--------- bumper/mqtt/helper_bot.py | 3 ++- bumper/mqtt/proxy.py | 3 ++- bumper/util.py | 2 +- bumper/web/plugins/__init__.py | 3 ++- bumper/web/plugins/api/appsvr.py | 3 ++- bumper/web/plugins/api/dim.py | 2 +- bumper/web/plugins/api/ecms.py | 2 +- bumper/web/plugins/api/homed.py | 2 +- bumper/web/plugins/api/iot.py | 2 +- bumper/web/plugins/api/lg.py | 2 +- bumper/web/plugins/api/neng.py | 2 +- bumper/web/plugins/api/pim/dictionary.py | 2 +- bumper/web/plugins/api/pim/file.py | 2 +- bumper/web/plugins/api/pim/product.py | 2 +- bumper/web/plugins/api/rapp.py | 2 +- bumper/web/plugins/api/users.py | 3 ++- bumper/web/plugins/upload/global.py | 2 +- bumper/web/plugins/v1/global_auth.py | 2 +- bumper/web/plugins/v1/private/ad.py | 2 +- bumper/web/plugins/v1/private/campaign.py | 2 +- bumper/web/plugins/v1/private/common.py | 2 +- bumper/web/plugins/v1/private/message.py | 2 +- bumper/web/plugins/v1/private/shop.py | 2 +- bumper/web/plugins/v1/private/user.py | 2 +- bumper/web/plugins/v1/private/user_setting.py | 2 +- bumper/web/plugins/v2/private/common.py | 2 +- bumper/web/plugins/v2/private/message.py | 2 +- bumper/web/plugins/v2/private/user.py | 2 +- 29 files changed, 44 insertions(+), 37 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 64f6086..e4e7af8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,12 +6,12 @@ ci: repos: - repo: https://github.com/asottile/pyupgrade - rev: v2.32.1 + rev: v2.37.3 hooks: - id: pyupgrade args: [--py310-plus] - repo: https://github.com/psf/black - rev: 22.3.0 + rev: 22.6.0 hooks: - id: black args: @@ -20,16 +20,17 @@ repos: <<: &python-files-with-tests files: ^((bumper|tests)/.+)?[^/]+\.py$ - repo: https://github.com/codespell-project/codespell - rev: v2.1.0 + rev: v2.2.1 hooks: - id: codespell args: - -L bumper + - --ignore-words-list=ihs,ro - --skip="./.*,*.csv,*.json" - --quiet-level=2 exclude_types: [csv, json] - repo: https://github.com/PyCQA/flake8 - rev: 4.0.1 + rev: 5.0.4 hooks: - id: flake8 additional_dependencies: @@ -51,24 +52,25 @@ repos: hooks: - id: isort - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.2.0 + rev: v4.3.0 hooks: - id: check-executables-have-shebangs - id: check-merge-conflict - id: detect-private-key + exclude: tests/test_certs - id: no-commit-to-branch - id: requirements-txt-fixer - repo: https://github.com/pre-commit/mirrors-prettier - rev: v2.6.2 + rev: v2.7.1 hooks: - id: prettier additional_dependencies: - - prettier@2.6.2 - - prettier-plugin-sort-json@0.0.2 + - prettier@2.7.1 + - prettier-plugin-sort-json@0.0.3 exclude_types: - python - repo: https://github.com/adrienverge/yamllint.git - rev: v1.26.3 + rev: v1.27.1 hooks: - id: yamllint - repo: local diff --git a/bumper/mqtt/helper_bot.py b/bumper/mqtt/helper_bot.py index 3975576..d7d231b 100644 --- a/bumper/mqtt/helper_bot.py +++ b/bumper/mqtt/helper_bot.py @@ -2,7 +2,8 @@ import asyncio import json import ssl -from typing import Any, MutableMapping +from collections.abc import MutableMapping +from typing import Any from cachetools import TTLCache from gmqtt import Client, Subscription diff --git a/bumper/mqtt/proxy.py b/bumper/mqtt/proxy.py index f6824ca..aca73bc 100644 --- a/bumper/mqtt/proxy.py +++ b/bumper/mqtt/proxy.py @@ -3,7 +3,8 @@ import asyncio import re import ssl import typing -from typing import Any, MutableMapping +from collections.abc import MutableMapping +from typing import Any from urllib.parse import urlparse, urlunparse import websockets diff --git a/bumper/util.py b/bumper/util.py index 697ab34..088945d 100644 --- a/bumper/util.py +++ b/bumper/util.py @@ -1,9 +1,9 @@ import logging import os import sys +from collections.abc import MutableMapping from datetime import datetime from logging.handlers import RotatingFileHandler -from typing import MutableMapping, Union logformat = logging.Formatter( "[%(asctime)s] :: %(levelname)s :: %(name)s :: %(module)s :: %(funcName)s :: %(lineno)d :: %(message)s" diff --git a/bumper/web/plugins/__init__.py b/bumper/web/plugins/__init__.py index db93938..a3d705f 100644 --- a/bumper/web/plugins/__init__.py +++ b/bumper/web/plugins/__init__.py @@ -2,10 +2,11 @@ import inspect import sys from abc import abstractmethod +from collections.abc import Iterable from glob import glob from os.path import dirname, isfile, join from types import ModuleType -from typing import Any, Iterable +from typing import Any from aiohttp import web from aiohttp.web_response import Response diff --git a/bumper/web/plugins/api/appsvr.py b/bumper/web/plugins/api/appsvr.py index 449045e..4fb0bf6 100644 --- a/bumper/web/plugins/api/appsvr.py +++ b/bumper/web/plugins/api/appsvr.py @@ -2,7 +2,8 @@ import copy import json import logging -from typing import Any, Iterable +from collections.abc import Iterable +from typing import Any from aiohttp import web from aiohttp.web_exceptions import HTTPInternalServerError diff --git a/bumper/web/plugins/api/dim.py b/bumper/web/plugins/api/dim.py index 4242bd1..57f8aaf 100644 --- a/bumper/web/plugins/api/dim.py +++ b/bumper/web/plugins/api/dim.py @@ -3,7 +3,7 @@ import json import logging import random import string -from typing import Iterable +from collections.abc import Iterable from aiohttp import web from aiohttp.web_exceptions import HTTPInternalServerError diff --git a/bumper/web/plugins/api/ecms.py b/bumper/web/plugins/api/ecms.py index 3618a8c..40f02ca 100644 --- a/bumper/web/plugins/api/ecms.py +++ b/bumper/web/plugins/api/ecms.py @@ -1,6 +1,6 @@ """Ecms plugin module.""" -from typing import Iterable +from collections.abc import Iterable from aiohttp import web from aiohttp.web_request import Request diff --git a/bumper/web/plugins/api/homed.py b/bumper/web/plugins/api/homed.py index 7c456de..5201035 100644 --- a/bumper/web/plugins/api/homed.py +++ b/bumper/web/plugins/api/homed.py @@ -1,6 +1,6 @@ """Homed plugin module.""" import logging -from typing import Iterable +from collections.abc import Iterable from aiohttp import web from aiohttp.web_exceptions import HTTPInternalServerError diff --git a/bumper/web/plugins/api/iot.py b/bumper/web/plugins/api/iot.py index 35a7a7a..5d789b8 100644 --- a/bumper/web/plugins/api/iot.py +++ b/bumper/web/plugins/api/iot.py @@ -3,7 +3,7 @@ import json import logging import random import string -from typing import Iterable +from collections.abc import Iterable from aiohttp import web from aiohttp.web_exceptions import HTTPInternalServerError diff --git a/bumper/web/plugins/api/lg.py b/bumper/web/plugins/api/lg.py index a6a9dbf..c4fdefc 100644 --- a/bumper/web/plugins/api/lg.py +++ b/bumper/web/plugins/api/lg.py @@ -4,7 +4,7 @@ import logging import random import string import xml.etree.ElementTree as ET -from typing import Iterable +from collections.abc import Iterable from aiohttp import web from aiohttp.web_request import Request diff --git a/bumper/web/plugins/api/neng.py b/bumper/web/plugins/api/neng.py index 4609221..cc98a63 100644 --- a/bumper/web/plugins/api/neng.py +++ b/bumper/web/plugins/api/neng.py @@ -1,5 +1,5 @@ """Neng plugin module.""" -from typing import Iterable +from collections.abc import Iterable from aiohttp import web from aiohttp.web_request import Request diff --git a/bumper/web/plugins/api/pim/dictionary.py b/bumper/web/plugins/api/pim/dictionary.py index c96756b..36a2351 100644 --- a/bumper/web/plugins/api/pim/dictionary.py +++ b/bumper/web/plugins/api/pim/dictionary.py @@ -1,6 +1,6 @@ """Pim dictionary plugin module.""" import logging -from typing import Iterable +from collections.abc import Iterable from aiohttp import web from aiohttp.web_exceptions import HTTPInternalServerError diff --git a/bumper/web/plugins/api/pim/file.py b/bumper/web/plugins/api/pim/file.py index 7ceff3d..05ffa57 100644 --- a/bumper/web/plugins/api/pim/file.py +++ b/bumper/web/plugins/api/pim/file.py @@ -1,5 +1,5 @@ """File plugin module.""" -from typing import Iterable +from collections.abc import Iterable from aiohttp import web from aiohttp.web_routedef import AbstractRouteDef diff --git a/bumper/web/plugins/api/pim/product.py b/bumper/web/plugins/api/pim/product.py index 7b457c6..9a1cc79 100644 --- a/bumper/web/plugins/api/pim/product.py +++ b/bumper/web/plugins/api/pim/product.py @@ -2,7 +2,7 @@ import json import logging import os -from typing import Iterable +from collections.abc import Iterable from aiohttp import web from aiohttp.web_exceptions import HTTPInternalServerError diff --git a/bumper/web/plugins/api/rapp.py b/bumper/web/plugins/api/rapp.py index 407e9f9..9a21ba0 100644 --- a/bumper/web/plugins/api/rapp.py +++ b/bumper/web/plugins/api/rapp.py @@ -1,5 +1,5 @@ """Rapp plugin module.""" -from typing import Iterable +from collections.abc import Iterable from aiohttp import web from aiohttp.web_request import Request diff --git a/bumper/web/plugins/api/users.py b/bumper/web/plugins/api/users.py index c492407..5cb2699 100644 --- a/bumper/web/plugins/api/users.py +++ b/bumper/web/plugins/api/users.py @@ -1,7 +1,8 @@ """Users plugin module.""" import json import logging -from typing import Any, Iterable, Mapping +from collections.abc import Iterable, Mapping +from typing import Any from aiohttp import web from aiohttp.abc import Request diff --git a/bumper/web/plugins/upload/global.py b/bumper/web/plugins/upload/global.py index 2012aaf..b97df35 100644 --- a/bumper/web/plugins/upload/global.py +++ b/bumper/web/plugins/upload/global.py @@ -1,5 +1,5 @@ """Global plugin module.""" -from typing import Iterable +from collections.abc import Iterable from aiohttp import web from aiohttp.web_routedef import AbstractRouteDef diff --git a/bumper/web/plugins/v1/global_auth.py b/bumper/web/plugins/v1/global_auth.py index 1020e2c..6e19b41 100644 --- a/bumper/web/plugins/v1/global_auth.py +++ b/bumper/web/plugins/v1/global_auth.py @@ -1,5 +1,5 @@ """Global auth plugin module.""" -from typing import Iterable +from collections.abc import Iterable from aiohttp import web from aiohttp.web_routedef import AbstractRouteDef diff --git a/bumper/web/plugins/v1/private/ad.py b/bumper/web/plugins/v1/private/ad.py index 010d33e..0f0436c 100644 --- a/bumper/web/plugins/v1/private/ad.py +++ b/bumper/web/plugins/v1/private/ad.py @@ -1,5 +1,5 @@ """Ad plugin module.""" -from typing import Iterable +from collections.abc import Iterable from aiohttp import web from aiohttp.web_request import Request diff --git a/bumper/web/plugins/v1/private/campaign.py b/bumper/web/plugins/v1/private/campaign.py index 64305b4..6eb023a 100644 --- a/bumper/web/plugins/v1/private/campaign.py +++ b/bumper/web/plugins/v1/private/campaign.py @@ -1,6 +1,6 @@ """Campaign plugin module.""" +from collections.abc import Iterable from datetime import datetime, timedelta -from typing import Iterable from aiohttp import web from aiohttp.web_request import Request diff --git a/bumper/web/plugins/v1/private/common.py b/bumper/web/plugins/v1/private/common.py index f25b995..26a65c3 100644 --- a/bumper/web/plugins/v1/private/common.py +++ b/bumper/web/plugins/v1/private/common.py @@ -2,7 +2,7 @@ import json import logging import os -from typing import Iterable +from collections.abc import Iterable from aiohttp import web from aiohttp.web_exceptions import HTTPInternalServerError diff --git a/bumper/web/plugins/v1/private/message.py b/bumper/web/plugins/v1/private/message.py index 0a447f6..4776be8 100644 --- a/bumper/web/plugins/v1/private/message.py +++ b/bumper/web/plugins/v1/private/message.py @@ -1,5 +1,5 @@ """Message plugin module.""" -from typing import Iterable +from collections.abc import Iterable from aiohttp import web from aiohttp.web_request import Request diff --git a/bumper/web/plugins/v1/private/shop.py b/bumper/web/plugins/v1/private/shop.py index 092ec89..695b301 100644 --- a/bumper/web/plugins/v1/private/shop.py +++ b/bumper/web/plugins/v1/private/shop.py @@ -1,5 +1,5 @@ """Shop plugin module.""" -from typing import Iterable +from collections.abc import Iterable from aiohttp import web from aiohttp.web_request import Request diff --git a/bumper/web/plugins/v1/private/user.py b/bumper/web/plugins/v1/private/user.py index 68748c8..aaeb7a7 100644 --- a/bumper/web/plugins/v1/private/user.py +++ b/bumper/web/plugins/v1/private/user.py @@ -1,6 +1,6 @@ """User plugin module.""" import logging -from typing import Iterable +from collections.abc import Iterable from aiohttp import web from aiohttp.web_exceptions import HTTPInternalServerError diff --git a/bumper/web/plugins/v1/private/user_setting.py b/bumper/web/plugins/v1/private/user_setting.py index 3be4eb0..e8918bb 100644 --- a/bumper/web/plugins/v1/private/user_setting.py +++ b/bumper/web/plugins/v1/private/user_setting.py @@ -1,6 +1,6 @@ """User setting plugin module.""" -from typing import Iterable +from collections.abc import Iterable from aiohttp import web from aiohttp.web_request import Request diff --git a/bumper/web/plugins/v2/private/common.py b/bumper/web/plugins/v2/private/common.py index 2fcb4ea..709633e 100644 --- a/bumper/web/plugins/v2/private/common.py +++ b/bumper/web/plugins/v2/private/common.py @@ -1,5 +1,5 @@ """Common plugin module.""" -from typing import Iterable +from collections.abc import Iterable from aiohttp import web from aiohttp.web_request import Request diff --git a/bumper/web/plugins/v2/private/message.py b/bumper/web/plugins/v2/private/message.py index 0273b19..af709f8 100644 --- a/bumper/web/plugins/v2/private/message.py +++ b/bumper/web/plugins/v2/private/message.py @@ -1,5 +1,5 @@ """Message plugin module.""" -from typing import Iterable +from collections.abc import Iterable from aiohttp import web from aiohttp.web_request import Request diff --git a/bumper/web/plugins/v2/private/user.py b/bumper/web/plugins/v2/private/user.py index d53d814..98dd68f 100644 --- a/bumper/web/plugins/v2/private/user.py +++ b/bumper/web/plugins/v2/private/user.py @@ -1,5 +1,5 @@ """User plugin module.""" -from typing import Iterable +from collections.abc import Iterable from aiohttp import web from aiohttp.web_routedef import AbstractRouteDef