From 52a099e90c1ba759dc88fe96ed41b09e4a9e3f6a Mon Sep 17 00:00:00 2001 From: Mehmed Mustafa Date: Mon, 29 Jul 2024 15:49:32 +0200 Subject: [PATCH] revert, and just use < v43.0.0 --- requirements.txt | 2 +- requirements_test.txt | 2 +- src/ocrd_network/runtime_data/connection_clients.py | 8 +------- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index f748a06057..ed5fd56d59 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ atomicwrites >= 1.3.0 beanie~=1.7 click >=7 -cryptography >= 43.0.0 +cryptography < 43.0.0 Deprecated == 1.2.0 docker fastapi>=0.78.0 diff --git a/requirements_test.txt b/requirements_test.txt index be2ba65bca..d8cef1dae7 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -1,5 +1,5 @@ autopep8 -cryptography >= 43.0.0 +cryptography < 43.0.0 pytest >= 4.0.0 generateDS == 2.35.20 pytest-benchmark >= 3.2.3 diff --git a/src/ocrd_network/runtime_data/connection_clients.py b/src/ocrd_network/runtime_data/connection_clients.py index ab2e48b144..67002a498f 100644 --- a/src/ocrd_network/runtime_data/connection_clients.py +++ b/src/ocrd_network/runtime_data/connection_clients.py @@ -1,13 +1,7 @@ from __future__ import annotations from docker import APIClient, DockerClient from docker.transport import SSHHTTPAdapter - -# TODO: A workaround to supress the annoying paramiko -# warnings which fail bash lib tests - core #1260 -from warnings import catch_warnings -from cryptography.utils import CryptographyDeprecationWarning -with catch_warnings(action="ignore", category=CryptographyDeprecationWarning): - from paramiko import AutoAddPolicy, SSHClient +from paramiko import AutoAddPolicy, SSHClient class CustomDockerClient(DockerClient):