From 384f1b99a5a8dfd43b1fc4dd75c27b1bbacbfa96 Mon Sep 17 00:00:00 2001 From: Leonid Vinogradov Date: Thu, 10 Aug 2023 13:49:33 +0300 Subject: [PATCH] HH-188712 up dependencies --- frontik/handler.py | 2 +- poetry.lock | 87 +++++++++++++++++++------------------- pyproject.toml | 8 ++-- tests/test_asyncgroup.py | 2 +- tests/test_doc.py | 12 +++--- tests/test_handler.py | 2 +- tests/test_json_builder.py | 6 +-- 7 files changed, 59 insertions(+), 60 deletions(-) diff --git a/frontik/handler.py b/frontik/handler.py index 6b0d42bbb..ec3e9d28e 100644 --- a/frontik/handler.py +++ b/frontik/handler.py @@ -671,7 +671,7 @@ def clear_header(self, name): def clear_cookie(self, name, path="/", domain=None): if name in self._mandatory_cookies: del self._mandatory_cookies[name] - super().clear_cookie(name, path, domain) + super().clear_cookie(name, path=path, domain=domain) def was_preprocessor_called(self, preprocessor): return preprocessor.preprocessor_name in self._launched_preprocessors diff --git a/poetry.lock b/poetry.lock index a2613245d..734c53e2f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -232,13 +232,13 @@ files = [ [[package]] name = "chardet" -version = "5.1.0" +version = "5.2.0" description = "Universal encoding detector for Python 3" optional = false python-versions = ">=3.7" files = [ - {file = "chardet-5.1.0-py3-none-any.whl", hash = "sha256:362777fb014af596ad31334fde1e8c327dfdb076e1960d1694662d46a6917ab9"}, - {file = "chardet-5.1.0.tar.gz", hash = "sha256:0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5"}, + {file = "chardet-5.2.0-py3-none-any.whl", hash = "sha256:e1cf59446890a00105fe7b7912492ea04b6e6f06d4b742b2c788469e34c82970"}, + {file = "chardet-5.2.0.tar.gz", hash = "sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7"}, ] [[package]] @@ -455,7 +455,7 @@ protobuf = ["grpcio-tools (>=1.56.2)"] [[package]] name = "http-client" -version = "2.0.4" +version = "2.1.0" description = "Balancing http client around aiohttp" optional = false python-versions = "3.11.*" @@ -470,8 +470,8 @@ yarl = "1.9.2" [package.source] type = "git" url = "https://github.com/hhru/balancing-http-client.git" -reference = "2.0.4" -resolved_reference = "af25c773d66557138b82c326f0a419aafc2a6a57" +reference = "2.1.0" +resolved_reference = "897db4b2bae964899a92c241450e9a4af0350127" [[package]] name = "idna" @@ -639,13 +639,12 @@ source = ["Cython (>=0.29.7)"] [[package]] name = "lxml-asserts" -version = "0.1.1" +version = "0.1.2" description = "Handy functions for testing lxml etree objects for equality and compatibility" optional = false python-versions = "*" files = [ - {file = "lxml-asserts-0.1.1.tar.gz", hash = "sha256:3155325b63f9850c69f817b2152b856758f5a6f1d54b4ba25f79e96c5ac46bb7"}, - {file = "lxml_asserts-0.1.1-py2.py3-none-any.whl", hash = "sha256:ccbfe0b4894fa5935c162f57418945171426ebb9059c09080568a46765c5cde0"}, + {file = "lxml-asserts-0.1.2.tar.gz", hash = "sha256:49ab3af441ce3d6179f3d6c094b54bbab61fbccf62bd607033c822d5b16be2f9"}, ] [package.dependencies] @@ -986,24 +985,24 @@ testing = ["pytest", "pytest-benchmark"] [[package]] name = "protobuf" -version = "4.23.4" +version = "4.24.0" description = "" optional = false python-versions = ">=3.7" files = [ - {file = "protobuf-4.23.4-cp310-abi3-win32.whl", hash = "sha256:5fea3c64d41ea5ecf5697b83e41d09b9589e6f20b677ab3c48e5f242d9b7897b"}, - {file = "protobuf-4.23.4-cp310-abi3-win_amd64.whl", hash = "sha256:7b19b6266d92ca6a2a87effa88ecc4af73ebc5cfde194dc737cf8ef23a9a3b12"}, - {file = "protobuf-4.23.4-cp37-abi3-macosx_10_9_universal2.whl", hash = "sha256:8547bf44fe8cec3c69e3042f5c4fb3e36eb2a7a013bb0a44c018fc1e427aafbd"}, - {file = "protobuf-4.23.4-cp37-abi3-manylinux2014_aarch64.whl", hash = "sha256:fee88269a090ada09ca63551bf2f573eb2424035bcf2cb1b121895b01a46594a"}, - {file = "protobuf-4.23.4-cp37-abi3-manylinux2014_x86_64.whl", hash = "sha256:effeac51ab79332d44fba74660d40ae79985901ac21bca408f8dc335a81aa597"}, - {file = "protobuf-4.23.4-cp37-cp37m-win32.whl", hash = "sha256:c3e0939433c40796ca4cfc0fac08af50b00eb66a40bbbc5dee711998fb0bbc1e"}, - {file = "protobuf-4.23.4-cp37-cp37m-win_amd64.whl", hash = "sha256:9053df6df8e5a76c84339ee4a9f5a2661ceee4a0dab019e8663c50ba324208b0"}, - {file = "protobuf-4.23.4-cp38-cp38-win32.whl", hash = "sha256:e1c915778d8ced71e26fcf43c0866d7499891bca14c4368448a82edc61fdbc70"}, - {file = "protobuf-4.23.4-cp38-cp38-win_amd64.whl", hash = "sha256:351cc90f7d10839c480aeb9b870a211e322bf05f6ab3f55fcb2f51331f80a7d2"}, - {file = "protobuf-4.23.4-cp39-cp39-win32.whl", hash = "sha256:6dd9b9940e3f17077e820b75851126615ee38643c2c5332aa7a359988820c720"}, - {file = "protobuf-4.23.4-cp39-cp39-win_amd64.whl", hash = "sha256:0a5759f5696895de8cc913f084e27fd4125e8fb0914bb729a17816a33819f474"}, - {file = "protobuf-4.23.4-py3-none-any.whl", hash = "sha256:e9d0be5bf34b275b9f87ba7407796556abeeba635455d036c7351f7c183ef8ff"}, - {file = "protobuf-4.23.4.tar.gz", hash = "sha256:ccd9430c0719dce806b93f89c91de7977304729e55377f872a92465d548329a9"}, + {file = "protobuf-4.24.0-cp310-abi3-win32.whl", hash = "sha256:81cb9c4621d2abfe181154354f63af1c41b00a4882fb230b4425cbaed65e8f52"}, + {file = "protobuf-4.24.0-cp310-abi3-win_amd64.whl", hash = "sha256:6c817cf4a26334625a1904b38523d1b343ff8b637d75d2c8790189a4064e51c3"}, + {file = "protobuf-4.24.0-cp37-abi3-macosx_10_9_universal2.whl", hash = "sha256:ae97b5de10f25b7a443b40427033e545a32b0e9dda17bcd8330d70033379b3e5"}, + {file = "protobuf-4.24.0-cp37-abi3-manylinux2014_aarch64.whl", hash = "sha256:567fe6b0647494845d0849e3d5b260bfdd75692bf452cdc9cb660d12457c055d"}, + {file = "protobuf-4.24.0-cp37-abi3-manylinux2014_x86_64.whl", hash = "sha256:a6b1ca92ccabfd9903c0c7dde8876221dc7d8d87ad5c42e095cc11b15d3569c7"}, + {file = "protobuf-4.24.0-cp37-cp37m-win32.whl", hash = "sha256:a38400a692fd0c6944c3c58837d112f135eb1ed6cdad5ca6c5763336e74f1a04"}, + {file = "protobuf-4.24.0-cp37-cp37m-win_amd64.whl", hash = "sha256:5ab19ee50037d4b663c02218a811a5e1e7bb30940c79aac385b96e7a4f9daa61"}, + {file = "protobuf-4.24.0-cp38-cp38-win32.whl", hash = "sha256:e8834ef0b4c88666ebb7c7ec18045aa0f4325481d724daa624a4cf9f28134653"}, + {file = "protobuf-4.24.0-cp38-cp38-win_amd64.whl", hash = "sha256:8bb52a2be32db82ddc623aefcedfe1e0eb51da60e18fcc908fb8885c81d72109"}, + {file = "protobuf-4.24.0-cp39-cp39-win32.whl", hash = "sha256:ae7a1835721086013de193311df858bc12cd247abe4ef9710b715d930b95b33e"}, + {file = "protobuf-4.24.0-cp39-cp39-win_amd64.whl", hash = "sha256:44825e963008f8ea0d26c51911c30d3e82e122997c3c4568fd0385dd7bacaedf"}, + {file = "protobuf-4.24.0-py3-none-any.whl", hash = "sha256:82e6e9ebdd15b8200e8423676eab38b774624d6a1ad696a60d86a2ac93f18201"}, + {file = "protobuf-4.24.0.tar.gz", hash = "sha256:5d0ceb9de6e08311832169e601d1fc71bd8e8c779f3ee38a97a78554945ecb85"}, ] [[package]] @@ -1242,22 +1241,22 @@ files = [ [[package]] name = "tornado" -version = "6.2" +version = "6.3.2" description = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed." optional = false -python-versions = ">= 3.7" +python-versions = ">= 3.8" files = [ - {file = "tornado-6.2-cp37-abi3-macosx_10_9_universal2.whl", hash = "sha256:20f638fd8cc85f3cbae3c732326e96addff0a15e22d80f049e00121651e82e72"}, - {file = "tornado-6.2-cp37-abi3-macosx_10_9_x86_64.whl", hash = "sha256:87dcafae3e884462f90c90ecc200defe5e580a7fbbb4365eda7c7c1eb809ebc9"}, - {file = "tornado-6.2-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ba09ef14ca9893954244fd872798b4ccb2367c165946ce2dd7376aebdde8e3ac"}, - {file = "tornado-6.2-cp37-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b8150f721c101abdef99073bf66d3903e292d851bee51910839831caba341a75"}, - {file = "tornado-6.2-cp37-abi3-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d3a2f5999215a3a06a4fc218026cd84c61b8b2b40ac5296a6db1f1451ef04c1e"}, - {file = "tornado-6.2-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:5f8c52d219d4995388119af7ccaa0bcec289535747620116a58d830e7c25d8a8"}, - {file = "tornado-6.2-cp37-abi3-musllinux_1_1_i686.whl", hash = "sha256:6fdfabffd8dfcb6cf887428849d30cf19a3ea34c2c248461e1f7d718ad30b66b"}, - {file = "tornado-6.2-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:1d54d13ab8414ed44de07efecb97d4ef7c39f7438cf5e976ccd356bebb1b5fca"}, - {file = "tornado-6.2-cp37-abi3-win32.whl", hash = "sha256:5c87076709343557ef8032934ce5f637dbb552efa7b21d08e89ae7619ed0eb23"}, - {file = "tornado-6.2-cp37-abi3-win_amd64.whl", hash = "sha256:e5f923aa6a47e133d1cf87d60700889d7eae68988704e20c75fb2d65677a8e4b"}, - {file = "tornado-6.2.tar.gz", hash = "sha256:9b630419bde84ec666bfd7ea0a4cb2a8a651c2d5cccdbdd1972a0c859dfc3c13"}, + {file = "tornado-6.3.2-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:c367ab6c0393d71171123ca5515c61ff62fe09024fa6bf299cd1339dc9456829"}, + {file = "tornado-6.3.2-cp38-abi3-macosx_10_9_x86_64.whl", hash = "sha256:b46a6ab20f5c7c1cb949c72c1994a4585d2eaa0be4853f50a03b5031e964fc7c"}, + {file = "tornado-6.3.2-cp38-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c2de14066c4a38b4ecbbcd55c5cc4b5340eb04f1c5e81da7451ef555859c833f"}, + {file = "tornado-6.3.2-cp38-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:05615096845cf50a895026f749195bf0b10b8909f9be672f50b0fe69cba368e4"}, + {file = "tornado-6.3.2-cp38-abi3-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5b17b1cf5f8354efa3d37c6e28fdfd9c1c1e5122f2cb56dac121ac61baa47cbe"}, + {file = "tornado-6.3.2-cp38-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:29e71c847a35f6e10ca3b5c2990a52ce38b233019d8e858b755ea6ce4dcdd19d"}, + {file = "tornado-6.3.2-cp38-abi3-musllinux_1_1_i686.whl", hash = "sha256:834ae7540ad3a83199a8da8f9f2d383e3c3d5130a328889e4cc991acc81e87a0"}, + {file = "tornado-6.3.2-cp38-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:6a0848f1aea0d196a7c4f6772197cbe2abc4266f836b0aac76947872cd29b411"}, + {file = "tornado-6.3.2-cp38-abi3-win32.whl", hash = "sha256:7efcbcc30b7c654eb6a8c9c9da787a851c18f8ccd4a5a3a95b05c7accfa068d2"}, + {file = "tornado-6.3.2-cp38-abi3-win_amd64.whl", hash = "sha256:0c325e66c8123c606eea33084976c832aa4e766b7dff8aedd7587ea44a604cdf"}, + {file = "tornado-6.3.2.tar.gz", hash = "sha256:4b927c4f19b71e627b13f3db2324e4ae660527143f9e1f2e2fb404f3a187e2ba"}, ] [[package]] @@ -1276,13 +1275,13 @@ tornado = "*" [[package]] name = "tox" -version = "4.6.3" +version = "4.6.4" description = "tox is a generic virtualenv management and test command line tool" optional = false python-versions = ">=3.7" files = [ - {file = "tox-4.6.3-py3-none-any.whl", hash = "sha256:2946a0bb38924c3a9f9575c7fb4ca1f4c11a7c69c61592f176778892155cb50c"}, - {file = "tox-4.6.3.tar.gz", hash = "sha256:9e2c5091a117d03b583c57c4c40aecd068099c17d40520e7b165e85c19334534"}, + {file = "tox-4.6.4-py3-none-any.whl", hash = "sha256:1b8f8ae08d6a5475cad9d508236c51ea060620126fd7c3c513d0f5c7f29cc776"}, + {file = "tox-4.6.4.tar.gz", hash = "sha256:5e2ad8845764706170d3dcaac171704513cc8a725655219acb62fe4380bdadda"}, ] [package.dependencies] @@ -1291,14 +1290,14 @@ chardet = ">=5.1" colorama = ">=0.4.6" filelock = ">=3.12.2" packaging = ">=23.1" -platformdirs = ">=3.5.3" -pluggy = ">=1" +platformdirs = ">=3.8" +pluggy = ">=1.2" pyproject-api = ">=1.5.2" virtualenv = ">=20.23.1" [package.extras] -docs = ["furo (>=2023.5.20)", "sphinx (>=7.0.1)", "sphinx-argparse-cli (>=1.11.1)", "sphinx-autodoc-typehints (>=1.23.2,!=1.23.4)", "sphinx-copybutton (>=0.5.2)", "sphinx-inline-tabs (>=2023.4.21)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"] -testing = ["build[virtualenv] (>=0.10)", "covdefaults (>=2.3)", "detect-test-pollution (>=1.1.1)", "devpi-process (>=0.3.1)", "diff-cover (>=7.6)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.17.1)", "psutil (>=5.9.5)", "pytest (>=7.3.2)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest-xdist (>=3.3.1)", "re-assert (>=1.1)", "time-machine (>=2.10)", "wheel (>=0.40)"] +docs = ["furo (>=2023.5.20)", "sphinx (>=7.0.1)", "sphinx-argparse-cli (>=1.11.1)", "sphinx-autodoc-typehints (>=1.23.3,!=1.23.4)", "sphinx-copybutton (>=0.5.2)", "sphinx-inline-tabs (>=2023.4.21)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"] +testing = ["build[virtualenv] (>=0.10)", "covdefaults (>=2.3)", "detect-test-pollution (>=1.1.1)", "devpi-process (>=0.3.1)", "diff-cover (>=7.6)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.17.1)", "psutil (>=5.9.5)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest-xdist (>=3.3.1)", "re-assert (>=1.1)", "time-machine (>=2.10)", "wheel (>=0.40)"] [[package]] name = "typing-extensions" @@ -1537,4 +1536,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "3.11.*" -content-hash = "1d44e59ce2a68f90e6817b9c8208b922ee7344e4c3e3a575153fd0fe1afedc82" +content-hash = "17d2c9d747fe73a3e4a34ed313af9a56477076be12565378bf096fc72ed3f77e" diff --git a/pyproject.toml b/pyproject.toml index fea0e072f..58309ef1a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,8 +20,8 @@ aiohttp = '3.8.3' jinja2 = '3.1.2' lxml = '4.9.2' pydantic = '>=1.10.5,<2' -tornado = '6.2.0' -http-client = {git = 'https://github.com/hhru/balancing-http-client.git', tag = '2.0.4'} +tornado = '6.3.2' +http-client = {git = 'https://github.com/hhru/balancing-http-client.git', tag = '2.1.0'} python-consul2-hh = {git = 'https://github.com/hhru/python-consul2', tag = 'v0.2.9'} opentelemetry-sdk = '1.17.0' opentelemetry-api = '1.17.0' @@ -34,8 +34,8 @@ pytest = '>=7.2.0' pytest-asyncio = '0.21.1' pycodestyle = '>=2.5.0' requests = '>=2.0' -tox = '4.6.3' -lxml-asserts = '0.1.1' +tox = '4.6.4' +lxml-asserts = '0.1.2' tornado-httpclient-mock = '0.2.3' sentry-sdk = '1.26.0' aiokafka = '0.8.1' diff --git a/tests/test_asyncgroup.py b/tests/test_asyncgroup.py index 77a52cb46..ad521fd04 100644 --- a/tests/test_asyncgroup.py +++ b/tests/test_asyncgroup.py @@ -12,7 +12,7 @@ class TestAsyncGroup(unittest.TestCase): - def test_callbacks(self): + async def test_callbacks(self): data = [] def callback2(): diff --git a/tests/test_doc.py b/tests/test_doc.py index c129b9c98..2f1fab4fb 100644 --- a/tests/test_doc.py +++ b/tests/test_doc.py @@ -28,7 +28,7 @@ def test_simple(self): b"""\n\xd1\x82\xd0\xb5\xd1\x81\xd1\x82""" ) - def test_future_simple(self): + async def test_future_simple(self): d = Doc('a') f = Future() d.put(f) @@ -39,7 +39,7 @@ def test_future_simple(self): self.assertXmlEqual(d.to_etree_element(), b"""\n""") - def test_future_etree_element(self): + async def test_future_etree_element(self): d = Doc('a') f = Future() f.set_result(etree.Element('b')) @@ -47,7 +47,7 @@ def test_future_etree_element(self): self.assertXmlEqual(d.to_etree_element(), b"""\n""") - def test_future_list(self): + async def test_future_list(self): d = Doc('a') f = Future() f.set_result([etree.Comment('ccc'), etree.Element('bbb')]) @@ -55,7 +55,7 @@ def test_future_list(self): self.assertXmlEqual(d.to_etree_element(), """\n""") - def test_failed_future(self): + async def test_failed_future(self): d = Doc('a') f = Future() result = self.get_test_request_result() @@ -67,7 +67,7 @@ def test_failed_future(self): d.to_etree_element(), """\n""" ) - def test_future_string_value(self): + async def test_future_string_value(self): d = Doc('a') f = Future() result = self.get_test_request_result() @@ -144,4 +144,4 @@ def get_test_request_result(): class FakeRequest: name = 'name' - return RequestResult(FakeRequest(), None, False, False) + return RequestResult(FakeRequest(), None, None, False, False) diff --git a/tests/test_handler.py b/tests/test_handler.py index cd3096f88..c0eef7613 100644 --- a/tests/test_handler.py +++ b/tests/test_handler.py @@ -24,7 +24,7 @@ def test_head(self): self.assertEqual(response.headers['X-Foo'], 'Bar') self.assertEqual(response.content, b'') - def test_head_url(self): + async def test_head_url(self): response = frontik_test_app.get_page('handler/head_url') self.assertEqual(b'OK', response.content) diff --git a/tests/test_json_builder.py b/tests/test_json_builder.py index 17aef5c69..60cf40f28 100644 --- a/tests/test_json_builder.py +++ b/tests/test_json_builder.py @@ -113,7 +113,7 @@ def test_future(self): self.assertEqual(j.to_dict()['a'], 'b') self.assertEqual(j.to_string(), """{"a": "b"}""") - def test_future_string_value(self): + async def test_future_string_value(self): j = JsonBuilder() f = Future() result = TestDoc.get_test_request_result() @@ -124,7 +124,7 @@ def test_future_string_value(self): self.assertEqual(j.to_dict(), {}) - def test_failed_future(self): + async def test_failed_future(self): j = JsonBuilder() f = Future() result = TestDoc.get_test_request_result() @@ -150,7 +150,7 @@ def test_nested_future(self): self.assertEqual(j.to_string(), """{"nested": {"a": ["b", "c"]}}""") - def test_nested_future_error_node(self): + async def test_nested_future_error_node(self): j = JsonBuilder() f1 = Future() f2 = Future()