diff --git a/gns3server/controller/compute.py b/gns3server/controller/compute.py index 5d61027c..4a5cbd1c 100644 --- a/gns3server/controller/compute.py +++ b/gns3server/controller/compute.py @@ -18,14 +18,19 @@ import ipaddress import aiohttp import asyncio -import async_timeout import socket import json import uuid import sys import io + from operator import itemgetter +if sys.version_info >= (3, 11): + from asyncio import timeout as asynctimeout +else: + from async_timeout import timeout as asynctimeout + from ..utils import parse_version from ..utils.asyncio import locking from ..controller.controller_error import ControllerError @@ -484,7 +489,7 @@ class Compute: return self._getUrl(path) async def _run_http_query(self, method, path, data=None, timeout=20, raw=False): - async with async_timeout.timeout(delay=timeout): + async with asynctimeout(delay=timeout): url = self._getUrl(path) headers = {} headers['content-type'] = 'application/json' diff --git a/requirements.txt b/requirements.txt index 398250ca..bb30eedd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,10 +2,10 @@ jsonschema>=4.23,<4.24 aiohttp>=3.10.10,<3.11 aiohttp-cors>=0.7.0,<0.8 aiofiles>=24.1.0,<25.0 -Jinja2>=3.1.4,<3.2 -sentry-sdk>=2.17,<2.18 # optional dependency -psutil>=6.1.0 -async-timeout>=4.0.3,<4.1 +Jinja2>=3.1.5,<3.2 +sentry-sdk>=2.19.2,<2.20 # optional dependency +psutil>=6.1.1 +async-timeout>=5.0.1,<5.1 distro>=1.9.0 py-cpuinfo>=9.0.0,<10.0 platformdirs>=2.4.0,<3 # platformdirs >=3 conflicts when building Debian packages