From ca5ad17caf1bb5e988a91afc09c0d644b1bdac8f Mon Sep 17 00:00:00 2001 From: Michael Boulton Date: Tue, 26 Dec 2023 09:15:11 +0000 Subject: [PATCH 1/2] Update jsonschema version --- constraints.txt | 16 ++- pyproject.toml | 2 +- requirements.txt | 169 +++++++++++++++++++++--------- tavern/_core/schema/jsonschema.py | 2 +- 4 files changed, 132 insertions(+), 57 deletions(-) diff --git a/constraints.txt b/constraints.txt index e04ba25f..5e7a1362 100644 --- a/constraints.txt +++ b/constraints.txt @@ -15,6 +15,7 @@ attrs==23.1.0 # allure-python-commons # jsonschema # pytest + # referencing babel==2.12.1 # via sphinx bleach==6.0.0 @@ -110,8 +111,10 @@ jinja2==3.1.2 # sphinx jmespath==1.0.1 # via tavern (pyproject.toml) -jsonschema==3.2.0 +jsonschema==4.20.0 # via tavern (pyproject.toml) +jsonschema-specifications==2023.12.1 + # via jsonschema keyring==23.13.1 # via twine markdown==3.4.4 @@ -180,8 +183,6 @@ pyproject-api==1.5.3 # via tox pyproject-hooks==1.0.0 # via build -pyrsistent==0.19.3 - # via jsonschema pytest==7.2.2 # via # allure-pytest @@ -206,6 +207,10 @@ readme-renderer==37.3 # via twine recommonmark==0.7.1 # via tavern (pyproject.toml) +referencing==0.32.0 + # via + # jsonschema + # jsonschema-specifications requests==2.31.0 # via # flit @@ -219,6 +224,10 @@ rfc3986==2.0.0 # via twine rich==13.4.1 # via twine +rpds-py==0.15.2 + # via + # jsonschema + # referencing ruamel-yaml==0.17.31 # via pykwalify ruamel-yaml-clib==0.2.7 @@ -228,7 +237,6 @@ secretstorage==3.3.3 six==1.16.0 # via # bleach - # jsonschema # python-dateutil snowballstemmer==2.2.0 # via sphinx diff --git a/pyproject.toml b/pyproject.toml index bfcac429..e1bc0386 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,7 @@ version = "2.6.0" dependencies = [ "PyYAML>=6.0.1,<7", "jmespath>=1,<2", - "jsonschema>=3.2.0,<5", + "jsonschema>=4,<5", "paho-mqtt>=1.3.1,<=1.6.1", "pyjwt>=2.5.0,<3", "pykwalify>=1.8.0,<2", diff --git a/requirements.txt b/requirements.txt index 48b42e95..d57ed208 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,6 +23,7 @@ attrs==23.1.0 \ # allure-python-commons # jsonschema # pytest + # referencing babel==2.12.1 \ --hash=sha256:b4246fb7677d3b98f501a39d43396d3cafdc8eadb045f4a31be01863f655c610 \ --hash=sha256:cc2d99999cd01d44420ae725a21c9e3711b3aadc7976d6147f622d8581963455 @@ -316,10 +317,6 @@ docutils==0.18.1 \ # sphinx # sphinx-rtd-theme # tavern (pyproject.toml) -exceptiongroup==1.1.3 \ - --hash=sha256:097acd85d473d75af5bb98e41b61ff7fe35efe6675e4f9370ec6ec5126d160e9 \ - --hash=sha256:343280667a4585d195ca1cf9cef84a4e178c4b6cf2274caef9859782b567d5e3 - # via pytest execnet==2.0.2 \ --hash=sha256:88256416ae766bc9e8895c76a87928c0012183da3cc4fc18016e6f050e025f41 \ --hash=sha256:cc59bc4423742fd71ad227122eb0dd44db51efb3dc4095b45ac9a08c770096af @@ -398,10 +395,14 @@ jmespath==1.0.1 \ --hash=sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980 \ --hash=sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe # via tavern (pyproject.toml) -jsonschema==3.2.0 \ - --hash=sha256:4e5b3cf8216f577bee9ce139cbe72eca3ea4f292ec60928ff24758ce626cd163 \ - --hash=sha256:c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a +jsonschema==4.20.0 \ + --hash=sha256:4f614fd46d8d61258610998997743ec5492a648b33cf478c1ddc23ed4598a5fa \ + --hash=sha256:ed6231f0429ecf966f5bc8dfef245998220549cbbcf140f913b7464c52c3b6b3 # via tavern (pyproject.toml) +jsonschema-specifications==2023.12.1 \ + --hash=sha256:48a76787b3e70f5ed53f1160d2b81f586e4ca6d1548c5de7085d1682674764cc \ + --hash=sha256:87e4fdf3a94858b8a2ba2778d9ba57d8a9cafca7c7489c46ba0d30a8bc6a9c3c + # via jsonschema keyring==24.2.0 \ --hash=sha256:4901caaf597bfd3bbd78c9a0c7c4c29fcd8310dab2cffefe749e916b6527acd6 \ --hash=sha256:ca0746a19ec421219f4d713f848fa297a661a8a8c1504867e55bfb5e09091509 @@ -681,35 +682,6 @@ pyproject-hooks==1.0.0 \ --hash=sha256:283c11acd6b928d2f6a7c73fa0d01cb2bdc5f07c57a2eeb6e83d5e56b97976f8 \ --hash=sha256:f271b298b97f5955d53fb12b72c1fb1948c22c1a6b70b315c54cedaca0264ef5 # via build -pyrsistent==0.19.3 \ - --hash=sha256:016ad1afadf318eb7911baa24b049909f7f3bb2c5b1ed7b6a8f21db21ea3faa8 \ - --hash=sha256:1a2994773706bbb4995c31a97bc94f1418314923bd1048c6d964837040376440 \ - --hash=sha256:20460ac0ea439a3e79caa1dbd560344b64ed75e85d8703943e0b66c2a6150e4a \ - --hash=sha256:3311cb4237a341aa52ab8448c27e3a9931e2ee09561ad150ba94e4cfd3fc888c \ - --hash=sha256:3a8cb235fa6d3fd7aae6a4f1429bbb1fec1577d978098da1252f0489937786f3 \ - --hash=sha256:3ab2204234c0ecd8b9368dbd6a53e83c3d4f3cab10ecaf6d0e772f456c442393 \ - --hash=sha256:42ac0b2f44607eb92ae88609eda931a4f0dfa03038c44c772e07f43e738bcac9 \ - --hash=sha256:49c32f216c17148695ca0e02a5c521e28a4ee6c5089f97e34fe24163113722da \ - --hash=sha256:4b774f9288dda8d425adb6544e5903f1fb6c273ab3128a355c6b972b7df39dcf \ - --hash=sha256:4c18264cb84b5e68e7085a43723f9e4c1fd1d935ab240ce02c0324a8e01ccb64 \ - --hash=sha256:5a474fb80f5e0d6c9394d8db0fc19e90fa540b82ee52dba7d246a7791712f74a \ - --hash=sha256:64220c429e42a7150f4bfd280f6f4bb2850f95956bde93c6fda1b70507af6ef3 \ - --hash=sha256:878433581fc23e906d947a6814336eee031a00e6defba224234169ae3d3d6a98 \ - --hash=sha256:99abb85579e2165bd8522f0c0138864da97847875ecbd45f3e7e2af569bfc6f2 \ - --hash=sha256:a2471f3f8693101975b1ff85ffd19bb7ca7dd7c38f8a81701f67d6b4f97b87d8 \ - --hash=sha256:aeda827381f5e5d65cced3024126529ddc4289d944f75e090572c77ceb19adbf \ - --hash=sha256:b735e538f74ec31378f5a1e3886a26d2ca6351106b4dfde376a26fc32a044edc \ - --hash=sha256:c147257a92374fde8498491f53ffa8f4822cd70c0d85037e09028e478cababb7 \ - --hash=sha256:c4db1bd596fefd66b296a3d5d943c94f4fac5bcd13e99bffe2ba6a759d959a28 \ - --hash=sha256:c74bed51f9b41c48366a286395c67f4e894374306b197e62810e0fdaf2364da2 \ - --hash=sha256:c9bb60a40a0ab9aba40a59f68214eed5a29c6274c83b2cc206a359c4a89fa41b \ - --hash=sha256:cc5d149f31706762c1f8bda2e8c4f8fead6e80312e3692619a75301d3dbb819a \ - --hash=sha256:ccf0d6bd208f8111179f0c26fdf84ed7c3891982f2edaeae7422575f47e66b64 \ - --hash=sha256:e42296a09e83028b3476f7073fcb69ffebac0e66dbbfd1bd847d61f74db30f19 \ - --hash=sha256:e8f2b814a3dc6225964fa03d8582c6e0b6650d68a232df41e3cc1b66a5d2f8d1 \ - --hash=sha256:f0774bf48631f3a20471dd7c5989657b639fd2d285b861237ea9e82c36a415a9 \ - --hash=sha256:f0e7c4b2f77593871e918be000b96c8107da48444d57005b6a6bc61fb4331b2c - # via jsonschema pytest==7.2.2 \ --hash=sha256:130328f552dcfac0b1cec75c12e3f005619dc5f874f0a06e8ff7263f0ee6225e \ --hash=sha256:c99ab0c73aceb050f68929bc93af19ab6db0558791c6a0715723abe9d0ade9d4 @@ -803,6 +775,12 @@ recommonmark==0.7.1 \ --hash=sha256:1b1db69af0231efce3fa21b94ff627ea33dee7079a01dd0a7f8482c3da148b3f \ --hash=sha256:bdb4db649f2222dcd8d2d844f0006b958d627f732415d399791ee436a3686d67 # via tavern (pyproject.toml) +referencing==0.32.0 \ + --hash=sha256:689e64fe121843dcfd57b71933318ef1f91188ffb45367332700a86ac8fd6161 \ + --hash=sha256:bdcd3efb936f82ff86f993093f6da7435c7de69a3b3a5a06678a6050184bee99 + # via + # jsonschema + # jsonschema-specifications requests==2.31.0 \ --hash=sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f \ --hash=sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1 @@ -824,6 +802,109 @@ rich==13.5.3 \ --hash=sha256:87b43e0543149efa1253f485cd845bb7ee54df16c9617b8a893650ab84b4acb6 \ --hash=sha256:9257b468badc3d347e146a4faa268ff229039d4c2d176ab0cffb4c4fbc73d5d9 # via twine +rpds-py==0.15.2 \ + --hash=sha256:02744236ac1895d7be837878e707a5c35fb8edc5137602f253b63623d7ad5c8c \ + --hash=sha256:03f9c5875515820633bd7709a25c3e60c1ea9ad1c5d4030ce8a8c203309c36fd \ + --hash=sha256:044f6f46d62444800402851afa3c3ae50141f12013060c1a3a0677e013310d6d \ + --hash=sha256:07a2e1d78d382f7181789713cdf0c16edbad4fe14fe1d115526cb6f0eef0daa3 \ + --hash=sha256:082e0e55d73690ffb4da4352d1b5bbe1b5c6034eb9dc8c91aa2a3ee15f70d3e2 \ + --hash=sha256:13152dfe7d7c27c40df8b99ac6aab12b978b546716e99f67e8a67a1d441acbc3 \ + --hash=sha256:13716e53627ad97babf72ac9e01cf9a7d4af2f75dd5ed7b323a7a9520e948282 \ + --hash=sha256:13ff62d3561a23c17341b4afc78e8fcfd799ab67c0b1ca32091d71383a98ba4b \ + --hash=sha256:1607cda6129f815493a3c184492acb5ae4aa6ed61d3a1b3663aa9824ed26f7ac \ + --hash=sha256:164fcee32f15d04d61568c9cb0d919e37ff3195919cd604039ff3053ada0461b \ + --hash=sha256:1c24e30d720c0009b6fb2e1905b025da56103c70a8b31b99138e4ed1c2a6c5b0 \ + --hash=sha256:1e6fcd0a0f62f2997107f758bb372397b8d5fd5f39cc6dcb86f7cb98a2172d6c \ + --hash=sha256:1fd0f0b1ccd7d537b858a56355a250108df692102e08aa2036e1a094fd78b2dc \ + --hash=sha256:2181e86d4e1cdf49a7320cb72a36c45efcb7670d0a88f09fd2d3a7967c0540fd \ + --hash=sha256:2974e6dff38afafd5ccf8f41cb8fc94600b3f4fd9b0a98f6ece6e2219e3158d5 \ + --hash=sha256:2dccc623725d0b298f557d869a68496a2fd2a9e9c41107f234fa5f7a37d278ac \ + --hash=sha256:2df3d07a16a3bef0917b28cd564778fbb31f3ffa5b5e33584470e2d1b0f248f0 \ + --hash=sha256:2e7e5633577b3bd56bf3af2ef6ae3778bbafb83743989d57f0e7edbf6c0980e4 \ + --hash=sha256:2ee066a64f0d2ba45391cac15b3a70dcb549e968a117bd0500634754cfe0e5fc \ + --hash=sha256:2f1f295a5c28cfa74a7d48c95acc1c8a7acd49d7d9072040d4b694fe11cd7166 \ + --hash=sha256:2faa97212b0dc465afeedf49045cdd077f97be1188285e646a9f689cb5dfff9e \ + --hash=sha256:30479a9f1fce47df56b07460b520f49fa2115ec2926d3b1303c85c81f8401ed1 \ + --hash=sha256:337a8653fb11d2fbe7157c961cc78cb3c161d98cf44410ace9a3dc2db4fad882 \ + --hash=sha256:3423007fc0661827e06f8a185a3792c73dda41f30f3421562f210cf0c9e49569 \ + --hash=sha256:373b76eeb79e8c14f6d82cb1d4d5293f9e4059baec6c1b16dca7ad13b6131b39 \ + --hash=sha256:3b79c63d29101cbaa53a517683557bb550462394fb91044cc5998dd2acff7340 \ + --hash=sha256:3bbc89ce2a219662ea142f0abcf8d43f04a41d5b1880be17a794c39f0d609cb0 \ + --hash=sha256:3c11bc5814554b018f6c5d6ae0969e43766f81e995000b53a5d8c8057055e886 \ + --hash=sha256:3cd61e759c4075510052d1eca5cddbd297fe1164efec14ef1fce3f09b974dfe4 \ + --hash=sha256:3d40fb3ca22e3d40f494d577441b263026a3bd8c97ae6ce89b2d3c4b39ac9581 \ + --hash=sha256:3db0c998c92b909d7c90b66c965590d4f3cd86157176a6cf14aa1f867b77b889 \ + --hash=sha256:422b0901878a31ef167435c5ad46560362891816a76cc0d150683f3868a6f0d1 \ + --hash=sha256:46b4f3d47d1033db569173be62365fbf7808c2bd3fb742314d251f130d90d44c \ + --hash=sha256:485fbdd23becb822804ed05622907ee5c8e8a5f43f6f43894a45f463b2217045 \ + --hash=sha256:53304cc14b1d94487d70086e1cb0cb4c29ec6da994d58ae84a4d7e78c6a6d04d \ + --hash=sha256:5595c80dd03d7e6c6afb73f3594bf3379a7d79fa57164b591d012d4b71d6ac4c \ + --hash=sha256:56b51ba29a18e5f5810224bcf00747ad931c0716e3c09a76b4a1edd3d4aba71f \ + --hash=sha256:580182fa5b269c2981e9ce9764367cb4edc81982ce289208d4607c203f44ffde \ + --hash=sha256:5e99d6510c8557510c220b865d966b105464740dcbebf9b79ecd4fbab30a13d9 \ + --hash=sha256:5eb05b654a41e0f81ab27a7c3e88b6590425eb3e934e1d533ecec5dc88a6ffff \ + --hash=sha256:62b292fff4739c6be89e6a0240c02bda5a9066a339d90ab191cf66e9fdbdc193 \ + --hash=sha256:6a5122b17a4faf5d7a6d91fa67b479736c0cacc7afe791ddebb7163a8550b799 \ + --hash=sha256:6a8ff8e809da81363bffca2b965cb6e4bf6056b495fc3f078467d1f8266fe27f \ + --hash=sha256:6c43e1b89099279cc03eb1c725c5de12af6edcd2f78e2f8a022569efa639ada3 \ + --hash=sha256:709dc11af2f74ba89c68b1592368c6edcbccdb0a06ba77eb28c8fe08bb6997da \ + --hash=sha256:7e072f5da38d6428ba1fc1115d3cc0dae895df671cb04c70c019985e8c7606be \ + --hash=sha256:813a65f95bfcb7c8f2a70dd6add9b51e9accc3bdb3e03d0ff7a9e6a2d3e174bf \ + --hash=sha256:86c01299942b0f4b5b5f28c8701689181ad2eab852e65417172dbdd6c5b3ccc8 \ + --hash=sha256:893e38d0f4319dfa70c0f36381a37cc418985c87b11d9784365b1fff4fa6973b \ + --hash=sha256:8a5f574b92b3ee7d254e56d56e37ec0e1416acb1ae357c4956d76a1788dc58fb \ + --hash=sha256:8b9650f92251fdef843e74fc252cdfd6e3c700157ad686eeb0c6d7fdb2d11652 \ + --hash=sha256:8ec464f20fe803ae00419bd1610934e3bda963aeba1e6181dfc9033dc7e8940c \ + --hash=sha256:8f333bfe782a2d05a67cfaa0cc9cd68b36b39ee6acfe099f980541ed973a7093 \ + --hash=sha256:8ffdeb7dbd0160d4e391e1f857477e4762d00aa2199c294eb95dfb9451aa1d9f \ + --hash=sha256:911e600e798374c0d86235e7ef19109cf865d1336942d398ff313375a25a93ba \ + --hash=sha256:9235be95662559141934fced8197de6fee8c58870f36756b0584424b6d708393 \ + --hash=sha256:938518a11780b39998179d07f31a4a468888123f9b00463842cd40f98191f4d3 \ + --hash=sha256:93c18a1696a8e0388ed84b024fe1a188a26ba999b61d1d9a371318cb89885a8c \ + --hash=sha256:97532802f14d383f37d603a56e226909f825a83ff298dc1b6697de00d2243999 \ + --hash=sha256:98ee201a52a7f65608e5494518932e1473fd43535f12cade0a1b4ab32737fe28 \ + --hash=sha256:9d2ae79f31da5143e020a8d4fc74e1f0cbcb8011bdf97453c140aa616db51406 \ + --hash=sha256:9d38494a8d21c246c535b41ecdb2d562c4b933cf3d68de03e8bc43a0d41be652 \ + --hash=sha256:9d41ebb471a6f064c0d1c873c4f7dded733d16ca5db7d551fb04ff3805d87802 \ + --hash=sha256:9e09d017e3f4d9bd7d17a30d3f59e4d6d9ba2d2ced280eec2425e84112cf623f \ + --hash=sha256:a6945c2d61c42bb7e818677f43638675b8c1c43e858b67a96df3eb2426a86c9d \ + --hash=sha256:a72e00826a2b032dda3eb25aa3e3579c6d6773d22d8446089a57a123481cc46c \ + --hash=sha256:aa1e626c524d2c7972c0f3a8a575d654a3a9c008370dc2a97e46abd0eaa749b9 \ + --hash=sha256:ab095edf1d840a6a6a4307e1a5b907a299a94e7b90e75436ee770b8c35d22a25 \ + --hash=sha256:ac2ac84a4950d627d84b61f082eba61314373cfab4b3c264b62efab02ababe83 \ + --hash=sha256:ac7187bee72384b9cfedf09a29a3b2b6e8815cc64c095cdc8b5e6aec81e9fd5f \ + --hash=sha256:ae9d83a81b09ce3a817e2cbb23aabc07f86a3abc664c613cd283ce7a03541e95 \ + --hash=sha256:afeabb382c1256a7477b739820bce7fe782bb807d82927102cee73e79b41b38b \ + --hash=sha256:b2a4cd924d0e2f4b1a68034abe4cadc73d69ad5f4cf02db6481c0d4d749f548f \ + --hash=sha256:b414ef79f1f06fb90b5165db8aef77512c1a5e3ed1b4807da8476b7e2c853283 \ + --hash=sha256:b4ecbba7efd82bd2a4bb88aab7f984eb5470991c1347bdd1f35fb34ea28dba6e \ + --hash=sha256:b61d5096e75fd71018b25da50b82dd70ec39b5e15bb2134daf7eb7bbbc103644 \ + --hash=sha256:b629db53fe17e6ce478a969d30bd1d0e8b53238c46e3a9c9db39e8b65a9ef973 \ + --hash=sha256:b70b45a40ad0798b69748b34d508259ef2bdc84fb2aad4048bc7c9cafb68ddb3 \ + --hash=sha256:b88c3ab98556bc351b36d6208a6089de8c8db14a7f6e1f57f82a334bd2c18f0b \ + --hash=sha256:baf744e5f9d5ee6531deea443be78b36ed1cd36c65a0b95ea4e8d69fa0102268 \ + --hash=sha256:bbc7421cbd28b4316d1d017db338039a7943f945c6f2bb15e1439b14b5682d28 \ + --hash=sha256:c31272c674f725dfe0f343d73b0abe8c878c646967ec1c6106122faae1efc15b \ + --hash=sha256:c51a899792ee2c696072791e56b2020caff58b275abecbc9ae0cb71af0645c95 \ + --hash=sha256:c61e42b4ceb9759727045765e87d51c1bb9f89987aca1fcc8a040232138cad1c \ + --hash=sha256:c7cd0841a586b7105513a7c8c3d5c276f3adc762a072d81ef7fae80632afad1e \ + --hash=sha256:c827a931c6b57f50f1bb5de400dcfb00bad8117e3753e80b96adb72d9d811514 \ + --hash=sha256:d2aa3ca9552f83b0b4fa6ca8c6ce08da6580f37e3e0ab7afac73a1cfdc230c0e \ + --hash=sha256:d46ee458452727a147d7897bb33886981ae1235775e05decae5d5d07f537695a \ + --hash=sha256:d64a657de7aae8db2da60dc0c9e4638a0c3893b4d60101fd564a3362b2bfeb34 \ + --hash=sha256:d800a8e2ac62db1b9ea5d6d1724f1a93c53907ca061de4d05ed94e8dfa79050c \ + --hash=sha256:d9d7ebcd11ea76ba0feaae98485cd8e31467c3d7985210fab46983278214736b \ + --hash=sha256:dd7d3608589072f63078b4063a6c536af832e76b0b3885f1bfe9e892abe6c207 \ + --hash=sha256:ec19e823b4ccd87bd69e990879acbce9e961fc7aebe150156b8f4418d4b27b7f \ + --hash=sha256:ee40206d1d6e95eaa2b7b919195e3689a5cf6ded730632de7f187f35a1b6052c \ + --hash=sha256:f138f550b83554f5b344d6be35d3ed59348510edc3cb96f75309db6e9bfe8210 \ + --hash=sha256:f3e6e2e502c4043c52a99316d89dc49f416acda5b0c6886e0dd8ea7bb35859e8 \ + --hash=sha256:fb10bb720348fe1647a94eb605accb9ef6a9b1875d8845f9e763d9d71a706387 \ + --hash=sha256:fc066395e6332da1e7525d605b4c96055669f8336600bef8ac569d5226a7c76f \ + --hash=sha256:fc33267d58dfbb2361baed52668c5d8c15d24bc0372cecbb79fed77339b55e0d + # via + # jsonschema + # referencing ruamel-yaml==0.17.31 \ --hash=sha256:098ed1eb6d338a684891a72380277c1e6fc4d4ae0e120de9a447275056dda335 \ --hash=sha256:3cf153f0047ced526e723097ac615d3009371779432e304dbd5596b6f3a4c777 @@ -874,9 +955,7 @@ secretstorage==3.3.3 \ six==1.16.0 \ --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 - # via - # jsonschema - # python-dateutil + # via python-dateutil snowballstemmer==2.2.0 \ --hash=sha256:09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1 \ --hash=sha256:c8e1716e83cc398ae16824e5572ae04e0d9fc2c6b985fb0f900f5f0c96ecba1a @@ -934,18 +1013,6 @@ stevedore==4.1.1 \ --hash=sha256:7f8aeb6e3f90f96832c301bff21a7eb5eefbe894c88c506483d355565d88cc1a \ --hash=sha256:aa6436565c069b2946fe4ebff07f5041e0c8bf18c7376dd29edf80cf7d524e4e # via tavern (pyproject.toml) -tomli==2.0.1 \ - --hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \ - --hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f - # via - # build - # coverage - # mypy - # pip-tools - # pyproject-api - # pyproject-hooks - # pytest - # tox tomli-w==1.0.0 \ --hash=sha256:9f2a07e8be30a0729e533ec968016807069991ae2fd921a78d42f429ae5f4463 \ --hash=sha256:f463434305e0336248cac9c2dc8076b707d8a12d019dd349f5c1e382dd1ae1b9 diff --git a/tavern/_core/schema/jsonschema.py b/tavern/_core/schema/jsonschema.py index 896a80ce..17299fc4 100644 --- a/tavern/_core/schema/jsonschema.py +++ b/tavern/_core/schema/jsonschema.py @@ -66,7 +66,7 @@ def is_object_or_sentinel(checker, instance): ) -def oneOf(validator, oneOf, instance, schema): +def oneOf(validator: Draft7Validator, oneOf, instance, schema): """Patched version of 'oneof' that does not complain if something is matched by multiple branches""" subschemas = enumerate(oneOf) all_errors = [] From e80693621a8d4e0f98a5c1ea763ea404fffd1200 Mon Sep 17 00:00:00 2001 From: Michael Boulton Date: Tue, 26 Dec 2023 09:15:58 +0000 Subject: [PATCH 2/2] Fix version of python in tox --- tox-integration.ini | 2 +- tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tox-integration.ini b/tox-integration.ini index 54c49340..e4eeea81 100644 --- a/tox-integration.ini +++ b/tox-integration.ini @@ -6,7 +6,7 @@ isolated_build = True [testenv] allowlist_externals = docker -basepython = python3.10 +basepython = python3.11 passenv = DOCKER_TLS_VERIFY,DOCKER_HOST,DOCKER_CERT_PATH,DOCKER_BUILDKIT setenv = TEST_HOST = http://localhost:5003 diff --git a/tox.ini b/tox.ini index 91a975e6..17e0c0bd 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ isolated_build = True [testenv] passenv = XDG_CACHE_HOME -basepython = python3.10 +basepython = python3.11 allowlist_externals = mypy install_command = python -m pip install {opts} {packages} -c constraints.txt