From 9c536f9ad4894d5d3518142046f0b2770ee06cbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 18 Sep 2022 12:45:51 +0200 Subject: [PATCH 1/2] Update pre-commit config --- .pre-commit-config.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c654b90..95f85d6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,11 +2,11 @@ default_language_version: python: python3 repos: - repo: https://github.com/psf/black - rev: 22.6.0 + rev: 22.8.0 hooks: - id: black - repo: https://github.com/myint/autoflake - rev: v1.4 + rev: v1.5.3 hooks: - id: autoflake args: @@ -22,21 +22,21 @@ repos: - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/PyCQA/flake8 - rev: "4.0.1" + rev: "5.0.4" hooks: - id: flake8 - additional_dependencies: ["flake8-bugbear==21.4.3"] + additional_dependencies: ["flake8-bugbear==22.9.11"] - repo: https://github.com/PyCQA/isort rev: 5.10.1 hooks: - id: isort - repo: https://github.com/myint/docformatter - rev: v1.4 + rev: v1.5.0 hooks: - id: docformatter args: ["--in-place", "--wrap-summaries=88"] - repo: https://github.com/asottile/pyupgrade - rev: v2.34.0 + rev: v2.38.0 hooks: - id: pyupgrade args: ["--py39-plus"] From 19c3c67743d9397dbeccd2424480413adc613bf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sun, 18 Sep 2022 12:46:05 +0200 Subject: [PATCH 2/2] Apply pre-commit --- src/runboat/api.py | 2 +- src/runboat/controller.py | 3 ++- src/runboat/db.py | 3 ++- src/runboat/k8s.py | 3 ++- src/runboat/utils.py | 12 ++---------- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/runboat/api.py b/src/runboat/api.py index 26118b9..55cfaf5 100644 --- a/src/runboat/api.py +++ b/src/runboat/api.py @@ -1,6 +1,6 @@ import asyncio import datetime -from typing import AsyncGenerator +from collections.abc import AsyncGenerator from ansi2html import Ansi2HTMLConverter from fastapi import APIRouter, Depends, HTTPException, Request, status diff --git a/src/runboat/controller.py b/src/runboat/controller.py index 64e86b4..225c7f4 100644 --- a/src/runboat/controller.py +++ b/src/runboat/controller.py @@ -1,6 +1,7 @@ import asyncio import logging -from typing import Any, Awaitable, Callable +from collections.abc import Awaitable +from typing import Any, Callable from . import k8s from .db import BuildsDb diff --git a/src/runboat/db.py b/src/runboat/db.py index c53baf7..04dab58 100644 --- a/src/runboat/db.py +++ b/src/runboat/db.py @@ -1,7 +1,8 @@ import logging import sqlite3 +from collections.abc import Iterator from enum import Enum -from typing import Any, Iterator, Protocol, cast +from typing import Any, Protocol, cast from weakref import WeakSet from .github import CommitInfo diff --git a/src/runboat/k8s.py b/src/runboat/k8s.py index 0b1015c..adb345e 100644 --- a/src/runboat/k8s.py +++ b/src/runboat/k8s.py @@ -4,11 +4,12 @@ import os import shutil import subprocess import tempfile +from collections.abc import Generator from contextlib import contextmanager from enum import Enum from importlib import resources from pathlib import Path -from typing import Any, Callable, Generator, TypedDict, cast +from typing import Any, Callable, TypedDict, cast import urllib3 from jinja2 import Template diff --git a/src/runboat/utils.py b/src/runboat/utils.py index 3a5d4bc..c61ab06 100644 --- a/src/runboat/utils.py +++ b/src/runboat/utils.py @@ -1,18 +1,10 @@ import asyncio import functools import re +from collections.abc import AsyncGenerator, Awaitable, Generator, Iterator from concurrent.futures.thread import ThreadPoolExecutor from functools import wraps -from typing import ( - Any, - AsyncGenerator, - Awaitable, - Callable, - Generator, - Iterator, - ParamSpec, - TypeVar, -) +from typing import Any, Callable, ParamSpec, TypeVar _pool = ThreadPoolExecutor(max_workers=20, thread_name_prefix="sync_to_async")