diff --git a/poetry.lock b/poetry.lock index 2af0d97511..27de8508ce 100644 --- a/poetry.lock +++ b/poetry.lock @@ -514,14 +514,6 @@ python-versions = ">=3.7" [package.dependencies] typing-extensions = ">=4.1.0" -[[package]] -name = "cached-property" -version = "1.5.2" -description = "A decorator for caching properties in classes." -category = "main" -optional = false -python-versions = "*" - [[package]] name = "certifi" version = "2022.6.15" @@ -1647,10 +1639,6 @@ botocore-stubs = [ {file = "botocore-stubs-1.27.38.tar.gz", hash = "sha256:408e8b86b5d171b58f81c74ca9d3b5317a5a8e2d3bc2073aa841ac13b8939e56"}, {file = "botocore_stubs-1.27.38-py3-none-any.whl", hash = "sha256:7add7641e9a479a9c8366893bb522fd9ca3d58714201e43662a200a148a1bc38"}, ] -cached-property = [ - {file = "cached-property-1.5.2.tar.gz", hash = "sha256:9fa5755838eecbb2d234c3aa390bd80fbd3ac6b6869109bfc1b499f7bd89a130"}, - {file = "cached_property-1.5.2-py2.py3-none-any.whl", hash = "sha256:df4f613cf7ad9a588cc381aaf4a512d26265ecebd5eb9e1ba12f1319eb85a6a0"}, -] certifi = [ {file = "certifi-2022.6.15-py3-none-any.whl", hash = "sha256:fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412"}, {file = "certifi-2022.6.15.tar.gz", hash = "sha256:84c85a9078b11105f04f3036a9482ae10e4621616db313fe045dd24743a0820d"}, diff --git a/pyproject.toml b/pyproject.toml index 9c2aa39c7c..1ee6fbe6f4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,6 @@ requests = "^2.26.0" pytest-xdist = "^2.3.0" asyncpg = "^0.24.0" aiopg = "^1.3.1" -cached-property = "^1.5.2" Jinja2 = "^3.0.2" types-requests = "^2.28.5" types-psycopg2 = "^2.9.18" @@ -74,7 +73,6 @@ strict = true [[tool.mypy.overrides]] module = [ "asyncpg.*", - "cached_property.*", "pg8000.*", ] ignore_missing_imports = true diff --git a/test_runner/fixtures/neon_fixtures.py b/test_runner/fixtures/neon_fixtures.py index a77b3958c9..4b2638bb2a 100644 --- a/test_runner/fixtures/neon_fixtures.py +++ b/test_runner/fixtures/neon_fixtures.py @@ -17,6 +17,7 @@ import uuid from contextlib import closing, contextmanager from dataclasses import dataclass, field from enum import Flag, auto +from functools import cached_property from pathlib import Path from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, TypeVar, Union, cast @@ -27,7 +28,6 @@ import jwt import psycopg2 import pytest import requests -from cached_property import cached_property from fixtures.log_helper import log from fixtures.types import Lsn, TenantId, TimelineId diff --git a/test_runner/regress/test_close_fds.py b/test_runner/regress/test_close_fds.py index c7ea37f9c8..22f245f79b 100644 --- a/test_runner/regress/test_close_fds.py +++ b/test_runner/regress/test_close_fds.py @@ -1,10 +1,10 @@ import os.path import shutil import subprocess +import threading import time from contextlib import closing -from cached_property import threading from fixtures.log_helper import log from fixtures.neon_fixtures import NeonEnv