From 5a4dbffbae60203444315dfded9b40e5770cb125 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Tue, 15 Mar 2022 19:36:59 +0100 Subject: [PATCH] update dependencies --- mitmproxy/utils/asyncio_utils.py | 8 +++++--- setup.py | 16 ++++++++-------- tox.ini | 10 +++++----- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/mitmproxy/utils/asyncio_utils.py b/mitmproxy/utils/asyncio_utils.py index 7c5c501ad..593d643b6 100644 --- a/mitmproxy/utils/asyncio_utils.py +++ b/mitmproxy/utils/asyncio_utils.py @@ -56,9 +56,11 @@ def set_task_debug_info( def task_repr(task: asyncio.Task) -> str: """Get a task representation with debug info.""" name = task.get_name() - age = getattr(task, "created", "") - if age: - age = f" (age: {time.time() - age:.0f}s)" + a: float = getattr(task, "created", 0) + if a: + age = f" (age: {time.time() - a:.0f}s)" + else: + age = "" client = getattr(task, "client", "") if client: client = f"{human.format_address(client)}: " diff --git a/setup.py b/setup.py index 5c76b3e4e..23a1d1d13 100644 --- a/setup.py +++ b/setup.py @@ -67,14 +67,14 @@ setup( # https://packaging.python.org/en/latest/discussions/install-requires-vs-requirements/#install-requires # It is not considered best practice to use install_requires to pin dependencies to specific versions. install_requires=[ - "asgiref>=3.2.10,<3.5", + "asgiref>=3.2.10,<3.6", "blinker>=1.4, <1.5", "Brotli>=1.0,<1.1", "certifi>=2019.9.11", # no semver here - this should always be on the last release! "click>=7.0,<8.1", "cryptography>=36,<37", "flask>=1.1.1,<2.1", - "h11>=0.11,<0.13", + "h11>=0.11,<0.14", "h2>=4.1,<5", "hyperframe>=6.0,<7", "kaitaistruct>=0.7,<0.10", @@ -82,7 +82,7 @@ setup( "msgpack>=1.0.0, <1.1.0", "passlib>=1.6.5, <1.8", "protobuf>=3.14,<3.20", - "pyOpenSSL>=21.0,<21.1", + "pyOpenSSL>=21.0,<22.1", "pyparsing>=2.4.2,<3.1", "pyperclip>=1.6.0,<1.9", "ruamel.yaml>=0.16,<0.18", @@ -91,9 +91,9 @@ setup( "sortedcontainers>=2.3,<2.5", "tornado>=6.1,<7", "urwid>=2.1.1,<2.2", - "wsproto>=1.0,<1.1", + "wsproto>=1.0,<1.2", "publicsuffix2>=2.20190812,<3", - "zstandard>=0.11,<0.17", + "zstandard>=0.11,<0.18", ], extras_require={ ':sys_platform == "win32"': [ @@ -103,12 +103,12 @@ setup( "hypothesis>=5.8,<7", "parver>=0.1,<2.0", "pdoc>=4.0.0", - "pyinstaller==4.7", + "pyinstaller==4.10", "pytest-asyncio>=0.17.0,<0.19", "pytest-cov>=2.7.1,<3.1", - "pytest-timeout>=1.3.3,<2.1", + "pytest-timeout>=1.3.3,<2.2", "pytest-xdist>=2.1.0,<3", - "pytest>=6.1.0,<7", + "pytest>=6.1.0,<8", "requests>=2.9.1,<3", "tox>=3.5,<4", "wheel>=0.36.2,<0.38", diff --git a/tox.ini b/tox.ini index c8c3362d9..31a562540 100644 --- a/tox.ini +++ b/tox.ini @@ -29,13 +29,13 @@ commands = [testenv:mypy] deps = - mypy==0.910 - types-certifi==2021.10.8.0 + mypy==0.941 + types-certifi==2021.10.8.1 types-Flask==1.1.6 types-Werkzeug==1.0.9 - types-requests==2.26.1 - types-cryptography==3.3.9 - types-pyOpenSSL==21.0.1 + types-requests==2.27.12 + types-cryptography==3.3.18 + types-pyOpenSSL==22.0.0 commands = mypy {posargs}