From 42b13ce62355f80a88e68bf8de87514fc57c6468 Mon Sep 17 00:00:00 2001 From: Lev Gorodetskiy Date: Sun, 4 Feb 2024 11:29:23 -0300 Subject: [PATCH] Update to Oxfordnet and Octez 19.0 --- CHANGELOG.md | 4 + poetry.lock | 249 +++++++++++----------- pyproject.toml | 12 +- requirements.dev.txt | 16 +- requirements.slim.txt | 6 +- requirements.txt | 10 +- src/michelson_kernel/kernel.py | 25 ++- src/pytezos/block/header.py | 2 + src/pytezos/context/mixin.py | 1 + src/pytezos/sandbox/node.py | 2 +- src/pytezos/sandbox/parameters.py | 251 +++++++++++++++++------ tests/integration_tests/test_metadata.py | 2 + 12 files changed, 357 insertions(+), 223 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d0fa2acf..b0e98ce47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +### Added + +* Compatibility with Oxfordnet protocol + ## [3.10.3](https://github.com/baking-bad/pytezos/compare/3.10.2...3.10.3) (2023-11-27) ### Fixed diff --git a/poetry.lock b/poetry.lock index e9188b842..eceac3cbd 100644 --- a/poetry.lock +++ b/poetry.lock @@ -222,33 +222,33 @@ lxml = ["lxml"] [[package]] name = "black" -version = "24.1.0" +version = "24.1.1" description = "The uncompromising code formatter." optional = false python-versions = ">=3.8" files = [ - {file = "black-24.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:94d5280d020dadfafc75d7cae899609ed38653d3f5e82e7ce58f75e76387ed3d"}, - {file = "black-24.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:aaf9aa85aaaa466bf969e7dd259547f4481b712fe7ee14befeecc152c403ee05"}, - {file = "black-24.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ec489cae76eac3f7573629955573c3a0e913641cafb9e3bfc87d8ce155ebdb29"}, - {file = "black-24.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:a5a0100b4bdb3744dd68412c3789f472d822dc058bb3857743342f8d7f93a5a7"}, - {file = "black-24.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6cc5a6ba3e671cfea95a40030b16a98ee7dc2e22b6427a6f3389567ecf1b5262"}, - {file = "black-24.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e0e367759062dcabcd9a426d12450c6d61faf1704a352a49055a04c9f9ce8f5a"}, - {file = "black-24.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:be305563ff4a2dea813f699daaffac60b977935f3264f66922b1936a5e492ee4"}, - {file = "black-24.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:6a8977774929b5db90442729f131221e58cc5d8208023c6af9110f26f75b6b20"}, - {file = "black-24.1.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:d74d4d0da276fbe3b95aa1f404182562c28a04402e4ece60cf373d0b902f33a0"}, - {file = "black-24.1.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:39addf23f7070dbc0b5518cdb2018468ac249d7412a669b50ccca18427dba1f3"}, - {file = "black-24.1.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:827a7c0da520dd2f8e6d7d3595f4591aa62ccccce95b16c0e94bb4066374c4c2"}, - {file = "black-24.1.0-cp312-cp312-win_amd64.whl", hash = "sha256:0cd59d01bf3306ff7e3076dd7f4435fcd2fafe5506a6111cae1138fc7de52382"}, - {file = "black-24.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:bf8dd261ee82df1abfb591f97e174345ab7375a55019cc93ad38993b9ff5c6ad"}, - {file = "black-24.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:82d9452aeabd51d1c8f0d52d4d18e82b9f010ecb30fd55867b5ff95904f427ff"}, - {file = "black-24.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9aede09f72b2a466e673ee9fca96e4bccc36f463cac28a35ce741f0fd13aea8b"}, - {file = "black-24.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:780f13d03066a7daf1707ec723fdb36bd698ffa29d95a2e7ef33a8dd8fe43b5c"}, - {file = "black-24.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:a15670c650668399c4b5eae32e222728185961d6ef6b568f62c1681d57b381ba"}, - {file = "black-24.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1e0fa70b8464055069864a4733901b31cbdbe1273f63a24d2fa9d726723d45ac"}, - {file = "black-24.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7fa8d9aaa22d846f8c0f7f07391148e5e346562e9b215794f9101a8339d8b6d8"}, - {file = "black-24.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:f0dfbfbacfbf9cd1fac7a5ddd3e72510ffa93e841a69fcf4a6358feab1685382"}, - {file = "black-24.1.0-py3-none-any.whl", hash = "sha256:5134a6f6b683aa0a5592e3fd61dd3519d8acd953d93e2b8b76f9981245b65594"}, - {file = "black-24.1.0.tar.gz", hash = "sha256:30fbf768cd4f4576598b1db0202413fafea9a227ef808d1a12230c643cefe9fc"}, + {file = "black-24.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:2588021038bd5ada078de606f2a804cadd0a3cc6a79cb3e9bb3a8bf581325a4c"}, + {file = "black-24.1.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:1a95915c98d6e32ca43809d46d932e2abc5f1f7d582ffbe65a5b4d1588af7445"}, + {file = "black-24.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2fa6a0e965779c8f2afb286f9ef798df770ba2b6cee063c650b96adec22c056a"}, + {file = "black-24.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:5242ecd9e990aeb995b6d03dc3b2d112d4a78f2083e5a8e86d566340ae80fec4"}, + {file = "black-24.1.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:fc1ec9aa6f4d98d022101e015261c056ddebe3da6a8ccfc2c792cbe0349d48b7"}, + {file = "black-24.1.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:0269dfdea12442022e88043d2910429bed717b2d04523867a85dacce535916b8"}, + {file = "black-24.1.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b3d64db762eae4a5ce04b6e3dd745dcca0fb9560eb931a5be97472e38652a161"}, + {file = "black-24.1.1-cp311-cp311-win_amd64.whl", hash = "sha256:5d7b06ea8816cbd4becfe5f70accae953c53c0e53aa98730ceccb0395520ee5d"}, + {file = "black-24.1.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:e2c8dfa14677f90d976f68e0c923947ae68fa3961d61ee30976c388adc0b02c8"}, + {file = "black-24.1.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:a21725862d0e855ae05da1dd25e3825ed712eaaccef6b03017fe0853a01aa45e"}, + {file = "black-24.1.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:07204d078e25327aad9ed2c64790d681238686bce254c910de640c7cc4fc3aa6"}, + {file = "black-24.1.1-cp312-cp312-win_amd64.whl", hash = "sha256:a83fe522d9698d8f9a101b860b1ee154c1d25f8a82ceb807d319f085b2627c5b"}, + {file = "black-24.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:08b34e85170d368c37ca7bf81cf67ac863c9d1963b2c1780c39102187ec8dd62"}, + {file = "black-24.1.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7258c27115c1e3b5de9ac6c4f9957e3ee2c02c0b39222a24dc7aa03ba0e986f5"}, + {file = "black-24.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:40657e1b78212d582a0edecafef133cf1dd02e6677f539b669db4746150d38f6"}, + {file = "black-24.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:e298d588744efda02379521a19639ebcd314fba7a49be22136204d7ed1782717"}, + {file = "black-24.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:34afe9da5056aa123b8bfda1664bfe6fb4e9c6f311d8e4a6eb089da9a9173bf9"}, + {file = "black-24.1.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:854c06fb86fd854140f37fb24dbf10621f5dab9e3b0c29a690ba595e3d543024"}, + {file = "black-24.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3897ae5a21ca132efa219c029cce5e6bfc9c3d34ed7e892113d199c0b1b444a2"}, + {file = "black-24.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:ecba2a15dfb2d97105be74bbfe5128bc5e9fa8477d8c46766505c1dda5883aac"}, + {file = "black-24.1.1-py3-none-any.whl", hash = "sha256:5cdc2e2195212208fbcae579b931407c1fa9997584f0a415421748aeafff1168"}, + {file = "black-24.1.1.tar.gz", hash = "sha256:48b5760dcbfe5cf97fd4fba23946681f3a81514c6ab8a45b50da67ac8fbc6c7b"}, ] [package.dependencies] @@ -333,13 +333,13 @@ ujson = ["ujson (>=5.7.0)"] [[package]] name = "certifi" -version = "2023.11.17" +version = "2024.2.2" description = "Python package for providing Mozilla's CA Bundle." optional = false python-versions = ">=3.6" files = [ - {file = "certifi-2023.11.17-py3-none-any.whl", hash = "sha256:e036ab49d5b79556f99cfc2d9320b34cfbe5be05c5871b51de9329f0603b0474"}, - {file = "certifi-2023.11.17.tar.gz", hash = "sha256:9b469f3a900bf28dc19b8cfbf8019bf47f7fdd1a65a1d4ffb98fc14166beb4d1"}, + {file = "certifi-2024.2.2-py3-none-any.whl", hash = "sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1"}, + {file = "certifi-2024.2.2.tar.gz", hash = "sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f"}, ] [[package]] @@ -1473,71 +1473,71 @@ files = [ [[package]] name = "markupsafe" -version = "2.1.4" +version = "2.1.5" description = "Safely add untrusted strings to HTML/XML markup." optional = false python-versions = ">=3.7" files = [ - {file = "MarkupSafe-2.1.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:de8153a7aae3835484ac168a9a9bdaa0c5eee4e0bc595503c95d53b942879c84"}, - {file = "MarkupSafe-2.1.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e888ff76ceb39601c59e219f281466c6d7e66bd375b4ec1ce83bcdc68306796b"}, - {file = "MarkupSafe-2.1.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0b838c37ba596fcbfca71651a104a611543077156cb0a26fe0c475e1f152ee8"}, - {file = "MarkupSafe-2.1.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dac1ebf6983148b45b5fa48593950f90ed6d1d26300604f321c74a9ca1609f8e"}, - {file = "MarkupSafe-2.1.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0fbad3d346df8f9d72622ac71b69565e621ada2ce6572f37c2eae8dacd60385d"}, - {file = "MarkupSafe-2.1.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d5291d98cd3ad9a562883468c690a2a238c4a6388ab3bd155b0c75dd55ece858"}, - {file = "MarkupSafe-2.1.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:a7cc49ef48a3c7a0005a949f3c04f8baa5409d3f663a1b36f0eba9bfe2a0396e"}, - {file = "MarkupSafe-2.1.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b83041cda633871572f0d3c41dddd5582ad7d22f65a72eacd8d3d6d00291df26"}, - {file = "MarkupSafe-2.1.4-cp310-cp310-win32.whl", hash = "sha256:0c26f67b3fe27302d3a412b85ef696792c4a2386293c53ba683a89562f9399b0"}, - {file = "MarkupSafe-2.1.4-cp310-cp310-win_amd64.whl", hash = "sha256:a76055d5cb1c23485d7ddae533229039b850db711c554a12ea64a0fd8a0129e2"}, - {file = "MarkupSafe-2.1.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9e9e3c4020aa2dc62d5dd6743a69e399ce3de58320522948af6140ac959ab863"}, - {file = "MarkupSafe-2.1.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0042d6a9880b38e1dd9ff83146cc3c9c18a059b9360ceae207805567aacccc69"}, - {file = "MarkupSafe-2.1.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:55d03fea4c4e9fd0ad75dc2e7e2b6757b80c152c032ea1d1de487461d8140efc"}, - {file = "MarkupSafe-2.1.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ab3a886a237f6e9c9f4f7d272067e712cdb4efa774bef494dccad08f39d8ae6"}, - {file = "MarkupSafe-2.1.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:abf5ebbec056817057bfafc0445916bb688a255a5146f900445d081db08cbabb"}, - {file = "MarkupSafe-2.1.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e1a0d1924a5013d4f294087e00024ad25668234569289650929ab871231668e7"}, - {file = "MarkupSafe-2.1.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:e7902211afd0af05fbadcc9a312e4cf10f27b779cf1323e78d52377ae4b72bea"}, - {file = "MarkupSafe-2.1.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:c669391319973e49a7c6230c218a1e3044710bc1ce4c8e6eb71f7e6d43a2c131"}, - {file = "MarkupSafe-2.1.4-cp311-cp311-win32.whl", hash = "sha256:31f57d64c336b8ccb1966d156932f3daa4fee74176b0fdc48ef580be774aae74"}, - {file = "MarkupSafe-2.1.4-cp311-cp311-win_amd64.whl", hash = "sha256:54a7e1380dfece8847c71bf7e33da5d084e9b889c75eca19100ef98027bd9f56"}, - {file = "MarkupSafe-2.1.4-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:a76cd37d229fc385738bd1ce4cba2a121cf26b53864c1772694ad0ad348e509e"}, - {file = "MarkupSafe-2.1.4-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:987d13fe1d23e12a66ca2073b8d2e2a75cec2ecb8eab43ff5624ba0ad42764bc"}, - {file = "MarkupSafe-2.1.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5244324676254697fe5c181fc762284e2c5fceeb1c4e3e7f6aca2b6f107e60dc"}, - {file = "MarkupSafe-2.1.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:78bc995e004681246e85e28e068111a4c3f35f34e6c62da1471e844ee1446250"}, - {file = "MarkupSafe-2.1.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a4d176cfdfde84f732c4a53109b293d05883e952bbba68b857ae446fa3119b4f"}, - {file = "MarkupSafe-2.1.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:f9917691f410a2e0897d1ef99619fd3f7dd503647c8ff2475bf90c3cf222ad74"}, - {file = "MarkupSafe-2.1.4-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:f06e5a9e99b7df44640767842f414ed5d7bedaaa78cd817ce04bbd6fd86e2dd6"}, - {file = "MarkupSafe-2.1.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:396549cea79e8ca4ba65525470d534e8a41070e6b3500ce2414921099cb73e8d"}, - {file = "MarkupSafe-2.1.4-cp312-cp312-win32.whl", hash = "sha256:f6be2d708a9d0e9b0054856f07ac7070fbe1754be40ca8525d5adccdbda8f475"}, - {file = "MarkupSafe-2.1.4-cp312-cp312-win_amd64.whl", hash = "sha256:5045e892cfdaecc5b4c01822f353cf2c8feb88a6ec1c0adef2a2e705eef0f656"}, - {file = "MarkupSafe-2.1.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:7a07f40ef8f0fbc5ef1000d0c78771f4d5ca03b4953fc162749772916b298fc4"}, - {file = "MarkupSafe-2.1.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d18b66fe626ac412d96c2ab536306c736c66cf2a31c243a45025156cc190dc8a"}, - {file = "MarkupSafe-2.1.4-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:698e84142f3f884114ea8cf83e7a67ca8f4ace8454e78fe960646c6c91c63bfa"}, - {file = "MarkupSafe-2.1.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:49a3b78a5af63ec10d8604180380c13dcd870aba7928c1fe04e881d5c792dc4e"}, - {file = "MarkupSafe-2.1.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:15866d7f2dc60cfdde12ebb4e75e41be862348b4728300c36cdf405e258415ec"}, - {file = "MarkupSafe-2.1.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:6aa5e2e7fc9bc042ae82d8b79d795b9a62bd8f15ba1e7594e3db243f158b5565"}, - {file = "MarkupSafe-2.1.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:54635102ba3cf5da26eb6f96c4b8c53af8a9c0d97b64bdcb592596a6255d8518"}, - {file = "MarkupSafe-2.1.4-cp37-cp37m-win32.whl", hash = "sha256:3583a3a3ab7958e354dc1d25be74aee6228938312ee875a22330c4dc2e41beb0"}, - {file = "MarkupSafe-2.1.4-cp37-cp37m-win_amd64.whl", hash = "sha256:d6e427c7378c7f1b2bef6a344c925b8b63623d3321c09a237b7cc0e77dd98ceb"}, - {file = "MarkupSafe-2.1.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:bf1196dcc239e608605b716e7b166eb5faf4bc192f8a44b81e85251e62584bd2"}, - {file = "MarkupSafe-2.1.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4df98d4a9cd6a88d6a585852f56f2155c9cdb6aec78361a19f938810aa020954"}, - {file = "MarkupSafe-2.1.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b835aba863195269ea358cecc21b400276747cc977492319fd7682b8cd2c253d"}, - {file = "MarkupSafe-2.1.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:23984d1bdae01bee794267424af55eef4dfc038dc5d1272860669b2aa025c9e3"}, - {file = "MarkupSafe-2.1.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1c98c33ffe20e9a489145d97070a435ea0679fddaabcafe19982fe9c971987d5"}, - {file = "MarkupSafe-2.1.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:9896fca4a8eb246defc8b2a7ac77ef7553b638e04fbf170bff78a40fa8a91474"}, - {file = "MarkupSafe-2.1.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:b0fe73bac2fed83839dbdbe6da84ae2a31c11cfc1c777a40dbd8ac8a6ed1560f"}, - {file = "MarkupSafe-2.1.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c7556bafeaa0a50e2fe7dc86e0382dea349ebcad8f010d5a7dc6ba568eaaa789"}, - {file = "MarkupSafe-2.1.4-cp38-cp38-win32.whl", hash = "sha256:fc1a75aa8f11b87910ffd98de62b29d6520b6d6e8a3de69a70ca34dea85d2a8a"}, - {file = "MarkupSafe-2.1.4-cp38-cp38-win_amd64.whl", hash = "sha256:3a66c36a3864df95e4f62f9167c734b3b1192cb0851b43d7cc08040c074c6279"}, - {file = "MarkupSafe-2.1.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:765f036a3d00395a326df2835d8f86b637dbaf9832f90f5d196c3b8a7a5080cb"}, - {file = "MarkupSafe-2.1.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:21e7af8091007bf4bebf4521184f4880a6acab8df0df52ef9e513d8e5db23411"}, - {file = "MarkupSafe-2.1.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d5c31fe855c77cad679b302aabc42d724ed87c043b1432d457f4976add1c2c3e"}, - {file = "MarkupSafe-2.1.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7653fa39578957bc42e5ebc15cf4361d9e0ee4b702d7d5ec96cdac860953c5b4"}, - {file = "MarkupSafe-2.1.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:47bb5f0142b8b64ed1399b6b60f700a580335c8e1c57f2f15587bd072012decc"}, - {file = "MarkupSafe-2.1.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:fe8512ed897d5daf089e5bd010c3dc03bb1bdae00b35588c49b98268d4a01e00"}, - {file = "MarkupSafe-2.1.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:36d7626a8cca4d34216875aee5a1d3d654bb3dac201c1c003d182283e3205949"}, - {file = "MarkupSafe-2.1.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:b6f14a9cd50c3cb100eb94b3273131c80d102e19bb20253ac7bd7336118a673a"}, - {file = "MarkupSafe-2.1.4-cp39-cp39-win32.whl", hash = "sha256:c8f253a84dbd2c63c19590fa86a032ef3d8cc18923b8049d91bcdeeb2581fbf6"}, - {file = "MarkupSafe-2.1.4-cp39-cp39-win_amd64.whl", hash = "sha256:8b570a1537367b52396e53325769608f2a687ec9a4363647af1cded8928af959"}, - {file = "MarkupSafe-2.1.4.tar.gz", hash = "sha256:3aae9af4cac263007fd6309c64c6ab4506dd2b79382d9d19a1994f9240b8db4f"}, + {file = "MarkupSafe-2.1.5-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:a17a92de5231666cfbe003f0e4b9b3a7ae3afb1ec2845aadc2bacc93ff85febc"}, + {file = "MarkupSafe-2.1.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:72b6be590cc35924b02c78ef34b467da4ba07e4e0f0454a2c5907f473fc50ce5"}, + {file = "MarkupSafe-2.1.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e61659ba32cf2cf1481e575d0462554625196a1f2fc06a1c777d3f48e8865d46"}, + {file = "MarkupSafe-2.1.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2174c595a0d73a3080ca3257b40096db99799265e1c27cc5a610743acd86d62f"}, + {file = "MarkupSafe-2.1.5-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ae2ad8ae6ebee9d2d94b17fb62763125f3f374c25618198f40cbb8b525411900"}, + {file = "MarkupSafe-2.1.5-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:075202fa5b72c86ad32dc7d0b56024ebdbcf2048c0ba09f1cde31bfdd57bcfff"}, + {file = "MarkupSafe-2.1.5-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:598e3276b64aff0e7b3451b72e94fa3c238d452e7ddcd893c3ab324717456bad"}, + {file = "MarkupSafe-2.1.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:fce659a462a1be54d2ffcacea5e3ba2d74daa74f30f5f143fe0c58636e355fdd"}, + {file = "MarkupSafe-2.1.5-cp310-cp310-win32.whl", hash = "sha256:d9fad5155d72433c921b782e58892377c44bd6252b5af2f67f16b194987338a4"}, + {file = "MarkupSafe-2.1.5-cp310-cp310-win_amd64.whl", hash = "sha256:bf50cd79a75d181c9181df03572cdce0fbb75cc353bc350712073108cba98de5"}, + {file = "MarkupSafe-2.1.5-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:629ddd2ca402ae6dbedfceeba9c46d5f7b2a61d9749597d4307f943ef198fc1f"}, + {file = "MarkupSafe-2.1.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:5b7b716f97b52c5a14bffdf688f971b2d5ef4029127f1ad7a513973cfd818df2"}, + {file = "MarkupSafe-2.1.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6ec585f69cec0aa07d945b20805be741395e28ac1627333b1c5b0105962ffced"}, + {file = "MarkupSafe-2.1.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b91c037585eba9095565a3556f611e3cbfaa42ca1e865f7b8015fe5c7336d5a5"}, + {file = "MarkupSafe-2.1.5-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7502934a33b54030eaf1194c21c692a534196063db72176b0c4028e140f8f32c"}, + {file = "MarkupSafe-2.1.5-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:0e397ac966fdf721b2c528cf028494e86172b4feba51d65f81ffd65c63798f3f"}, + {file = "MarkupSafe-2.1.5-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:c061bb86a71b42465156a3ee7bd58c8c2ceacdbeb95d05a99893e08b8467359a"}, + {file = "MarkupSafe-2.1.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:3a57fdd7ce31c7ff06cdfbf31dafa96cc533c21e443d57f5b1ecc6cdc668ec7f"}, + {file = "MarkupSafe-2.1.5-cp311-cp311-win32.whl", hash = "sha256:397081c1a0bfb5124355710fe79478cdbeb39626492b15d399526ae53422b906"}, + {file = "MarkupSafe-2.1.5-cp311-cp311-win_amd64.whl", hash = "sha256:2b7c57a4dfc4f16f7142221afe5ba4e093e09e728ca65c51f5620c9aaeb9a617"}, + {file = "MarkupSafe-2.1.5-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:8dec4936e9c3100156f8a2dc89c4b88d5c435175ff03413b443469c7c8c5f4d1"}, + {file = "MarkupSafe-2.1.5-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:3c6b973f22eb18a789b1460b4b91bf04ae3f0c4234a0a6aa6b0a92f6f7b951d4"}, + {file = "MarkupSafe-2.1.5-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ac07bad82163452a6884fe8fa0963fb98c2346ba78d779ec06bd7a6262132aee"}, + {file = "MarkupSafe-2.1.5-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f5dfb42c4604dddc8e4305050aa6deb084540643ed5804d7455b5df8fe16f5e5"}, + {file = "MarkupSafe-2.1.5-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ea3d8a3d18833cf4304cd2fc9cbb1efe188ca9b5efef2bdac7adc20594a0e46b"}, + {file = "MarkupSafe-2.1.5-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:d050b3361367a06d752db6ead6e7edeb0009be66bc3bae0ee9d97fb326badc2a"}, + {file = "MarkupSafe-2.1.5-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:bec0a414d016ac1a18862a519e54b2fd0fc8bbfd6890376898a6c0891dd82e9f"}, + {file = "MarkupSafe-2.1.5-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:58c98fee265677f63a4385256a6d7683ab1832f3ddd1e66fe948d5880c21a169"}, + {file = "MarkupSafe-2.1.5-cp312-cp312-win32.whl", hash = "sha256:8590b4ae07a35970728874632fed7bd57b26b0102df2d2b233b6d9d82f6c62ad"}, + {file = "MarkupSafe-2.1.5-cp312-cp312-win_amd64.whl", hash = "sha256:823b65d8706e32ad2df51ed89496147a42a2a6e01c13cfb6ffb8b1e92bc910bb"}, + {file = "MarkupSafe-2.1.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:c8b29db45f8fe46ad280a7294f5c3ec36dbac9491f2d1c17345be8e69cc5928f"}, + {file = "MarkupSafe-2.1.5-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ec6a563cff360b50eed26f13adc43e61bc0c04d94b8be985e6fb24b81f6dcfdf"}, + {file = "MarkupSafe-2.1.5-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a549b9c31bec33820e885335b451286e2969a2d9e24879f83fe904a5ce59d70a"}, + {file = "MarkupSafe-2.1.5-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4f11aa001c540f62c6166c7726f71f7573b52c68c31f014c25cc7901deea0b52"}, + {file = "MarkupSafe-2.1.5-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:7b2e5a267c855eea6b4283940daa6e88a285f5f2a67f2220203786dfa59b37e9"}, + {file = "MarkupSafe-2.1.5-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:2d2d793e36e230fd32babe143b04cec8a8b3eb8a3122d2aceb4a371e6b09b8df"}, + {file = "MarkupSafe-2.1.5-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:ce409136744f6521e39fd8e2a24c53fa18ad67aa5bc7c2cf83645cce5b5c4e50"}, + {file = "MarkupSafe-2.1.5-cp37-cp37m-win32.whl", hash = "sha256:4096e9de5c6fdf43fb4f04c26fb114f61ef0bf2e5604b6ee3019d51b69e8c371"}, + {file = "MarkupSafe-2.1.5-cp37-cp37m-win_amd64.whl", hash = "sha256:4275d846e41ecefa46e2015117a9f491e57a71ddd59bbead77e904dc02b1bed2"}, + {file = "MarkupSafe-2.1.5-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:656f7526c69fac7f600bd1f400991cc282b417d17539a1b228617081106feb4a"}, + {file = "MarkupSafe-2.1.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:97cafb1f3cbcd3fd2b6fbfb99ae11cdb14deea0736fc2b0952ee177f2b813a46"}, + {file = "MarkupSafe-2.1.5-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1f3fbcb7ef1f16e48246f704ab79d79da8a46891e2da03f8783a5b6fa41a9532"}, + {file = "MarkupSafe-2.1.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fa9db3f79de01457b03d4f01b34cf91bc0048eb2c3846ff26f66687c2f6d16ab"}, + {file = "MarkupSafe-2.1.5-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ffee1f21e5ef0d712f9033568f8344d5da8cc2869dbd08d87c84656e6a2d2f68"}, + {file = "MarkupSafe-2.1.5-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:5dedb4db619ba5a2787a94d877bc8ffc0566f92a01c0ef214865e54ecc9ee5e0"}, + {file = "MarkupSafe-2.1.5-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:30b600cf0a7ac9234b2638fbc0fb6158ba5bdcdf46aeb631ead21248b9affbc4"}, + {file = "MarkupSafe-2.1.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:8dd717634f5a044f860435c1d8c16a270ddf0ef8588d4887037c5028b859b0c3"}, + {file = "MarkupSafe-2.1.5-cp38-cp38-win32.whl", hash = "sha256:daa4ee5a243f0f20d528d939d06670a298dd39b1ad5f8a72a4275124a7819eff"}, + {file = "MarkupSafe-2.1.5-cp38-cp38-win_amd64.whl", hash = "sha256:619bc166c4f2de5caa5a633b8b7326fbe98e0ccbfacabd87268a2b15ff73a029"}, + {file = "MarkupSafe-2.1.5-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:7a68b554d356a91cce1236aa7682dc01df0edba8d043fd1ce607c49dd3c1edcf"}, + {file = "MarkupSafe-2.1.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:db0b55e0f3cc0be60c1f19efdde9a637c32740486004f20d1cff53c3c0ece4d2"}, + {file = "MarkupSafe-2.1.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3e53af139f8579a6d5f7b76549125f0d94d7e630761a2111bc431fd820e163b8"}, + {file = "MarkupSafe-2.1.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:17b950fccb810b3293638215058e432159d2b71005c74371d784862b7e4683f3"}, + {file = "MarkupSafe-2.1.5-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4c31f53cdae6ecfa91a77820e8b151dba54ab528ba65dfd235c80b086d68a465"}, + {file = "MarkupSafe-2.1.5-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:bff1b4290a66b490a2f4719358c0cdcd9bafb6b8f061e45c7a2460866bf50c2e"}, + {file = "MarkupSafe-2.1.5-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:bc1667f8b83f48511b94671e0e441401371dfd0f0a795c7daa4a3cd1dde55bea"}, + {file = "MarkupSafe-2.1.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5049256f536511ee3f7e1b3f87d1d1209d327e818e6ae1365e8653d7e3abb6a6"}, + {file = "MarkupSafe-2.1.5-cp39-cp39-win32.whl", hash = "sha256:00e046b6dd71aa03a41079792f8473dc494d564611a8f89bbbd7cb93295ebdcf"}, + {file = "MarkupSafe-2.1.5-cp39-cp39-win_amd64.whl", hash = "sha256:fa173ec60341d6bb97a89f5ea19c85c5643c1e7dedebc22f5181eb73573142c5"}, + {file = "MarkupSafe-2.1.5.tar.gz", hash = "sha256:d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b"}, ] [[package]] @@ -1933,18 +1933,18 @@ files = [ [[package]] name = "platformdirs" -version = "4.1.0" +version = "4.2.0" description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." optional = false python-versions = ">=3.8" files = [ - {file = "platformdirs-4.1.0-py3-none-any.whl", hash = "sha256:11c8f37bcca40db96d8144522d925583bdb7a31f7b0e37e3ed4318400a8e2380"}, - {file = "platformdirs-4.1.0.tar.gz", hash = "sha256:906d548203468492d432bcb294d4bc2fff751bf84971fbb2c10918cc206ee420"}, + {file = "platformdirs-4.2.0-py3-none-any.whl", hash = "sha256:0614df2a2f37e1a662acbd8e2b25b92ccf8632929bc6d43467e17fe89c75e068"}, + {file = "platformdirs-4.2.0.tar.gz", hash = "sha256:ef0cc731df711022c174543cb70a9b5bd22e5a9337c8624ef2c2ceb8ddad8768"}, ] [package.extras] -docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.1)", "sphinx-autodoc-typehints (>=1.24)"] -test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)"] +docs = ["furo (>=2023.9.10)", "proselint (>=0.13)", "sphinx (>=7.2.6)", "sphinx-autodoc-typehints (>=1.25.2)"] +test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4.3)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)"] [[package]] name = "pluggy" @@ -2209,13 +2209,13 @@ files = [ [[package]] name = "pytz" -version = "2023.3.post1" +version = "2024.1" description = "World timezone definitions, modern and historical" optional = false python-versions = "*" files = [ - {file = "pytz-2023.3.post1-py2.py3-none-any.whl", hash = "sha256:ce42d816b81b68506614c11e8937d3aa9e41007ceb50bfdcb0749b921bf646c7"}, - {file = "pytz-2023.3.post1.tar.gz", hash = "sha256:7b4fddbeb94a1eba4b557da24f19fdf9db575192544270a9101d8509f9f43d7b"}, + {file = "pytz-2024.1-py2.py3-none-any.whl", hash = "sha256:328171f4e3623139da4983451950b28e95ac706e13f3f2630a879749e7a8b319"}, + {file = "pytz-2024.1.tar.gz", hash = "sha256:2a29735ea9c18baf14b448846bde5a48030ed267578472d8955cd0e7443a9812"}, ] [[package]] @@ -2268,6 +2268,7 @@ files = [ {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"}, + {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"}, {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"}, {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"}, {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"}, @@ -2275,8 +2276,15 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"}, + {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"}, {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"}, {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, + {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, + {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, + {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"}, {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"}, @@ -2293,6 +2301,7 @@ files = [ {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"}, + {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"}, {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"}, {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"}, {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"}, @@ -2300,6 +2309,7 @@ files = [ {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"}, + {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"}, {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"}, {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"}, {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, @@ -2394,13 +2404,13 @@ py = {version = "*", markers = "implementation_name == \"pypy\""} [[package]] name = "referencing" -version = "0.32.1" +version = "0.33.0" description = "JSON Referencing + Python" optional = false python-versions = ">=3.8" files = [ - {file = "referencing-0.32.1-py3-none-any.whl", hash = "sha256:7e4dc12271d8e15612bfe35792f5ea1c40970dadf8624602e33db2758f7ee554"}, - {file = "referencing-0.32.1.tar.gz", hash = "sha256:3c57da0513e9563eb7e203ebe9bb3a1b509b042016433bd1e45a2853466c3dd3"}, + {file = "referencing-0.33.0-py3-none-any.whl", hash = "sha256:39240f2ecc770258f28b642dd47fd74bc8b02484de54e1882b74b35ebd779bd5"}, + {file = "referencing-0.33.0.tar.gz", hash = "sha256:c775fedf74bc0f9189c2a3be1c12fd03e8c23f4d371dce795df44e06c5b412f7"}, ] [package.dependencies] @@ -2563,28 +2573,28 @@ files = [ [[package]] name = "ruff" -version = "0.1.14" +version = "0.2.0" description = "An extremely fast Python linter and code formatter, written in Rust." optional = false python-versions = ">=3.7" files = [ - {file = "ruff-0.1.14-py3-none-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:96f76536df9b26622755c12ed8680f159817be2f725c17ed9305b472a757cdbb"}, - {file = "ruff-0.1.14-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:ab3f71f64498c7241123bb5a768544cf42821d2a537f894b22457a543d3ca7a9"}, - {file = "ruff-0.1.14-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7060156ecc572b8f984fd20fd8b0fcb692dd5d837b7606e968334ab7ff0090ab"}, - {file = "ruff-0.1.14-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:a53d8e35313d7b67eb3db15a66c08434809107659226a90dcd7acb2afa55faea"}, - {file = "ruff-0.1.14-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bea9be712b8f5b4ebed40e1949379cfb2a7d907f42921cf9ab3aae07e6fba9eb"}, - {file = "ruff-0.1.14-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:2270504d629a0b064247983cbc495bed277f372fb9eaba41e5cf51f7ba705a6a"}, - {file = "ruff-0.1.14-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:80258bb3b8909b1700610dfabef7876423eed1bc930fe177c71c414921898efa"}, - {file = "ruff-0.1.14-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:653230dd00aaf449eb5ff25d10a6e03bc3006813e2cb99799e568f55482e5cae"}, - {file = "ruff-0.1.14-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:87b3acc6c4e6928459ba9eb7459dd4f0c4bf266a053c863d72a44c33246bfdbf"}, - {file = "ruff-0.1.14-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:6b3dadc9522d0eccc060699a9816e8127b27addbb4697fc0c08611e4e6aeb8b5"}, - {file = "ruff-0.1.14-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:1c8eca1a47b4150dc0fbec7fe68fc91c695aed798532a18dbb1424e61e9b721f"}, - {file = "ruff-0.1.14-py3-none-musllinux_1_2_i686.whl", hash = "sha256:62ce2ae46303ee896fc6811f63d6dabf8d9c389da0f3e3f2bce8bc7f15ef5488"}, - {file = "ruff-0.1.14-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:b2027dde79d217b211d725fc833e8965dc90a16d0d3213f1298f97465956661b"}, - {file = "ruff-0.1.14-py3-none-win32.whl", hash = "sha256:722bafc299145575a63bbd6b5069cb643eaa62546a5b6398f82b3e4403329cab"}, - {file = "ruff-0.1.14-py3-none-win_amd64.whl", hash = "sha256:e3d241aa61f92b0805a7082bd89a9990826448e4d0398f0e2bc8f05c75c63d99"}, - {file = "ruff-0.1.14-py3-none-win_arm64.whl", hash = "sha256:269302b31ade4cde6cf6f9dd58ea593773a37ed3f7b97e793c8594b262466b67"}, - {file = "ruff-0.1.14.tar.gz", hash = "sha256:ad3f8088b2dfd884820289a06ab718cde7d38b94972212cc4ba90d5fbc9955f3"}, + {file = "ruff-0.2.0-py3-none-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:638ea3294f800d18bae84a492cb5a245c8d29c90d19a91d8e338937a4c27fca0"}, + {file = "ruff-0.2.0-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:3ff35433fcf4dff6d610738712152df6b7d92351a1bde8e00bd405b08b3d5759"}, + {file = "ruff-0.2.0-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf9faafbdcf4f53917019f2c230766da437d4fd5caecd12ddb68bb6a17d74399"}, + {file = "ruff-0.2.0-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:8153a3e4128ed770871c47545f1ae7b055023e0c222ff72a759f5a341ee06483"}, + {file = "ruff-0.2.0-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e8a75a98ae989a27090e9c51f763990ad5bbc92d20626d54e9701c7fe597f399"}, + {file = "ruff-0.2.0-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:87057dd2fdde297130ff99553be8549ca38a2965871462a97394c22ed2dfc19d"}, + {file = "ruff-0.2.0-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:6d232f99d3ab00094ebaf88e0fb7a8ccacaa54cc7fa3b8993d9627a11e6aed7a"}, + {file = "ruff-0.2.0-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3d3c641f95f435fc6754b05591774a17df41648f0daf3de0d75ad3d9f099ab92"}, + {file = "ruff-0.2.0-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3826fb34c144ef1e171b323ed6ae9146ab76d109960addca730756dc19dc7b22"}, + {file = "ruff-0.2.0-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:eceab7d85d09321b4de18b62d38710cf296cb49e98979960a59c6b9307c18cfe"}, + {file = "ruff-0.2.0-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:30ad74687e1f4a9ff8e513b20b82ccadb6bd796fe5697f1e417189c5cde6be3e"}, + {file = "ruff-0.2.0-py3-none-musllinux_1_2_i686.whl", hash = "sha256:a7e3818698f8460bd0f8d4322bbe99db8327e9bc2c93c789d3159f5b335f47da"}, + {file = "ruff-0.2.0-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:edf23041242c48b0d8295214783ef543847ef29e8226d9f69bf96592dba82a83"}, + {file = "ruff-0.2.0-py3-none-win32.whl", hash = "sha256:e155147199c2714ff52385b760fe242bb99ea64b240a9ffbd6a5918eb1268843"}, + {file = "ruff-0.2.0-py3-none-win_amd64.whl", hash = "sha256:ba918e01cdd21e81b07555564f40d307b0caafa9a7a65742e98ff244f5035c59"}, + {file = "ruff-0.2.0-py3-none-win_arm64.whl", hash = "sha256:3fbaff1ba9564a2c5943f8f38bc221f04bac687cc7485e45237579fee7ccda79"}, + {file = "ruff-0.2.0.tar.gz", hash = "sha256:63856b91837606c673537d2889989733d7dffde553828d3b0f0bacfa6def54be"}, ] [[package]] @@ -3305,17 +3315,18 @@ dev = ["flake8", "flake8-annotations", "flake8-bandit", "flake8-bugbear", "flake [[package]] name = "urllib3" -version = "2.1.0" +version = "2.2.0" description = "HTTP library with thread-safe connection pooling, file post, and more." optional = false python-versions = ">=3.8" files = [ - {file = "urllib3-2.1.0-py3-none-any.whl", hash = "sha256:55901e917a5896a349ff771be919f8bd99aff50b79fe58fec595eb37bbc56bb3"}, - {file = "urllib3-2.1.0.tar.gz", hash = "sha256:df7aa8afb0148fa78488e7899b2c59b5f4ffcfa82e6c54ccb9dd37c1d7b52d54"}, + {file = "urllib3-2.2.0-py3-none-any.whl", hash = "sha256:ce3711610ddce217e6d113a2732fafad960a03fd0318c91faa79481e35c11224"}, + {file = "urllib3-2.2.0.tar.gz", hash = "sha256:051d961ad0c62a94e50ecf1af379c3aba230c66c710493493560c0c223c49f20"}, ] [package.extras] brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)"] +h2 = ["h2 (>=4,<5)"] socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"] zstd = ["zstandard (>=0.18.0)"] diff --git a/pyproject.toml b/pyproject.toml index e545945ea..717a97fdf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -105,7 +105,7 @@ skip-string-normalization = true [tool.ruff] line-length = 120 -ignore = [ +lint.ignore = [ "B904", "C417", "C901", @@ -120,16 +120,16 @@ ignore = [ "F811", "F821", "F841", - "R504", - "R505", - "R506", - "R507", + "RET504", + "RET505", + "RET506", + "RET507", "SIM102", "SIM108", "SIM114", ] target-version = "py311" -extend-select = ["B", "C", "R", "SIM"] +lint.extend-select = ["B", "C", "RET", "SIM"] [build-system] requires = ["poetry_core>=1.0.0"] diff --git a/requirements.dev.txt b/requirements.dev.txt index 2e17db379..f044049db 100644 --- a/requirements.dev.txt +++ b/requirements.dev.txt @@ -10,12 +10,12 @@ babel==2.14.0 ; python_version >= "3.8" and python_version < "3.12" backcall==0.2.0 ; python_version >= "3.8" and python_version < "3.12" base58==2.1.1 ; python_version >= "3.8" and python_version < "3.12" beautifulsoup4==4.12.3 ; python_version >= "3.8" and python_version < "3.12" -black==24.1.0 ; python_version >= "3.8" and python_version < "3.12" +black==24.1.1 ; python_version >= "3.8" and python_version < "3.12" bleach==6.1.0 ; python_version >= "3.8" and python_version < "3.12" bump2version==1.0.1 ; python_version >= "3.8" and python_version < "3.12" cached-property==1.5.2 ; python_version >= "3.8" and python_version < "3.12" cattrs==23.2.3 ; python_version >= "3.8" and python_version < "3.12" -certifi==2023.11.17 ; python_version >= "3.8" and python_version < "3.12" +certifi==2024.2.2 ; python_version >= "3.8" and python_version < "3.12" cffi==1.16.0 ; python_version >= "3.8" and python_version < "3.12" chardet==5.2.0 ; python_version >= "3.8" and python_version < "3.12" charset-normalizer==3.3.2 ; python_version >= "3.8" and python_version < "3.12" @@ -64,7 +64,7 @@ jupyter-events==0.9.0 ; python_version >= "3.8" and python_version < "3.12" jupyter-server-terminals==0.5.2 ; python_version >= "3.8" and python_version < "3.12" jupyter-server==2.12.5 ; python_version >= "3.8" and python_version < "3.12" jupyterlab-pygments==0.3.0 ; python_version >= "3.8" and python_version < "3.12" -markupsafe==2.1.4 ; python_version >= "3.8" and python_version < "3.12" +markupsafe==2.1.5 ; python_version >= "3.8" and python_version < "3.12" matplotlib-inline==0.1.6 ; python_version >= "3.8" and python_version < "3.12" mistune==3.0.2 ; python_version >= "3.8" and python_version < "3.12" mnemonic==0.20 ; python_version >= "3.8" and python_version < "3.12" @@ -87,7 +87,7 @@ pathspec==0.12.1 ; python_version >= "3.8" and python_version < "3.12" pexpect==4.9.0 ; python_version >= "3.8" and python_version < "3.12" and sys_platform != "win32" pickleshare==0.7.5 ; python_version >= "3.8" and python_version < "3.12" pkgutil-resolve-name==1.3.10 ; python_version >= "3.8" and python_version < "3.9" -platformdirs==4.1.0 ; python_version >= "3.8" and python_version < "3.12" +platformdirs==4.2.0 ; python_version >= "3.8" and python_version < "3.12" pluggy==1.4.0 ; python_version >= "3.8" and python_version < "3.12" ply==3.11 ; python_version >= "3.8" and python_version < "3.12" prometheus-client==0.19.0 ; python_version >= "3.8" and python_version < "3.12" @@ -105,17 +105,17 @@ pytest-xdist==3.5.0 ; python_version >= "3.8" and python_version < "3.12" pytest==8.0.0 ; python_version >= "3.8" and python_version < "3.12" python-dateutil==2.8.2 ; python_version >= "3.8" and python_version < "3.12" python-json-logger==2.0.7 ; python_version >= "3.8" and python_version < "3.12" -pytz==2023.3.post1 ; python_version >= "3.8" and python_version < "3.9" +pytz==2024.1 ; python_version >= "3.8" and python_version < "3.9" pywin32==306 ; python_version >= "3.8" and python_version < "3.12" and sys_platform == "win32" pywinpty==2.0.12 ; python_version >= "3.8" and python_version < "3.12" and os_name == "nt" pyyaml==6.0.1 ; python_version >= "3.8" and python_version < "3.12" pyzmq==24.0.1 ; python_version >= "3.8" and python_version < "3.12" -referencing==0.32.1 ; python_version >= "3.8" and python_version < "3.12" +referencing==0.33.0 ; python_version >= "3.8" and python_version < "3.12" requests==2.31.0 ; python_version >= "3.8" and python_version < "3.12" rfc3339-validator==0.1.4 ; python_version >= "3.8" and python_version < "3.12" rfc3986-validator==0.1.1 ; python_version >= "3.8" and python_version < "3.12" rpds-py==0.17.1 ; python_version >= "3.8" and python_version < "3.12" -ruff==0.1.14 ; python_version >= "3.8" and python_version < "3.12" +ruff==0.2.0 ; python_version >= "3.8" and python_version < "3.12" secp256k1==0.14.0 ; python_version >= "3.8" and python_version < "3.12" send2trash==1.8.2 ; python_version >= "3.8" and python_version < "3.12" setuptools==69.0.3 ; python_version >= "3.8" and python_version < "3.12" @@ -156,7 +156,7 @@ types-simplejson==3.19.0.2 ; python_version >= "3.8" and python_version < "3.12" types-tabulate==0.9.0.20240106 ; python_version >= "3.8" and python_version < "3.12" typing-extensions==4.9.0 ; python_version >= "3.8" and python_version < "3.12" uri-template==1.3.0 ; python_version >= "3.8" and python_version < "3.12" -urllib3==2.1.0 ; python_version >= "3.8" and python_version < "3.12" +urllib3==2.2.0 ; python_version >= "3.8" and python_version < "3.12" wcwidth==0.2.13 ; python_version >= "3.8" and python_version < "3.12" webcolors==1.13 ; python_version >= "3.8" and python_version < "3.12" webencodings==0.5.1 ; python_version >= "3.8" and python_version < "3.12" diff --git a/requirements.slim.txt b/requirements.slim.txt index 8ac5f695a..7ba7ac689 100644 --- a/requirements.slim.txt +++ b/requirements.slim.txt @@ -2,7 +2,7 @@ attrs==23.2.0 ; python_version >= "3.8" and python_version < "3.12" base58==2.1.1 ; python_version >= "3.8" and python_version < "3.12" cached-property==1.5.2 ; python_version >= "3.8" and python_version < "3.12" cattrs==23.2.3 ; python_version >= "3.8" and python_version < "3.12" -certifi==2023.11.17 ; python_version >= "3.8" and python_version < "3.12" +certifi==2024.2.2 ; python_version >= "3.8" and python_version < "3.12" cffi==1.16.0 ; python_version >= "3.8" and python_version < "3.12" charset-normalizer==3.3.2 ; python_version >= "3.8" and python_version < "3.12" click==8.1.7 ; python_version >= "3.8" and python_version < "3.12" @@ -31,7 +31,7 @@ pycparser==2.21 ; python_version >= "3.8" and python_version < "3.12" pysodium==0.7.17 ; python_version >= "3.8" and python_version < "3.12" python-dateutil==2.8.2 ; python_version >= "3.8" and python_version < "3.12" pywin32==306 ; python_version >= "3.8" and python_version < "3.12" and sys_platform == "win32" -referencing==0.32.1 ; python_version >= "3.8" and python_version < "3.12" +referencing==0.33.0 ; python_version >= "3.8" and python_version < "3.12" requests==2.31.0 ; python_version >= "3.8" and python_version < "3.12" rpds-py==0.17.1 ; python_version >= "3.8" and python_version < "3.12" secp256k1==0.14.0 ; python_version >= "3.8" and python_version < "3.12" @@ -45,7 +45,7 @@ testcontainers==3.7.1 ; python_version >= "3.8" and python_version < "3.12" toolz==0.12.1 ; python_version >= "3.8" and python_version < "3.12" and (implementation_name == "pypy" or implementation_name == "cpython") tqdm==4.66.1 ; python_version >= "3.8" and python_version < "3.12" typing-extensions==4.9.0 ; python_version >= "3.8" and python_version < "3.12" -urllib3==2.1.0 ; python_version >= "3.8" and python_version < "3.12" +urllib3==2.2.0 ; python_version >= "3.8" and python_version < "3.12" websocket-client==1.7.0 ; python_version >= "3.8" and python_version < "3.12" wrapt==1.16.0 ; python_version >= "3.8" and python_version < "3.12" zipp==3.17.0 ; python_version >= "3.8" and python_version < "3.9" diff --git a/requirements.txt b/requirements.txt index 7bec42510..dc0411d0b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ beautifulsoup4==4.12.3 ; python_version >= "3.8" and python_version < "3.12" bleach==6.1.0 ; python_version >= "3.8" and python_version < "3.12" cached-property==1.5.2 ; python_version >= "3.8" and python_version < "3.12" cattrs==23.2.3 ; python_version >= "3.8" and python_version < "3.12" -certifi==2023.11.17 ; python_version >= "3.8" and python_version < "3.12" +certifi==2024.2.2 ; python_version >= "3.8" and python_version < "3.12" cffi==1.16.0 ; python_version >= "3.8" and python_version < "3.12" charset-normalizer==3.3.2 ; python_version >= "3.8" and python_version < "3.12" click==8.1.7 ; python_version >= "3.8" and python_version < "3.12" @@ -52,7 +52,7 @@ jupyter-events==0.9.0 ; python_version >= "3.8" and python_version < "3.12" jupyter-server-terminals==0.5.2 ; python_version >= "3.8" and python_version < "3.12" jupyter-server==2.12.5 ; python_version >= "3.8" and python_version < "3.12" jupyterlab-pygments==0.3.0 ; python_version >= "3.8" and python_version < "3.12" -markupsafe==2.1.4 ; python_version >= "3.8" and python_version < "3.12" +markupsafe==2.1.5 ; python_version >= "3.8" and python_version < "3.12" matplotlib-inline==0.1.6 ; python_version >= "3.8" and python_version < "3.12" mistune==3.0.2 ; python_version >= "3.8" and python_version < "3.12" mnemonic==0.20 ; python_version >= "3.8" and python_version < "3.12" @@ -72,7 +72,7 @@ parso==0.8.3 ; python_version >= "3.8" and python_version < "3.12" pexpect==4.9.0 ; python_version >= "3.8" and python_version < "3.12" and sys_platform != "win32" pickleshare==0.7.5 ; python_version >= "3.8" and python_version < "3.12" pkgutil-resolve-name==1.3.10 ; python_version >= "3.8" and python_version < "3.9" -platformdirs==4.1.0 ; python_version >= "3.8" and python_version < "3.12" +platformdirs==4.2.0 ; python_version >= "3.8" and python_version < "3.12" ply==3.11 ; python_version >= "3.8" and python_version < "3.12" prometheus-client==0.19.0 ; python_version >= "3.8" and python_version < "3.12" prompt-toolkit==3.0.43 ; python_version >= "3.8" and python_version < "3.12" @@ -90,7 +90,7 @@ pywin32==306 ; python_version >= "3.8" and python_version < "3.12" and sys_platf pywinpty==2.0.12 ; python_version >= "3.8" and python_version < "3.12" and os_name == "nt" pyyaml==6.0.1 ; python_version >= "3.8" and python_version < "3.12" pyzmq==24.0.1 ; python_version >= "3.8" and python_version < "3.12" -referencing==0.32.1 ; python_version >= "3.8" and python_version < "3.12" +referencing==0.33.0 ; python_version >= "3.8" and python_version < "3.12" requests==2.31.0 ; python_version >= "3.8" and python_version < "3.12" rfc3339-validator==0.1.4 ; python_version >= "3.8" and python_version < "3.12" rfc3986-validator==0.1.1 ; python_version >= "3.8" and python_version < "3.12" @@ -116,7 +116,7 @@ traitlets==5.14.1 ; python_version >= "3.8" and python_version < "3.12" types-python-dateutil==2.8.19.20240106 ; python_version >= "3.8" and python_version < "3.12" typing-extensions==4.9.0 ; python_version >= "3.8" and python_version < "3.12" uri-template==1.3.0 ; python_version >= "3.8" and python_version < "3.12" -urllib3==2.1.0 ; python_version >= "3.8" and python_version < "3.12" +urllib3==2.2.0 ; python_version >= "3.8" and python_version < "3.12" wcwidth==0.2.13 ; python_version >= "3.8" and python_version < "3.12" webcolors==1.13 ; python_version >= "3.8" and python_version < "3.12" webencodings==0.5.1 ; python_version >= "3.8" and python_version < "3.12" diff --git a/src/michelson_kernel/kernel.py b/src/michelson_kernel/kernel.py index 323f553a0..9f617373d 100644 --- a/src/michelson_kernel/kernel.py +++ b/src/michelson_kernel/kernel.py @@ -3,12 +3,14 @@ from typing import Dict from typing import List from typing import Optional +from typing import TextIO from typing import Tuple from typing import Type from typing import Union from typing import cast import traitlets +from ipykernel.iostream import OutStream from ipykernel.kernelbase import Kernel from tabulate import tabulate @@ -199,8 +201,8 @@ class MichelsonKernel(Kernel): banner = 'Michelson (Tezos VM language)' help_links = traitlets.List( [ - 'https://michelson.nomadic-labs.com/', - 'https://tezos.gitlab.io/whitedoc/michelson.html', + {'Guide': 'https://michelson.nomadic-labs.com/'}, + {'Reference': 'https://tezos.gitlab.io/whitedoc/michelson.html'}, ] ) @@ -208,16 +210,6 @@ def __init__(self, **kwargs): super().__init__(**kwargs) self.interpreter = Interpreter() - def _stdout(self, text: str) -> None: - self.send_response( - self.iopub_socket, - 'stream', - { - 'name': 'stdout', - 'text': text, - }, - ) - def _find_stack_items( self, instructions: MichelineSequence, @@ -336,7 +328,14 @@ def do_execute( interpreter_result = self.interpreter.execute(code) if not silent and interpreter_result.stdout: - self._stdout('\n'.join(interpreter_result.stdout)) + self.send_response( + self.iopub_socket, + 'stream', + { + 'name': 'stdout', + 'text': '\n'.join(interpreter_result.stdout), + }, + ) if not interpreter_result.error: if not silent: diff --git a/src/pytezos/block/header.py b/src/pytezos/block/header.py index 4364c00f5..7201e4c3e 100644 --- a/src/pytezos/block/header.py +++ b/src/pytezos/block/header.py @@ -23,6 +23,8 @@ from pytezos.sandbox.parameters import protocol_version from pytezos.sandbox.parameters import sandbox_params +bson.encoder.encoders[int] = bson.encoder.encoders[float] + class BlockHeader(ContextMixin): """Representation of block creation call""" diff --git a/src/pytezos/context/mixin.py b/src/pytezos/context/mixin.py index b62012014..81fe0c7d0 100644 --- a/src/pytezos/context/mixin.py +++ b/src/pytezos/context/mixin.py @@ -39,6 +39,7 @@ 'limanet': ['https://rpc.tzkt.io/limanet'], 'mumbainet': ['https://rpc.tzkt.io/mumbainet'], 'nairobinet': ['https://rpc.tzkt.io/nairobinet'], + 'oxfordnet': ['https://rpc.tzkt.io/oxfordnet'], } keys = { 'alice': alice_key, diff --git a/src/pytezos/sandbox/node.py b/src/pytezos/sandbox/node.py index fb7405bc3..63ed66645 100644 --- a/src/pytezos/sandbox/node.py +++ b/src/pytezos/sandbox/node.py @@ -22,7 +22,7 @@ from pytezos.sandbox.parameters import LATEST from pytezos.sandbox.parameters import sandbox_addresses -DOCKER_IMAGE = 'bakingbad/sandboxed-node:v17.0-1' +DOCKER_IMAGE = 'bakingbad/sandboxed-node:v19.0-1' MAX_ATTEMPTS = 100 ATTEMPT_DELAY = 0.1 TEZOS_NODE_PORT = 8732 diff --git a/src/pytezos/sandbox/parameters.py b/src/pytezos/sandbox/parameters.py index b1e771dcd..1ac77052f 100644 --- a/src/pytezos/sandbox/parameters.py +++ b/src/pytezos/sandbox/parameters.py @@ -13,7 +13,8 @@ LIMA = 'PtLimaPtLMwfNinJi9rCfDPWea8dFgTZ1MeJ9f1m2SRic6ayiwW' MUMBAI = 'PtMumbai2TmsJHNGRkD8v8YDbtao7BLUC3wjASn1inAKLFCjaH1' NAIROBI = 'PtNairobiyssHuh87hEhfVBGCVrK3WnS8Z2FT4ymB5tAa4r1nQf' -LATEST = NAIROBI +OXFORD = 'ProxfordYmVfjWnRcgjWH36fW6PArwqykTFzotUxRs6gmTcZDuH' +LATEST = OXFORD protocol_version = { EDO: 8, @@ -26,6 +27,7 @@ LIMA: 15, MUMBAI: 16, NAIROBI: 17, + OXFORD: 18, } sandbox_commitment = { @@ -80,11 +82,12 @@ 'preserved_cycles': 2.0, 'blocks_per_cycle': 8.0, 'blocks_per_commitment': 4.0, + 'blocks_per_stake_snapshot': 8, 'cycles_per_voting_period': 64.0, + 'nonce_revelation_threshold': 1, 'hard_gas_limit_per_operation': '1040000', 'hard_gas_limit_per_block': '10400000', 'proof_of_work_threshold': str((1 << 63) - 1), - 'seed_nonce_revelation_tip': '125000', 'origination_size': 257.0, 'cost_per_byte': '250', 'hard_storage_limit_per_operation': '60000', @@ -94,72 +97,184 @@ } +old_params = { + 'cache_sampler_state_cycles': 8.0, + 'liquidity_baking_toggle_ema_threshold': 1000000000.0, + 'cache_script_size': 100000000.0, + 'cache_stake_distribution_cycles': 8.0, + 'smart_rollup_arith_pvm_enable': False, + 'smart_rollup_origination_size': 6314.0, + 'smart_rollup_challenge_window_in_blocks': 20160.0, + 'smart_rollup_stake_amount': '32000000', + 'smart_rollup_commitment_period_in_blocks': 30.0, + 'smart_rollup_max_lookahead_in_blocks': 30000.0, + 'smart_rollup_max_active_outbox_levels': 20160.0, + 'smart_rollup_max_outbox_messages_per_level': 100.0, + 'smart_rollup_number_of_sections_in_dissection': 32.0, + 'smart_rollup_timeout_period_in_blocks': 20160.0, + 'smart_rollup_max_number_of_cemented_commitments': 5.0, + 'smart_rollup_max_number_of_parallel_games': 32.0, + 'zk_rollup_enable': False, + 'zk_rollup_origination_size': 4000.0, + 'zk_rollup_min_pending_to_process': 10.0, + 'blocks_per_stake_snapshot': 4.0, + 'consensus_committee_size': 526.0, + 'consensus_threshold': 0.0, + 'max_operations_time_to_live': 120.0, + 'delay_increment_per_round': '1', + 'minimal_participation_ratio': {'numerator': 2.0, 'denominator': 3.0}, + 'minimal_block_delay': '1', + 'nonce_revelation_threshold': 2.0, + 'vdf_difficulty': '50000', + 'dal_parametric': { + 'feature_enable': False, + 'number_of_slots': 256.0, + 'attestation_lag': 2, + 'attestation_threshold': 50.0, + 'blocks_per_epoch': 4.0, + 'page_size': 4096.0, + 'slot_size': 1048576.0, + 'redundancy_factor': 16.0, + 'number_of_shards': 256.0, + }, + 'minimal_stake': '6000', + "minimal_frozen_stake": '6000', + "origination_size": 257, + "issuance_weights": { + "base_total_issued_per_minute": "85007812", + "baking_reward_fixed_portion_weight": 5120.0, + "baking_reward_bonus_weight": 5120.0, + "attesting_reward_weight": 10240.0, + "liquidity_baking_subsidy_weight": 1280.0, + "seed_nonce_revelation_tip_weight": 1.0, + "vdf_revelation_tip_weight": 1.0, + }, + "limit_of_delegation_over_baking": 9.0, + "percentage_of_frozen_deposits_slashed_per_double_baking": 5.0, + "percentage_of_frozen_deposits_slashed_per_double_attestation": 50.0, + "smart_rollup_reveal_activation_level": { + "raw_data": { + "Blake2B": 0.0, + }, + "metadata": 0.0, + "dal_page": 2147483646.0, + "dal_parameters": 2147483646.0, + }, + "smart_rollup_private_enable": True, + "smart_rollup_riscv_pvm_enable": False, + "zk_rollup_max_ticket_payload_size": 2048.0, + "global_limit_of_staking_over_baking": 5.0, + "edge_of_staking_over_delegation": 2.0, + "adaptive_issuance_launch_ema_threshold": 100000000.0, + "adaptive_rewards_params": { + "issuance_ratio_min": {"numerator": "1", "denominator": "2000"}, + "issuance_ratio_max": {"numerator": "1", "denominator": "20"}, + "max_bonus": "50000000000000", + "growth_rate": {"numerator": "1", "denominator": "100"}, + "center_dz": {"numerator": "1", "denominator": "2"}, + "radius_dz": {"numerator": "1", "denominator": "50"}, + }, + "adaptive_issuance_activation_vote_enable": False, + "autostaking_enable": True, +} + +oxford_params = { + "preserved_cycles": 3, + "blocks_per_cycle": 8192, + "blocks_per_commitment": 64, + "nonce_revelation_threshold": 512, + "blocks_per_stake_snapshot": 512, + "cycles_per_voting_period": 1, + "hard_gas_limit_per_operation": "1040000", + "hard_gas_limit_per_block": "2600000", + "proof_of_work_threshold": "-1", + "minimal_stake": "6000000000", + "minimal_frozen_stake": "600000000", + "vdf_difficulty": "10000000000", + "origination_size": 257, + "issuance_weights": { + "base_total_issued_per_minute": "85007812", + "baking_reward_fixed_portion_weight": 5120, + "baking_reward_bonus_weight": 5120, + "attesting_reward_weight": 10240, + "liquidity_baking_subsidy_weight": 1280, + "seed_nonce_revelation_tip_weight": 1, + "vdf_revelation_tip_weight": 1, + }, + "cost_per_byte": "250", + "hard_storage_limit_per_operation": "60000", + "quorum_min": 2000, + "quorum_max": 7000, + "min_proposal_quorum": 500, + "liquidity_baking_toggle_ema_threshold": 1000000000, + "max_operations_time_to_live": 240, + "minimal_block_delay": "8", + "delay_increment_per_round": "3", + "consensus_committee_size": 7000, + "consensus_threshold": 4667, + "minimal_participation_ratio": {"numerator": 2, "denominator": 3}, + "limit_of_delegation_over_baking": 9, + "percentage_of_frozen_deposits_slashed_per_double_baking": 5, + "percentage_of_frozen_deposits_slashed_per_double_attestation": 50, + "testnet_dictator": "tz1Xf8zdT3DbAX9cHw3c3CXh79rc4nK4gCe8", + "cache_script_size": 100000000, + "cache_stake_distribution_cycles": 8, + "cache_sampler_state_cycles": 8, + "dal_parametric": { + "feature_enable": False, + "number_of_slots": 256, + "attestation_lag": 4, + "attestation_threshold": 50, + "blocks_per_epoch": 1, + "redundancy_factor": 16, + "page_size": 4096, + "slot_size": 1048576, + "number_of_shards": 2048, + }, + "smart_rollup_arith_pvm_enable": False, + "smart_rollup_origination_size": 6314, + "smart_rollup_challenge_window_in_blocks": 40, + "smart_rollup_stake_amount": "10000000000", + "smart_rollup_commitment_period_in_blocks": 20, + "smart_rollup_max_lookahead_in_blocks": 30000, + "smart_rollup_max_active_outbox_levels": 20160, + "smart_rollup_max_outbox_messages_per_level": 100, + "smart_rollup_number_of_sections_in_dissection": 32, + "smart_rollup_timeout_period_in_blocks": 500, + "smart_rollup_max_number_of_cemented_commitments": 5, + "smart_rollup_max_number_of_parallel_games": 32, + "smart_rollup_reveal_activation_level": { + "raw_data": {"Blake2B": 0}, + "metadata": 0, + "dal_page": 2147483646, + "dal_parameters": 2147483646, + }, + "smart_rollup_private_enable": True, + "smart_rollup_riscv_pvm_enable": False, + "zk_rollup_enable": False, + "zk_rollup_origination_size": 4000, + "zk_rollup_min_pending_to_process": 10, + "zk_rollup_max_ticket_payload_size": 2048, + "global_limit_of_staking_over_baking": 5, + "edge_of_staking_over_delegation": 2, + "adaptive_issuance_launch_ema_threshold": 100000000, + "adaptive_rewards_params": { + "issuance_ratio_min": {"numerator": "1", "denominator": "2000"}, + "issuance_ratio_max": {"numerator": "1", "denominator": "20"}, + "max_bonus": "50000000000000", + "growth_rate": {"numerator": "1", "denominator": "100"}, + "center_dz": {"numerator": "1", "denominator": "2"}, + "radius_dz": {"numerator": "1", "denominator": "50"}, + }, + "adaptive_issuance_activation_vote_enable": False, + "autostaking_enable": True, +} + + def get_protocol_parameters(protocol_hash: str) -> Dict[str, Any]: - # https://gitlab.com/tezos/tezos/-/blob/master/src/proto_017_PtNairob/lib_parameters/default_parameters.ml + # https://gitlab.com/tezos/tezos/-/blob/master/src/proto_018_Proxford/lib_parameters/default_parameters.ml return { - **sandbox_params.copy(), - 'cache_sampler_state_cycles': 8.0, - 'tx_rollup_enable': False, - 'tx_rollup_origination_size': 4000.0, - 'liquidity_baking_toggle_ema_threshold': 1000000000.0, - 'cache_script_size': 100000000.0, - 'cache_stake_distribution_cycles': 8.0, - 'tx_rollup_hard_size_limit_per_inbox': 500000.0, - 'tx_rollup_hard_size_limit_per_message': 5000.0, - 'tx_rollup_max_withdrawals_per_batch': 15.0, - 'tx_rollup_commitment_bond': '10000000000', - 'tx_rollup_finality_period': 40000.0, - 'tx_rollup_withdraw_period': 40000.0, - 'tx_rollup_max_inboxes_count': 40100.0, - 'tx_rollup_max_messages_per_inbox': 1010.0, - 'tx_rollup_max_commitments_count': 80100.0, - 'tx_rollup_cost_per_byte_ema_factor': 120.0, - 'tx_rollup_max_ticket_payload_size': 2048.0, - 'tx_rollup_rejection_max_proof_size': 30000.0, - 'tx_rollup_sunset_level': 3473409.0, - 'smart_rollup_enable': True, - 'smart_rollup_arith_pvm_enable': False, - 'smart_rollup_origination_size': 6314.0, - 'smart_rollup_challenge_window_in_blocks': 20160.0, - 'smart_rollup_stake_amount': '32000000', - 'smart_rollup_commitment_period_in_blocks': 30.0, - 'smart_rollup_max_lookahead_in_blocks': 30000.0, - 'smart_rollup_max_active_outbox_levels': 20160.0, - 'smart_rollup_max_outbox_messages_per_level': 100.0, - 'smart_rollup_number_of_sections_in_dissection': 32.0, - 'smart_rollup_timeout_period_in_blocks': 20160.0, - 'smart_rollup_max_number_of_cemented_commitments': 5.0, - 'smart_rollup_max_number_of_parallel_games': 32.0, - 'zk_rollup_enable': False, - 'zk_rollup_origination_size': 4000.0, - 'zk_rollup_min_pending_to_process': 10.0, - 'blocks_per_stake_snapshot': 4.0, - 'consensus_committee_size': 526.0, - 'consensus_threshold': 0.0, - 'baking_reward_fixed_portion': '333333', - 'baking_reward_bonus_per_slot': '3921', - 'endorsing_reward_per_slot': '2604', - 'max_slashing_period': 2.0, - 'frozen_deposits_percentage': 5.0, - 'max_operations_time_to_live': 120.0, - 'delay_increment_per_round': '1', - 'minimal_participation_ratio': {'numerator': 2.0, 'denominator': 3.0}, - 'double_baking_punishment': '640000000', - 'ratio_of_frozen_deposits_slashed_per_double_endorsement': {'numerator': 1.0, 'denominator': 2.0}, - 'minimal_block_delay': '1', - 'liquidity_baking_subsidy': '2500000', - 'nonce_revelation_threshold': 2.0, - 'vdf_difficulty': '50000', - 'dal_parametric': { - 'feature_enable': False, - 'number_of_slots': 256.0, - 'attestation_lag': 1.0, - 'attestation_threshold': 50.0, - 'blocks_per_epoch': 4.0, - 'page_size': 4096.0, - 'slot_size': 1048576.0, - 'redundancy_factor': 16.0, - 'number_of_shards': 256.0, - }, - 'minimal_stake': '6000', + **oxford_params, + # **old_params, + **sandbox_params, } diff --git a/tests/integration_tests/test_metadata.py b/tests/integration_tests/test_metadata.py index 3c903e626..f05084a1d 100644 --- a/tests/integration_tests/test_metadata.py +++ b/tests/integration_tests/test_metadata.py @@ -1,5 +1,7 @@ from unittest import TestCase +import pytest + from pytezos import pytezos