From a48bb9230c51485835e85ec819c3dad551bdc109 Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Fri, 1 Dec 2023 10:05:39 +0530 Subject: [PATCH 1/3] chore: bump open-aea@1.42.0, open-autonomy@0.13.8 and tomte@0.2.15 --- Pipfile | 18 +- packages/packages.json | 53 ++- .../valory/agents/keep3r_bot/aea-config.yaml | 40 +-- .../connext_propagate_job/contract.yaml | 2 +- .../valory/contracts/curve_pool/contract.yaml | 2 +- .../deposit_manager_job/contract.yaml | 2 +- .../contracts/keep3r_my_job/contract.yaml | 2 +- .../contracts/keep3r_test_job/contract.yaml | 2 +- .../valory/contracts/keep3r_v1/contract.yaml | 2 +- .../valory/contracts/keep3r_v2/contract.yaml | 2 +- .../phuture_harvesting_job/contract.yaml | 2 +- .../yearn_factory_harvest_job/contract.yaml | 2 +- .../valory/services/keep3r_bot/service.yaml | 2 +- .../services/keep3r_bot_goerli/service.yaml | 2 +- .../skills/abstract_round_abci/skill.yaml | 16 +- packages/valory/skills/keep3r_abci/skill.yaml | 12 +- .../valory/skills/keep3r_job_abci/skill.yaml | 12 +- .../skills/registration_abci/skill.yaml | 4 +- .../valory/skills/reset_pause_abci/skill.yaml | 2 +- .../valory/skills/termination_abci/skill.yaml | 8 +- .../transaction_settlement_abci/skill.yaml | 6 +- scripts/bump.py | 316 ++++++++++++++++++ tox.ini | 36 +- 23 files changed, 434 insertions(+), 111 deletions(-) create mode 100644 scripts/bump.py diff --git a/Pipfile b/Pipfile index 1ddc5c58..81a1c137 100644 --- a/Pipfile +++ b/Pipfile @@ -21,15 +21,15 @@ pytest-asyncio = "==0.20.3" pytest-cov = "==4.0.0" pytest-randomly = "==3.12.0" open-aea-flashbots = "==1.4.0" -requests = "==2.28.2" -open-aea = "==1.41.0.post1" -open-aea-ledger-ethereum = "==1.41.0.post1" -open-aea-ledger-ethereum-flashbots = "==1.41.0.post1" -open-aea-ledger-cosmos = "==1.41.0.post1" -open-aea-cli-ipfs = "==1.41.0.post1" -open-aea-test-autonomy = "==0.13.4" -open-autonomy = {version = "==0.13.4", extras = ["all"]} -tomte = {version = "==0.2.12", extras = ["cli", "tests"]} +requests = "==2.28.1" +open-aea = "==1.42.0" +open-aea-ledger-ethereum = "==1.42.0" +open-aea-ledger-ethereum-flashbots = "==1.42.0" +open-aea-ledger-cosmos = "==1.42.0" +open-aea-cli-ipfs = "==1.42.0" +open-aea-test-autonomy = "==0.13.8" +open-autonomy = {version = "==0.13.8", extras = ["all"]} +tomte = {version = "==0.2.15", extras = ["cli", "tests"]} openapi-core = "==0.13.2" openapi-spec-validator = "==0.2.8" protobuf = "<4.25.0,>=4.21.6" diff --git a/packages/packages.json b/packages/packages.json index 94455988..78cbcec3 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,46 +1,45 @@ { "dev": { "contract/valory/keep3r_v1_library/0.1.0": "bafybeiguyavczsaebbh5docth3o6e36b24s46jynhvysewnk3hqim3a4qe", - "contract/valory/keep3r_test_job/0.1.0": "bafybeif6cynyss3b2b25kebhzihblui7hahzpzvqrui6bb6rvtjaayblo4", - "contract/valory/keep3r_v1/0.1.0": "bafybeihlhhw4kspxa3z6mvf5qqvn3er37ws57vrnldknbtbb537hpffhmi", - "skill/valory/keep3r_job_abci/0.1.0": "bafybeifjhgjjdfnsmfvxtvl3twgjwwrbdzyodinz72ozfezbttk2lwpsmq", - "skill/valory/keep3r_abci/0.1.0": "bafybeiepiz3lkowmixl25o6r5t3efp3o6z2spyhufh6boygvt5ohr45riu", - "agent/valory/keep3r_bot/0.1.0": "bafybeideqozqown4n6mb5iqxyam3k4vn6df4xqc46azlktrg6kcwxx544q", - "contract/valory/keep3r_job/0.1.0": "bafybeiajy32pvqdzbecg2obmlnzdg756srtsmfzn4ujl5ybclx4hfvceli", - "contract/valory/keep3r_v2/0.1.0": "bafybeicgby5qvuqiagvp6232utcoz7wb6qngmf32rnez34d5fioshw3nye", - "contract/valory/deposit_manager_job/0.1.0": "bafybeih5nbc7gyzdnxdretdu73oskkcu5czhjpsrxepykrsncvjdn2pkbi", - "contract/valory/phuture_harvesting_job/0.1.0": "bafybeiehdclowje473iyjtuewgsi22qs5ujpyioyrfotxpw6hekbualvxq", - "contract/valory/keep3r_my_job/0.1.0": "bafybeihq75licyx2v2umvwgzbsxw3uhl3ywiw2iat2obievilnfdnle5pe", - "service/valory/keep3r_bot/0.1.0": "bafybeifxauwxcvakhoapv3wekripsgnqjmnoer7a2pdklji6dogdddeulq", - "service/valory/keep3r_bot_goerli/0.1.0": "bafybeifbbgk6ikntbpk7qup75a2accq6w7p3dxjeu6akurf6e5urew7rhy", - "contract/valory/yearn_factory_harvest_job/0.1.0": "bafybeieos76mciz7rpmftespgldzsr2i6b2uwgvv2em4inoe2ewofagqfy", + "contract/valory/keep3r_test_job/0.1.0": "bafybeihznhhs4arespznzw2szjbze4x42ewzfokgitnzhyaskn7xhbas7e", + "contract/valory/keep3r_v1/0.1.0": "bafybeidz5bjdkrujrte2hzaauvpgwxl24ecpsost47xk5tc3wwqhtvmlaq", + "skill/valory/keep3r_job_abci/0.1.0": "bafybeig3hxmmonae2w3ocis7aoyu3ql2mkugaoreqsdd5bfendyigqs7hy", + "skill/valory/keep3r_abci/0.1.0": "bafybeidsyeocdtogrdhik55edpwkhx3rm6khuagf3em2mszij4icotevjq", + "agent/valory/keep3r_bot/0.1.0": "bafybeiamd2hycga2qwagrdqs3tow2l7p6ocrhrfpcc6prx7fkybmfqf4au", + "contract/valory/keep3r_v2/0.1.0": "bafybeiapby775eg6nferyeo6hi7p5dwpbq6z6xqinvw76ehtrjhsky63su", + "contract/valory/deposit_manager_job/0.1.0": "bafybeidgftrpx2ow4nc57edh3jnpfuahhobcownec7w6lro6nctt4roa2e", + "contract/valory/phuture_harvesting_job/0.1.0": "bafybeigzwhmaxkzqpzx7vlo7aw7hagsnrr77yb32zv5epzzigfoaqcbgfq", + "contract/valory/keep3r_my_job/0.1.0": "bafybeif3gus6t2hn6z6wh3tzxgf6osvtyw2iwehe3l2dicluyex3mk7izi", + "service/valory/keep3r_bot/0.1.0": "bafybeihliyoa3pzpr7qmk4lwzpd7uktdcsxi53mx5vwkjnnie4req5yspu", + "service/valory/keep3r_bot_goerli/0.1.0": "bafybeifwtdglk3gju2lix5dllnsxl6fzs437f7g2qvndaqufkd55utnwia", + "contract/valory/yearn_factory_harvest_job/0.1.0": "bafybeibfkyp2q3737vpt3aphexxun5pphgr43o34khaht3fjtbwuceteka", "protocol/valory/ledger_api/1.0.0": "bafybeigpn6ysm53qkcllkzgdwc5xxpxz32xn2zoux3phdm2i3yty2i3thu", "connection/valory/ledger/0.19.0": "bafybeiav5ibf62d6k7loc7glpva6yadkuese6xsscrpe5l2f2fpnvnpeni", - "skill/valory/abstract_round_abci/0.1.0": "bafybeiebseo26frdimmklgki7yydxmzye6ixevzvj7bgjuaq5y3hmfw6ne", - "skill/valory/registration_abci/0.1.0": "bafybeiegzhq6sxwrygdvxdqg3zbcgllgsu5orkcfyekzqkxvdous4i3zzm", - "skill/valory/reset_pause_abci/0.1.0": "bafybeib7vrbzqv5si74np6np3yktbho7egjdamtzlalqozcyp6ouevfam4", - "skill/valory/transaction_settlement_abci/0.1.0": "bafybeiclpp6njvg6ocze2ji4dzbxnyibaod45uj5jnop77om7pkght3byq", - "skill/valory/termination_abci/0.1.0": "bafybeic3gcethhotf6o75sbetstn55wxmuegxjtilezjta5chrhzymn2qq", - "contract/valory/connext_propagate_job/0.1.0": "bafybeiggsbfilut7cd6sllhufi3cmsl4k2tzvvzudrh2optp2gls45okdi", - "contract/valory/curve_pool/0.1.0": "bafybeihxdrw5cyhnscgcdkrymmrkxbq2mqf5ed2jaua65faojo2ifpsyc4" + "skill/valory/abstract_round_abci/0.1.0": "bafybeibxtwtlbo47gffdzh2njuaydixnpsmvvmjvtodh4g45vkxh73dr4m", + "skill/valory/registration_abci/0.1.0": "bafybeied4xkeza33c3apfpsbcwvws4rg6xu3nottdu3ikhtrfadffjjflu", + "skill/valory/reset_pause_abci/0.1.0": "bafybeibzdhcu6hzcsrkgoy3prjlviudm6awyn5246uuxpa5pyugkdfa2am", + "skill/valory/transaction_settlement_abci/0.1.0": "bafybeig5rawmq5sw4v36wv64xq47g2dgmxbqkhwngwt5fj7lwlno3trz2y", + "skill/valory/termination_abci/0.1.0": "bafybeidxwmgptmiwnx3idnezbsfw4bcgx3gprid634uz43h243ggtjlpxq", + "contract/valory/connext_propagate_job/0.1.0": "bafybeifzs3lnpljeknl4wr2bo676abw2txdadx2dveinx5ya3asrp4gebe", + "contract/valory/curve_pool/0.1.0": "bafybeihjfv2jiygzan2x24dtsnhndokcdtmrjg2vx7cufi6qzwbsunacnq" }, "third_party": { "protocol/valory/abci/0.1.0": "bafybeihmzlmmb4pdo3zkhg6ehuyaa4lhw7bfpclln2o2z7v3o6fcep26iu", - "connection/valory/abci/0.1.0": "bafybeigzgupmh6kwwx4jbqkw7qri5vr6vz53xbi4uksulh6oiovdplmviu", + "connection/valory/abci/0.1.0": "bafybeiejo5uyurbmafretedivyci2ktastxclbmgrkwcwc2yt36jftyqgm", "protocol/valory/contract_api/1.0.0": "bafybeialhbjvwiwcnqq3ysxcyemobcbie7xza66gaofcvla5njezkvhcka", "protocol/valory/http/1.0.0": "bafybeiejoqgv7finfxo3rcvvovrlj5ccrbgxodjq43uo26ylpowsa3llfe", - "connection/valory/http_client/0.23.0": "bafybeifgeqgryx6b3s6eseyzyezygmeitcpt3tkor2eiycozoi6clgdrny", - "contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeigejiv4fkksyjwmr6doo23kfpicfbktuwspbamasyvjusfdyjtrxy", - "contract/valory/service_registry/0.1.0": "bafybeic4bgql6x5jotp43ddazybmyb7macifjzudavqll3547ayhawttpi", + "connection/valory/http_client/0.23.0": "bafybeiddrfvomrmgvh5yuv2coq7ci72wcdf663stayi3m5aawnj4srggce", + "contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeidvcgnbbmjtha6tl7st2ysna2l3iiqfhnzjfasyvml5unecozeeka", + "contract/valory/service_registry/0.1.0": "bafybeia2swgpmczn3iykmptigabklk2eqbqxzhmbnunq3givmjygvmgtbm", "protocol/open_aea/signing/1.0.0": "bafybeie7xyems76v5b4wc2lmaidcujizpxfzjnnwdeokmhje53g7ym25ii", "protocol/valory/tendermint/0.1.0": "bafybeig6g6twajlwssfbfp5rlnu5mwzuu5kgak5cs4fich7rlkx6whesnu", - "skill/valory/abstract_abci/0.1.0": "bafybeifmfv4bgt5vzvgawlocksacqeadzg72zs4usvgjaf245hbbptpiki", - "contract/valory/gnosis_safe/0.1.0": "bafybeifmsjpgbifvk7y462rhfczvjvpigkdniavghhg5utza3hbnffioq4", + "skill/valory/abstract_abci/0.1.0": "bafybeiflcfufixmsrhobf56bn5745m2iipcfqyulwk2qegtnagb3kvaaxi", + "contract/valory/gnosis_safe/0.1.0": "bafybeidll7frtdsq2ckiluazkwk4zpkp7natt4kdejjehwvykqwzyuf6ei", "protocol/valory/acn/1.1.0": "bafybeic2pxzfc3voxl2ejhcqyf2ehm4wm5gxvgx7bliloiqi2uppmq6weu", "connection/valory/p2p_libp2p_client/0.1.0": "bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq", "contract/valory/multisend/0.1.0": "bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y", "protocol/valory/ipfs/0.1.0": "bafybeiedxeismnx3k5ty4mvvhlqideixlhqmi5mtcki4lxqfa7uqh7p33u", - "connection/valory/ipfs/0.1.0": "bafybeigfmqvlzbp67fttccpl4hsu3zaztbxv6vd7ikzra2hfppfkalgpji", + "connection/valory/ipfs/0.1.0": "bafybeihx7wb5hngjobw2salzqqryrhxvmxfuw7o2npjyqd2talmh2flqeq", "connection/fetchai/http_server/0.22.0": "bafybeihvscddpxjbtqsetngmxo3kiht2wqhosmwiyuh3f6zjti3x3byu5u" } } \ No newline at end of file diff --git a/packages/valory/agents/keep3r_bot/aea-config.yaml b/packages/valory/agents/keep3r_bot/aea-config.yaml index 62d6729c..62595389 100644 --- a/packages/valory/agents/keep3r_bot/aea-config.yaml +++ b/packages/valory/agents/keep3r_bot/aea-config.yaml @@ -128,21 +128,21 @@ fingerprint: tests/test_contracts/test_keeper_for_testnet/test_contract.py: bafybeihpnx5554swjwo2nsixjs2l76ries442vayot4zq77z3lkyzxqhey fingerprint_ignore_patterns: [] connections: -- valory/abci:0.1.0:bafybeigzgupmh6kwwx4jbqkw7qri5vr6vz53xbi4uksulh6oiovdplmviu -- valory/http_client:0.23.0:bafybeifgeqgryx6b3s6eseyzyezygmeitcpt3tkor2eiycozoi6clgdrny -- valory/ipfs:0.1.0:bafybeigfmqvlzbp67fttccpl4hsu3zaztbxv6vd7ikzra2hfppfkalgpji +- valory/abci:0.1.0:bafybeiejo5uyurbmafretedivyci2ktastxclbmgrkwcwc2yt36jftyqgm +- valory/http_client:0.23.0:bafybeiddrfvomrmgvh5yuv2coq7ci72wcdf663stayi3m5aawnj4srggce +- valory/ipfs:0.1.0:bafybeihx7wb5hngjobw2salzqqryrhxvmxfuw7o2npjyqd2talmh2flqeq - valory/ledger:0.19.0:bafybeiav5ibf62d6k7loc7glpva6yadkuese6xsscrpe5l2f2fpnvnpeni - valory/p2p_libp2p_client:0.1.0:bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq - fetchai/http_server:0.22.0:bafybeihvscddpxjbtqsetngmxo3kiht2wqhosmwiyuh3f6zjti3x3byu5u contracts: -- valory/curve_pool:0.1.0:bafybeihxdrw5cyhnscgcdkrymmrkxbq2mqf5ed2jaua65faojo2ifpsyc4 -- valory/gnosis_safe:0.1.0:bafybeifmsjpgbifvk7y462rhfczvjvpigkdniavghhg5utza3hbnffioq4 -- valory/gnosis_safe_proxy_factory:0.1.0:bafybeigejiv4fkksyjwmr6doo23kfpicfbktuwspbamasyvjusfdyjtrxy -- valory/keep3r_v1:0.1.0:bafybeihlhhw4kspxa3z6mvf5qqvn3er37ws57vrnldknbtbb537hpffhmi +- valory/curve_pool:0.1.0:bafybeihjfv2jiygzan2x24dtsnhndokcdtmrjg2vx7cufi6qzwbsunacnq +- valory/gnosis_safe:0.1.0:bafybeidll7frtdsq2ckiluazkwk4zpkp7natt4kdejjehwvykqwzyuf6ei +- valory/gnosis_safe_proxy_factory:0.1.0:bafybeidvcgnbbmjtha6tl7st2ysna2l3iiqfhnzjfasyvml5unecozeeka +- valory/keep3r_v1:0.1.0:bafybeidz5bjdkrujrte2hzaauvpgwxl24ecpsost47xk5tc3wwqhtvmlaq - valory/keep3r_v1_library:0.1.0:bafybeiguyavczsaebbh5docth3o6e36b24s46jynhvysewnk3hqim3a4qe -- valory/keep3r_v2:0.1.0:bafybeicgby5qvuqiagvp6232utcoz7wb6qngmf32rnez34d5fioshw3nye +- valory/keep3r_v2:0.1.0:bafybeiapby775eg6nferyeo6hi7p5dwpbq6z6xqinvw76ehtrjhsky63su - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y -- valory/service_registry:0.1.0:bafybeic4bgql6x5jotp43ddazybmyb7macifjzudavqll3547ayhawttpi +- valory/service_registry:0.1.0:bafybeia2swgpmczn3iykmptigabklk2eqbqxzhmbnunq3givmjygvmgtbm protocols: - open_aea/signing:1.0.0:bafybeie7xyems76v5b4wc2lmaidcujizpxfzjnnwdeokmhje53g7ym25ii - valory/abci:0.1.0:bafybeihmzlmmb4pdo3zkhg6ehuyaa4lhw7bfpclln2o2z7v3o6fcep26iu @@ -153,14 +153,14 @@ protocols: - valory/ledger_api:1.0.0:bafybeigpn6ysm53qkcllkzgdwc5xxpxz32xn2zoux3phdm2i3yty2i3thu - valory/tendermint:0.1.0:bafybeig6g6twajlwssfbfp5rlnu5mwzuu5kgak5cs4fich7rlkx6whesnu skills: -- valory/abstract_abci:0.1.0:bafybeifmfv4bgt5vzvgawlocksacqeadzg72zs4usvgjaf245hbbptpiki -- valory/abstract_round_abci:0.1.0:bafybeiebseo26frdimmklgki7yydxmzye6ixevzvj7bgjuaq5y3hmfw6ne -- valory/keep3r_abci:0.1.0:bafybeiepiz3lkowmixl25o6r5t3efp3o6z2spyhufh6boygvt5ohr45riu -- valory/keep3r_job_abci:0.1.0:bafybeifjhgjjdfnsmfvxtvl3twgjwwrbdzyodinz72ozfezbttk2lwpsmq -- valory/registration_abci:0.1.0:bafybeiegzhq6sxwrygdvxdqg3zbcgllgsu5orkcfyekzqkxvdous4i3zzm -- valory/reset_pause_abci:0.1.0:bafybeib7vrbzqv5si74np6np3yktbho7egjdamtzlalqozcyp6ouevfam4 -- valory/termination_abci:0.1.0:bafybeic3gcethhotf6o75sbetstn55wxmuegxjtilezjta5chrhzymn2qq -- valory/transaction_settlement_abci:0.1.0:bafybeiclpp6njvg6ocze2ji4dzbxnyibaod45uj5jnop77om7pkght3byq +- valory/abstract_abci:0.1.0:bafybeiflcfufixmsrhobf56bn5745m2iipcfqyulwk2qegtnagb3kvaaxi +- valory/abstract_round_abci:0.1.0:bafybeibxtwtlbo47gffdzh2njuaydixnpsmvvmjvtodh4g45vkxh73dr4m +- valory/keep3r_abci:0.1.0:bafybeidsyeocdtogrdhik55edpwkhx3rm6khuagf3em2mszij4icotevjq +- valory/keep3r_job_abci:0.1.0:bafybeig3hxmmonae2w3ocis7aoyu3ql2mkugaoreqsdd5bfendyigqs7hy +- valory/registration_abci:0.1.0:bafybeied4xkeza33c3apfpsbcwvws4rg6xu3nottdu3ikhtrfadffjjflu +- valory/reset_pause_abci:0.1.0:bafybeibzdhcu6hzcsrkgoy3prjlviudm6awyn5246uuxpa5pyugkdfa2am +- valory/termination_abci:0.1.0:bafybeidxwmgptmiwnx3idnezbsfw4bcgx3gprid634uz43h243ggtjlpxq +- valory/transaction_settlement_abci:0.1.0:bafybeig5rawmq5sw4v36wv64xq47g2dgmxbqkhwngwt5fj7lwlno3trz2y default_ledger: ethereum required_ledgers: - ethereum @@ -192,8 +192,10 @@ logging_config: - console propagate: false dependencies: - open-aea-ledger-ethereum: {} - open-aea-ledger-ethereum-flashbots: {} + open-aea-ledger-ethereum: + version: ==1.42.0 + open-aea-ledger-ethereum-flashbots: + version: ==1.42.0 skill_exception_policy: just_log connection_exception_policy: just_log default_connection: null diff --git a/packages/valory/contracts/connext_propagate_job/contract.yaml b/packages/valory/contracts/connext_propagate_job/contract.yaml index 6e24ccf9..ed18f3b9 100644 --- a/packages/valory/contracts/connext_propagate_job/contract.yaml +++ b/packages/valory/contracts/connext_propagate_job/contract.yaml @@ -17,6 +17,6 @@ contract_interface_paths: dependencies: eth_typing: {} open-aea-ledger-ethereum: - version: ==1.41.0.post1 + version: ==1.42.0 web3: version: <7,>=6.0.0 diff --git a/packages/valory/contracts/curve_pool/contract.yaml b/packages/valory/contracts/curve_pool/contract.yaml index 0c127266..0ab143ff 100644 --- a/packages/valory/contracts/curve_pool/contract.yaml +++ b/packages/valory/contracts/curve_pool/contract.yaml @@ -16,6 +16,6 @@ contract_interface_paths: ethereum: build/CurvePool.json dependencies: open-aea-ledger-ethereum: - version: ==1.41.0.post1 + version: ==1.42.0 web3: version: <7,>=6.0.0 diff --git a/packages/valory/contracts/deposit_manager_job/contract.yaml b/packages/valory/contracts/deposit_manager_job/contract.yaml index 1c693bc0..9a973c5b 100644 --- a/packages/valory/contracts/deposit_manager_job/contract.yaml +++ b/packages/valory/contracts/deposit_manager_job/contract.yaml @@ -16,6 +16,6 @@ contract_interface_paths: ethereum: DepositManager.json dependencies: open-aea-ledger-ethereum: - version: ==1.41.0.post1 + version: ==1.42.0 web3: version: <7,>=6.0.0 diff --git a/packages/valory/contracts/keep3r_my_job/contract.yaml b/packages/valory/contracts/keep3r_my_job/contract.yaml index 1c6f64b1..3a986c65 100644 --- a/packages/valory/contracts/keep3r_my_job/contract.yaml +++ b/packages/valory/contracts/keep3r_my_job/contract.yaml @@ -16,6 +16,6 @@ contract_interface_paths: ethereum: MyJob.json dependencies: open-aea-ledger-ethereum: - version: ==1.41.0.post1 + version: ==1.42.0 web3: version: <7,>=6.0.0 diff --git a/packages/valory/contracts/keep3r_test_job/contract.yaml b/packages/valory/contracts/keep3r_test_job/contract.yaml index 29986342..11730721 100644 --- a/packages/valory/contracts/keep3r_test_job/contract.yaml +++ b/packages/valory/contracts/keep3r_test_job/contract.yaml @@ -16,6 +16,6 @@ contract_interface_paths: ethereum: TestJob.json dependencies: open-aea-ledger-ethereum: - version: ==1.41.0.post1 + version: ==1.42.0 web3: version: <7,>=6.0.0 diff --git a/packages/valory/contracts/keep3r_v1/contract.yaml b/packages/valory/contracts/keep3r_v1/contract.yaml index aad23e37..2a44b0c6 100644 --- a/packages/valory/contracts/keep3r_v1/contract.yaml +++ b/packages/valory/contracts/keep3r_v1/contract.yaml @@ -17,6 +17,6 @@ contract_interface_paths: ethereum: build/Keep3rV1.json dependencies: open-aea-ledger-ethereum: - version: ==1.41.0.post1 + version: ==1.42.0 web3: version: <7,>=6.0.0 diff --git a/packages/valory/contracts/keep3r_v2/contract.yaml b/packages/valory/contracts/keep3r_v2/contract.yaml index 0a41bf46..7d81c922 100644 --- a/packages/valory/contracts/keep3r_v2/contract.yaml +++ b/packages/valory/contracts/keep3r_v2/contract.yaml @@ -16,6 +16,6 @@ contract_interface_paths: ethereum: build/Keep3rV2.json dependencies: open-aea-ledger-ethereum: - version: ==1.41.0.post1 + version: ==1.42.0 web3: version: <7,>=6.0.0 diff --git a/packages/valory/contracts/phuture_harvesting_job/contract.yaml b/packages/valory/contracts/phuture_harvesting_job/contract.yaml index 551f1ec1..e5154079 100644 --- a/packages/valory/contracts/phuture_harvesting_job/contract.yaml +++ b/packages/valory/contracts/phuture_harvesting_job/contract.yaml @@ -17,6 +17,6 @@ contract_interface_paths: ethereum: PhutureJob.json dependencies: open-aea-ledger-ethereum: - version: ==1.41.0.post1 + version: ==1.42.0 web3: version: <7,>=6.0.0 diff --git a/packages/valory/contracts/yearn_factory_harvest_job/contract.yaml b/packages/valory/contracts/yearn_factory_harvest_job/contract.yaml index 17dbe406..d0bff3b2 100644 --- a/packages/valory/contracts/yearn_factory_harvest_job/contract.yaml +++ b/packages/valory/contracts/yearn_factory_harvest_job/contract.yaml @@ -17,6 +17,6 @@ contract_interface_paths: ethereum: YearnFactoryHarvestJob.json dependencies: open-aea-ledger-ethereum: - version: ==1.41.0.post1 + version: ==1.42.0 web3: version: <7,>=6.0.0 diff --git a/packages/valory/services/keep3r_bot/service.yaml b/packages/valory/services/keep3r_bot/service.yaml index b72f611d..704c1355 100644 --- a/packages/valory/services/keep3r_bot/service.yaml +++ b/packages/valory/services/keep3r_bot/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeig26ntff2vdtmum3crflwqrybmonwdxahvlrst2brnazbo3mjvtqu fingerprint_ignore_patterns: [] -agent: valory/keep3r_bot:0.1.0:bafybeideqozqown4n6mb5iqxyam3k4vn6df4xqc46azlktrg6kcwxx544q +agent: valory/keep3r_bot:0.1.0:bafybeiamd2hycga2qwagrdqs3tow2l7p6ocrhrfpcc6prx7fkybmfqf4au number_of_agents: 1 deployment: tendermint: diff --git a/packages/valory/services/keep3r_bot_goerli/service.yaml b/packages/valory/services/keep3r_bot_goerli/service.yaml index 75bd3ade..d82db2fb 100644 --- a/packages/valory/services/keep3r_bot_goerli/service.yaml +++ b/packages/valory/services/keep3r_bot_goerli/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeiblcg3qti2cyz4ytufdkmqzcm6svbo5cwgsu2srjovvljdi35iz6i fingerprint_ignore_patterns: [] -agent: valory/keep3r_bot:0.1.0:bafybeideqozqown4n6mb5iqxyam3k4vn6df4xqc46azlktrg6kcwxx544q +agent: valory/keep3r_bot:0.1.0:bafybeiamd2hycga2qwagrdqs3tow2l7p6ocrhrfpcc6prx7fkybmfqf4au number_of_agents: 4 deployment: tendermint: diff --git a/packages/valory/skills/abstract_round_abci/skill.yaml b/packages/valory/skills/abstract_round_abci/skill.yaml index 22f0f127..9e1c952a 100644 --- a/packages/valory/skills/abstract_round_abci/skill.yaml +++ b/packages/valory/skills/abstract_round_abci/skill.yaml @@ -60,13 +60,13 @@ fingerprint: utils.py: bafybeiflukhathkj3smnowhe3efijp4inw4jq56kos4ucxfvtfjdrkdraq fingerprint_ignore_patterns: [] connections: -- valory/abci:0.1.0:bafybeigzgupmh6kwwx4jbqkw7qri5vr6vz53xbi4uksulh6oiovdplmviu -- valory/http_client:0.23.0:bafybeifgeqgryx6b3s6eseyzyezygmeitcpt3tkor2eiycozoi6clgdrny -- valory/ipfs:0.1.0:bafybeigfmqvlzbp67fttccpl4hsu3zaztbxv6vd7ikzra2hfppfkalgpji +- valory/abci:0.1.0:bafybeiejo5uyurbmafretedivyci2ktastxclbmgrkwcwc2yt36jftyqgm +- valory/http_client:0.23.0:bafybeiddrfvomrmgvh5yuv2coq7ci72wcdf663stayi3m5aawnj4srggce +- valory/ipfs:0.1.0:bafybeihx7wb5hngjobw2salzqqryrhxvmxfuw7o2npjyqd2talmh2flqeq - valory/ledger:0.19.0:bafybeiav5ibf62d6k7loc7glpva6yadkuese6xsscrpe5l2f2fpnvnpeni - valory/p2p_libp2p_client:0.1.0:bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq contracts: -- valory/service_registry:0.1.0:bafybeic4bgql6x5jotp43ddazybmyb7macifjzudavqll3547ayhawttpi +- valory/service_registry:0.1.0:bafybeia2swgpmczn3iykmptigabklk2eqbqxzhmbnunq3givmjygvmgtbm protocols: - open_aea/signing:1.0.0:bafybeie7xyems76v5b4wc2lmaidcujizpxfzjnnwdeokmhje53g7ym25ii - valory/abci:0.1.0:bafybeihmzlmmb4pdo3zkhg6ehuyaa4lhw7bfpclln2o2z7v3o6fcep26iu @@ -76,7 +76,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeigpn6ysm53qkcllkzgdwc5xxpxz32xn2zoux3phdm2i3yty2i3thu - valory/tendermint:0.1.0:bafybeig6g6twajlwssfbfp5rlnu5mwzuu5kgak5cs4fich7rlkx6whesnu skills: -- valory/abstract_abci:0.1.0:bafybeifmfv4bgt5vzvgawlocksacqeadzg72zs4usvgjaf245hbbptpiki +- valory/abstract_abci:0.1.0:bafybeiflcfufixmsrhobf56bn5745m2iipcfqyulwk2qegtnagb3kvaaxi behaviours: main: args: {} @@ -145,9 +145,9 @@ dependencies: ipfshttpclient: version: ==0.8.0a2 open-aea-cli-ipfs: - version: ==1.41.0.post1 + version: ==1.42.0 open-aea-test-autonomy: - version: ==0.13.4 + version: ==0.13.8 protobuf: version: <5.0.0,>=4.21.6 py-ecc: @@ -155,7 +155,7 @@ dependencies: pytz: version: ==2022.2.1 requests: - version: ==2.28.2 + version: ==2.28.1 typing_extensions: version: ==3.10.0.2 is_abstract: true diff --git a/packages/valory/skills/keep3r_abci/skill.yaml b/packages/valory/skills/keep3r_abci/skill.yaml index 02a2e7ea..b1ab71a1 100644 --- a/packages/valory/skills/keep3r_abci/skill.yaml +++ b/packages/valory/skills/keep3r_abci/skill.yaml @@ -20,12 +20,12 @@ connections: [] contracts: [] protocols: [] skills: -- valory/abstract_round_abci:0.1.0:bafybeiebseo26frdimmklgki7yydxmzye6ixevzvj7bgjuaq5y3hmfw6ne -- valory/keep3r_job_abci:0.1.0:bafybeifjhgjjdfnsmfvxtvl3twgjwwrbdzyodinz72ozfezbttk2lwpsmq -- valory/registration_abci:0.1.0:bafybeiegzhq6sxwrygdvxdqg3zbcgllgsu5orkcfyekzqkxvdous4i3zzm -- valory/reset_pause_abci:0.1.0:bafybeib7vrbzqv5si74np6np3yktbho7egjdamtzlalqozcyp6ouevfam4 -- valory/termination_abci:0.1.0:bafybeic3gcethhotf6o75sbetstn55wxmuegxjtilezjta5chrhzymn2qq -- valory/transaction_settlement_abci:0.1.0:bafybeiclpp6njvg6ocze2ji4dzbxnyibaod45uj5jnop77om7pkght3byq +- valory/abstract_round_abci:0.1.0:bafybeibxtwtlbo47gffdzh2njuaydixnpsmvvmjvtodh4g45vkxh73dr4m +- valory/keep3r_job_abci:0.1.0:bafybeig3hxmmonae2w3ocis7aoyu3ql2mkugaoreqsdd5bfendyigqs7hy +- valory/registration_abci:0.1.0:bafybeied4xkeza33c3apfpsbcwvws4rg6xu3nottdu3ikhtrfadffjjflu +- valory/reset_pause_abci:0.1.0:bafybeibzdhcu6hzcsrkgoy3prjlviudm6awyn5246uuxpa5pyugkdfa2am +- valory/termination_abci:0.1.0:bafybeidxwmgptmiwnx3idnezbsfw4bcgx3gprid634uz43h243ggtjlpxq +- valory/transaction_settlement_abci:0.1.0:bafybeig5rawmq5sw4v36wv64xq47g2dgmxbqkhwngwt5fj7lwlno3trz2y behaviours: main: args: {} diff --git a/packages/valory/skills/keep3r_job_abci/skill.yaml b/packages/valory/skills/keep3r_job_abci/skill.yaml index ffc2617d..ac5371ce 100644 --- a/packages/valory/skills/keep3r_job_abci/skill.yaml +++ b/packages/valory/skills/keep3r_job_abci/skill.yaml @@ -27,17 +27,17 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] contracts: -- valory/gnosis_safe:0.1.0:bafybeifmsjpgbifvk7y462rhfczvjvpigkdniavghhg5utza3hbnffioq4 +- valory/gnosis_safe:0.1.0:bafybeidll7frtdsq2ckiluazkwk4zpkp7natt4kdejjehwvykqwzyuf6ei - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y -- valory/curve_pool:0.1.0:bafybeihxdrw5cyhnscgcdkrymmrkxbq2mqf5ed2jaua65faojo2ifpsyc4 -- valory/keep3r_v1:0.1.0:bafybeihlhhw4kspxa3z6mvf5qqvn3er37ws57vrnldknbtbb537hpffhmi -- valory/keep3r_v2:0.1.0:bafybeicgby5qvuqiagvp6232utcoz7wb6qngmf32rnez34d5fioshw3nye +- valory/curve_pool:0.1.0:bafybeihjfv2jiygzan2x24dtsnhndokcdtmrjg2vx7cufi6qzwbsunacnq +- valory/keep3r_v1:0.1.0:bafybeidz5bjdkrujrte2hzaauvpgwxl24ecpsost47xk5tc3wwqhtvmlaq +- valory/keep3r_v2:0.1.0:bafybeiapby775eg6nferyeo6hi7p5dwpbq6z6xqinvw76ehtrjhsky63su protocols: - valory/contract_api:1.0.0:bafybeialhbjvwiwcnqq3ysxcyemobcbie7xza66gaofcvla5njezkvhcka - valory/ledger_api:1.0.0:bafybeigpn6ysm53qkcllkzgdwc5xxpxz32xn2zoux3phdm2i3yty2i3thu skills: -- valory/abstract_round_abci:0.1.0:bafybeiebseo26frdimmklgki7yydxmzye6ixevzvj7bgjuaq5y3hmfw6ne -- valory/transaction_settlement_abci:0.1.0:bafybeiclpp6njvg6ocze2ji4dzbxnyibaod45uj5jnop77om7pkght3byq +- valory/abstract_round_abci:0.1.0:bafybeibxtwtlbo47gffdzh2njuaydixnpsmvvmjvtodh4g45vkxh73dr4m +- valory/transaction_settlement_abci:0.1.0:bafybeig5rawmq5sw4v36wv64xq47g2dgmxbqkhwngwt5fj7lwlno3trz2y behaviours: main: args: {} diff --git a/packages/valory/skills/registration_abci/skill.yaml b/packages/valory/skills/registration_abci/skill.yaml index e65df0de..2782bc76 100644 --- a/packages/valory/skills/registration_abci/skill.yaml +++ b/packages/valory/skills/registration_abci/skill.yaml @@ -26,13 +26,13 @@ fingerprint_ignore_patterns: [] connections: - valory/p2p_libp2p_client:0.1.0:bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq contracts: -- valory/service_registry:0.1.0:bafybeic4bgql6x5jotp43ddazybmyb7macifjzudavqll3547ayhawttpi +- valory/service_registry:0.1.0:bafybeia2swgpmczn3iykmptigabklk2eqbqxzhmbnunq3givmjygvmgtbm protocols: - valory/contract_api:1.0.0:bafybeialhbjvwiwcnqq3ysxcyemobcbie7xza66gaofcvla5njezkvhcka - valory/http:1.0.0:bafybeiejoqgv7finfxo3rcvvovrlj5ccrbgxodjq43uo26ylpowsa3llfe - valory/tendermint:0.1.0:bafybeig6g6twajlwssfbfp5rlnu5mwzuu5kgak5cs4fich7rlkx6whesnu skills: -- valory/abstract_round_abci:0.1.0:bafybeiebseo26frdimmklgki7yydxmzye6ixevzvj7bgjuaq5y3hmfw6ne +- valory/abstract_round_abci:0.1.0:bafybeibxtwtlbo47gffdzh2njuaydixnpsmvvmjvtodh4g45vkxh73dr4m behaviours: main: args: {} diff --git a/packages/valory/skills/reset_pause_abci/skill.yaml b/packages/valory/skills/reset_pause_abci/skill.yaml index 78415fda..6a55ab8d 100644 --- a/packages/valory/skills/reset_pause_abci/skill.yaml +++ b/packages/valory/skills/reset_pause_abci/skill.yaml @@ -26,7 +26,7 @@ connections: [] contracts: [] protocols: [] skills: -- valory/abstract_round_abci:0.1.0:bafybeiebseo26frdimmklgki7yydxmzye6ixevzvj7bgjuaq5y3hmfw6ne +- valory/abstract_round_abci:0.1.0:bafybeibxtwtlbo47gffdzh2njuaydixnpsmvvmjvtodh4g45vkxh73dr4m behaviours: main: args: {} diff --git a/packages/valory/skills/termination_abci/skill.yaml b/packages/valory/skills/termination_abci/skill.yaml index 1ec02172..e75b2297 100644 --- a/packages/valory/skills/termination_abci/skill.yaml +++ b/packages/valory/skills/termination_abci/skill.yaml @@ -23,14 +23,14 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] contracts: -- valory/gnosis_safe:0.1.0:bafybeifmsjpgbifvk7y462rhfczvjvpigkdniavghhg5utza3hbnffioq4 +- valory/gnosis_safe:0.1.0:bafybeidll7frtdsq2ckiluazkwk4zpkp7natt4kdejjehwvykqwzyuf6ei - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y -- valory/service_registry:0.1.0:bafybeic4bgql6x5jotp43ddazybmyb7macifjzudavqll3547ayhawttpi +- valory/service_registry:0.1.0:bafybeia2swgpmczn3iykmptigabklk2eqbqxzhmbnunq3givmjygvmgtbm protocols: - valory/contract_api:1.0.0:bafybeialhbjvwiwcnqq3ysxcyemobcbie7xza66gaofcvla5njezkvhcka skills: -- valory/abstract_round_abci:0.1.0:bafybeiebseo26frdimmklgki7yydxmzye6ixevzvj7bgjuaq5y3hmfw6ne -- valory/transaction_settlement_abci:0.1.0:bafybeiclpp6njvg6ocze2ji4dzbxnyibaod45uj5jnop77om7pkght3byq +- valory/abstract_round_abci:0.1.0:bafybeibxtwtlbo47gffdzh2njuaydixnpsmvvmjvtodh4g45vkxh73dr4m +- valory/transaction_settlement_abci:0.1.0:bafybeig5rawmq5sw4v36wv64xq47g2dgmxbqkhwngwt5fj7lwlno3trz2y behaviours: main: args: {} diff --git a/packages/valory/skills/transaction_settlement_abci/skill.yaml b/packages/valory/skills/transaction_settlement_abci/skill.yaml index 95dc2b88..88197001 100644 --- a/packages/valory/skills/transaction_settlement_abci/skill.yaml +++ b/packages/valory/skills/transaction_settlement_abci/skill.yaml @@ -31,14 +31,14 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] contracts: -- valory/gnosis_safe:0.1.0:bafybeifmsjpgbifvk7y462rhfczvjvpigkdniavghhg5utza3hbnffioq4 +- valory/gnosis_safe:0.1.0:bafybeidll7frtdsq2ckiluazkwk4zpkp7natt4kdejjehwvykqwzyuf6ei protocols: - open_aea/signing:1.0.0:bafybeie7xyems76v5b4wc2lmaidcujizpxfzjnnwdeokmhje53g7ym25ii - valory/abci:0.1.0:bafybeihmzlmmb4pdo3zkhg6ehuyaa4lhw7bfpclln2o2z7v3o6fcep26iu - valory/contract_api:1.0.0:bafybeialhbjvwiwcnqq3ysxcyemobcbie7xza66gaofcvla5njezkvhcka - valory/ledger_api:1.0.0:bafybeigpn6ysm53qkcllkzgdwc5xxpxz32xn2zoux3phdm2i3yty2i3thu skills: -- valory/abstract_round_abci:0.1.0:bafybeiebseo26frdimmklgki7yydxmzye6ixevzvj7bgjuaq5y3hmfw6ne +- valory/abstract_round_abci:0.1.0:bafybeibxtwtlbo47gffdzh2njuaydixnpsmvvmjvtodh4g45vkxh73dr4m behaviours: main: args: {} @@ -161,7 +161,7 @@ models: class_name: TendermintDialogues dependencies: open-aea-test-autonomy: - version: ==0.13.4 + version: ==0.13.8 web3: version: <7,>=6.0.0 is_abstract: true diff --git a/scripts/bump.py b/scripts/bump.py new file mode 100644 index 00000000..a868d23c --- /dev/null +++ b/scripts/bump.py @@ -0,0 +1,316 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + +""" +Script for bumping core dependencies. + +This script + +- Fetches the latest core dependency versions from github +- Updates the tox.ini, packages and Pipfile/pyproject.toml files +- Performs the packages sync +""" + +import os +import re +import typing as t +from pathlib import Path + +import click +import requests +from aea.cli.utils.click_utils import PackagesSource, PyPiDependency +from aea.configurations.constants import PACKAGES, PACKAGE_TYPE_TO_CONFIG_FILE +from aea.configurations.data_types import Dependency +from aea.helpers.logging import setup_logger +from aea.helpers.yaml_utils import yaml_dump, yaml_dump_all, yaml_load, yaml_load_all +from aea.package_manager.v1 import PackageManagerV1 + +from autonomy.cli.helpers.ipfs_hash import load_configuration + + +BUMP_BRANCH = "chore/bump" +PIPFILE = Path.cwd() / "Pipfile" +PYPROJECT_TOML = Path.cwd() / "pyproject.toml" +TOX_INI = Path.cwd() / "tox.ini" + +TAGS_URL = "https://api.github.com/repos/{repo}/tags" +FILE_URL = "https://raw.githubusercontent.com/{repo}/{tag}/{file}" + +VERISON_RE = re.compile(r"(__version__|version)( )?=( )?\"(?P[0-9a-z\.]+)\"") + +OPEN_AEA_REPO = "valory-xyz/open-aea" +OPEN_AUTONOMY_REPO = "valory-xyz/open-autonomy" + +DEPENDENCY_SPECS = { + "open-aea": { + "repo": OPEN_AEA_REPO, + "file": "aea/__version__.py", + }, + "open-aea-ledger-ethereum": { + "repo": OPEN_AEA_REPO, + "file": "plugins/aea-ledger-ethereum/setup.py", + }, + "open-aea-ledger-ethereum-flashbots": { + "repo": OPEN_AEA_REPO, + "file": "plugins/aea-ledger-ethereum-flashbots/setup.py", + }, + "open-aea-ledger-ethereum-hwi": { + "repo": OPEN_AEA_REPO, + "file": "plugins/aea-ledger-ethereum-hwi/setup.py", + }, + "open-aea-ledger-cosmos": { + "repo": OPEN_AEA_REPO, + "file": "plugins/aea-ledger-cosmos/setup.py", + }, + "open-aea-ledger-solana": { + "repo": OPEN_AEA_REPO, + "file": "plugins/aea-ledger-solana/setup.py", + }, + "open-aea-cli-ipfs": { + "repo": OPEN_AEA_REPO, + "file": "plugins/aea-cli-ipfs/setup.py", + }, + "open-autonomy": { + "repo": OPEN_AUTONOMY_REPO, + "file": "autonomy/__version__.py", + }, + "open-aea-test-autonomy": { + "repo": OPEN_AUTONOMY_REPO, + "file": "plugins/aea-test-autonomy/setup.py", + }, +} + +_cache_file = Path.home() / ".aea" / ".gitcache" +_version_cache = {} +_logger = setup_logger("bump") + + +def load_git_cache() -> None: + """Load versions cache.""" + if not _cache_file.exists(): + return + with _cache_file.open("r", encoding="utf-8") as stream: + _version_cache.update(yaml_load(stream=stream)) + + +def dump_git_cache() -> None: + """Dump versions cache.""" + with _cache_file.open("w", encoding="utf-8") as stream: + yaml_dump(data=_version_cache, stream=stream) + + +def make_git_request(url: str) -> requests.Response: + """Make git request""" + auth = os.environ.get("GITHUB_AUTH") + if auth is None: + return requests.get(url=url) + return requests.get(url=url, headers={"Authorization": f"Bearer {auth}"}) + + +def get_latest_tag(repo: str) -> str: + """Fetch latest git tag.""" + if repo in _version_cache: + return _version_cache[repo] + + response = make_git_request(url=TAGS_URL.format(repo=repo)) + if response.status_code != 200: + raise ValueError( + f"Fetching tags from `{repo}` failed with message '" + + response.json()["message"] + + "'" + ) + latest_tag_data, *_ = response.json() + _version_cache[repo] = latest_tag_data["name"] + return _version_cache[repo] + + +def get_dependency_version(repo: str, file: str) -> str: + """Get version spec .""" + response = make_git_request( + FILE_URL.format( + repo=repo, + tag=get_latest_tag(repo=repo), + file=file, + ) + ) + if response.status_code != 200: + raise ValueError( + f"Fetching packages from `{repo}` failed with message '" + + response.text + + "'" + ) + ((*_, version),) = VERISON_RE.findall(response.content.decode()) + return f"=={version}" + + +def get_dependencies() -> t.Dict: + """Get dependency->version mapping.""" + dependencies = {} + for dependency, specs in DEPENDENCY_SPECS.items(): + version = _version_cache.get( + dependency, + get_dependency_version( + repo=specs["repo"], + file=specs["file"], + ), + ) + dependencies[dependency] = version + _version_cache.update(dependencies) + return dependencies + + +def bump_pipfile_or_pyproject(file: Path, dependencies: t.Dict[str, str]) -> None: + """Bump Pipfile.""" + if not file.exists(): + return + + _logger.info(f"Updating {file.name}") + updated = "" + content = file.read_text(encoding="utf-8") + for line in content.split("\n"): + try: + spec = Dependency.from_pipfile_string(line) + update = dependencies.get(spec.name) + if update is None: + updated += line + "\n" + continue + spec = Dependency( + name=spec.name, + version=update, + extras=spec.extras, + ) + updated += spec.to_pipfile_string() + "\n" + except ValueError: + updated += line + "\n" + file.write_text(updated[:-1], encoding="utf-8") + + +def bump_tox(dependencies: t.Dict[str, str]) -> None: + """Bump tox file.""" + if not TOX_INI.exists(): + return + + _logger.info("Updating tox.ini") + updated = "" + content = TOX_INI.read_text(encoding="utf-8") + for line in content.split("\n"): + try: + spec = Dependency.from_string(line.lstrip().rstrip()) + update = dependencies.get(spec.name) + if update is None: + updated += line + "\n" + continue + spec = Dependency( + name=spec.name, + version=update, + extras=spec.extras, + ) + updated += " " + spec.to_pip_string() + "\n" + except ValueError: + updated += line + "\n" + TOX_INI.write_text(updated[:-1], encoding="utf-8") + + +def bump_packages(dependencies: t.Dict[str, str]) -> None: + """Bump packages.""" + _logger.info("Updating packages") + manager = PackageManagerV1.from_dir(Path(PACKAGES)) + for package_id in manager.dev_packages: + path = ( + manager.package_path_from_package_id( + package_id=package_id, + ) + / PACKAGE_TYPE_TO_CONFIG_FILE[package_id.package_type.value] + ) + with path.open("r", encoding="utf-8") as stream: + config, *extra = yaml_load_all(stream=stream) + + for name in config.get("dependencies", {}): + update = dependencies.get(name) + if update is None: + continue + config["dependencies"][name]["version"] = update + + with path.open("w", encoding="utf-8") as stream: + yaml_dump_all([config, *extra], stream=stream) + + +@click.command(name="bump") +@click.option( + "-d", + "--dependency", + "extra", + type=PyPiDependency(), + multiple=True, + help="Specify extra dependency.", +) +@click.option( + "-s", + "--source", + "sources", + type=PackagesSource(), + multiple=True, + help="Specify extra sources.", +) +@click.option("--sync", is_flag=True, help="Perform sync.") +@click.option( + "--no-cache", + is_flag=True, + default=False, + help="Avoid using cache to bump.", +) +def main( + extra: t.Tuple[Dependency, ...], + sources: t.Tuple[str, ...], + sync: bool, + no_cache: bool, +) -> None: + """Run the bump script.""" + + if not no_cache: + load_git_cache() + + dependencies = {} + dependencies.update(get_dependencies()) + dependencies.update({dep.name: dep.version for dep in extra or []}) + + bump_pipfile_or_pyproject(PIPFILE, dependencies=dependencies) + bump_pipfile_or_pyproject(PYPROJECT_TOML, dependencies=dependencies) + bump_tox(dependencies=dependencies) + bump_packages(dependencies=dependencies) + dump_git_cache() + + if sync: + pm = PackageManagerV1.from_dir( + Path.cwd() / PACKAGES, config_loader=load_configuration + ) + pm.sync( + sources=[ + f"{OPEN_AEA_REPO}:{_version_cache[OPEN_AEA_REPO]}", + f"{OPEN_AUTONOMY_REPO}:{_version_cache[OPEN_AUTONOMY_REPO]}", + *sources, + ], + update_packages=True, + ) + pm.update_package_hashes() + pm.dump() + + +if __name__ == "__main__": + main() # pylint: disable=no-value-for-parameter diff --git a/tox.ini b/tox.ini index 69c3f223..8d9acfa2 100644 --- a/tox.ini +++ b/tox.ini @@ -28,14 +28,14 @@ deps = pytest-cov==4.0.0 pytest-asyncio==0.20.3 open-aea-flashbots==1.4.0 - requests==2.28.2 - open-aea==1.41.0.post1 - open-aea-ledger-ethereum==1.41.0.post1 - open-aea-ledger-cosmos==1.41.0.post1 - open-aea-ledger-ethereum-flashbots==1.41.0.post1 - open-aea-cli-ipfs==1.41.0.post1 - open-aea-test-autonomy==0.13.4 - open-autonomy==0.13.4 + requests==2.28.1 + open-aea==1.42.0 + open-aea-ledger-ethereum==1.42.0 + open-aea-ledger-cosmos==1.42.0 + open-aea-ledger-ethereum-flashbots==1.42.0 + open-aea-cli-ipfs==1.42.0 + open-aea-test-autonomy==0.13.8 + open-autonomy==0.13.8 openapi-core==0.13.2 openapi-spec-validator==0.2.8 pandas @@ -245,7 +245,7 @@ commands = skipsdist = True skip_install = True deps = - tomte[flake8]==0.2.12 + tomte[flake8]==0.2.15 commands = flake8 {env:CONTRACTS_PATHS}/connext_propagate_job {env:SKILLS_PATHS}/keep3r_abci {env:SKILLS_PATHS}/keep3r_job_abci {env:CONTRACTS_PATHS}/deposit_manager_job {env:CONTRACTS_PATHS}/keep3r_v2 {env:CONTRACTS_PATHS}/keep3r_my_job {env:CONTRACTS_PATHS}/keep3r_test_job {env:CONTRACTS_PATHS}/keep3r_v1 {env:CONTRACTS_PATHS}/keep3r_v1_library {env:CONTRACTS_PATHS}/phuture_harvesting_job {env:CONTRACTS_PATHS}/yearn_factory_harvest_job {env:SKILLS_PATHS}/registration_abci {env:SKILLS_PATHS}/reset_pause_abci {env:SKILLS_PATHS}/termination_abci {env:SKILLS_PATHS}/transaction_settlement_abci scripts @@ -254,7 +254,7 @@ skipsdist = True skip_install = True deps = {[testenv]deps} - tomte[mypy]==0.2.12 + tomte[mypy]==0.2.15 types-PyYAML==6.0.12.6 commands = mypy {env:SKILLS_PATHS}/keep3r_abci {env:SKILLS_PATHS}/keep3r_job_abci {env:CONTRACTS_PATHS}/deposit_manager_job {env:CONTRACTS_PATHS}/keep3r_v2 {env:CONTRACTS_PATHS}/keep3r_my_job {env:CONTRACTS_PATHS}/keep3r_test_job {env:CONTRACTS_PATHS}/keep3r_v1 {env:CONTRACTS_PATHS}/keep3r_v1_library {env:CONTRACTS_PATHS}/phuture_harvesting_job {env:CONTRACTS_PATHS}/yearn_factory_harvest_job {env:CONTRACTS_PATHS}/connext_propagate_job {env:SKILLS_PATHS}/registration_abci {env:SKILLS_PATHS}/reset_pause_abci {env:SKILLS_PATHS}/termination_abci {env:SKILLS_PATHS}/transaction_settlement_abci scripts --config-file tox.ini @@ -263,7 +263,7 @@ whitelist_externals = /bin/sh skipsdist = True deps = {[testenv]deps} - tomte[pylint]==0.2.12 + tomte[pylint]==0.2.15 commands = pylint {env:CONTRACTS_PATHS}/connext_propagate_job {env:SKILLS_PATHS}/keep3r_abci {env:SKILLS_PATHS}/keep3r_job_abci {env:CONTRACTS_PATHS}/deposit_manager_job {env:CONTRACTS_PATHS}/keep3r_v2 {env:CONTRACTS_PATHS}/keep3r_my_job {env:CONTRACTS_PATHS}/keep3r_test_job {env:CONTRACTS_PATHS}/keep3r_v1 {env:CONTRACTS_PATHS}/keep3r_v1_library {env:CONTRACTS_PATHS}/phuture_harvesting_job {env:CONTRACTS_PATHS}/yearn_factory_harvest_job {env:SKILLS_PATHS}/registration_abci {env:SKILLS_PATHS}/reset_pause_abci {env:SKILLS_PATHS}/termination_abci {env:SKILLS_PATHS}/transaction_settlement_abci scripts @@ -271,22 +271,22 @@ commands = skipsdist = True skip_install = True deps = - tomte[safety]==0.2.12 + tomte[safety]==0.2.15 commands = safety check -i 37524 -i 38038 -i 37776 -i 38039 -i 39621 -i 40291 -i 39706 -i 41002 -i 51358 -i 51499 [testenv:darglint] skipsdist = True skip_install = True deps = - tomte[darglint]==0.2.12 + tomte[darglint]==0.2.15 commands = darglint {env:CONTRACTS_PATHS}/connext_propagate_job {env:SKILLS_PATHS}/keep3r_abci {env:SKILLS_PATHS}/keep3r_job_abci {env:CONTRACTS_PATHS}/deposit_manager_job {env:CONTRACTS_PATHS}/keep3r_v2 {env:CONTRACTS_PATHS}/keep3r_my_job {env:CONTRACTS_PATHS}/keep3r_test_job {env:CONTRACTS_PATHS}/keep3r_v1 {env:CONTRACTS_PATHS}/keep3r_v1_library {env:CONTRACTS_PATHS}/phuture_harvesting_job {env:CONTRACTS_PATHS}/yearn_factory_harvest_job {env:SKILLS_PATHS}/registration_abci {env:SKILLS_PATHS}/reset_pause_abci {env:SKILLS_PATHS}/termination_abci {env:SKILLS_PATHS}/transaction_settlement_abci scripts [testenv:check-generate-all-protocols] skipsdist = True usedevelop = True deps = - tomte[isort]==0.2.12 - tomte[black]==0.2.12 + tomte[isort]==0.2.15 + tomte[black]==0.2.15 commands = aea generate-all-protocols --check-clean [testenv:spell-check] @@ -451,6 +451,12 @@ ignore_missing_imports=True [mypy-openapi_spec_validator.*] ignore_missing_imports=True +[mypy-click.*] +ignore_missing_imports=True + +[mypy-autonomy.*] +ignore_missing_imports=True + [darglint] docstring_style=sphinx strictness=short From b084d2052423ab9b98757e6d776d20b0a8c59caf Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Fri, 1 Dec 2023 10:05:39 +0530 Subject: [PATCH 2/3] fix: mkdocs config --- mkdocs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index 9363caac..aa3d33f7 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -56,8 +56,8 @@ markdown_extensions: alternate_style: true - pymdownx.highlight - pymdownx.emoji: - emoji_index: !!python/name:materialx.emoji.twemoji - emoji_generator: !!python/name:materialx.emoji.to_svg + emoji_index: !!python/name:material.extensions.emoji.twemoji + emoji_generator: !!python/name:material.extensions.emoji.to_svg - pymdownx.arithmatex: generic: true - pymdownx.superfences: From bac72eaa42f550e77f798b0a874076c5b9650012 Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Fri, 1 Dec 2023 13:42:30 +0530 Subject: [PATCH 3/3] fix: replace `fetchai/http_server` with `valory/http_server` --- .gitignore | 1 + Pipfile | 6 +++--- packages/packages.json | 10 +++++----- packages/valory/agents/keep3r_bot/aea-config.yaml | 6 +++--- packages/valory/services/keep3r_bot/service.yaml | 2 +- .../valory/services/keep3r_bot_goerli/service.yaml | 2 +- packages/valory/skills/keep3r_abci/handlers.py | 2 +- packages/valory/skills/keep3r_abci/skill.yaml | 2 +- tox.ini | 6 +++--- 9 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 25e5c49d..8fb23565 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ htmlcov packages/open_aea packages/valory/skills/abstract_abci packages/valory/connections/abci +packages/valory/connections/http_server packages/valory/connections/http_client packages/valory/connections/ipfs packages/valory/connections/p2p_libp2p_client diff --git a/Pipfile b/Pipfile index 81a1c137..58b4f26b 100644 --- a/Pipfile +++ b/Pipfile @@ -9,7 +9,7 @@ name = "pypi" [dev-packages] # we fix exact versions as it's sufficient to have at least one set of compatible dependencies for development -aiohttp = "==3.7.4.post0" +aiohttp = "<4.0.0,>=3.8.5" asn1crypto = "==1.5.1" certifi = "==2021.10.8" grpcio = "==1.53.0" @@ -30,8 +30,8 @@ open-aea-cli-ipfs = "==1.42.0" open-aea-test-autonomy = "==0.13.8" open-autonomy = {version = "==0.13.8", extras = ["all"]} tomte = {version = "==0.2.15", extras = ["cli", "tests"]} -openapi-core = "==0.13.2" -openapi-spec-validator = "==0.2.8" +openapi-core = "==0.15.0" +openapi-spec-validator = "<0.5.0,>=0.4.0" protobuf = "<4.25.0,>=4.21.6" [requires] diff --git a/packages/packages.json b/packages/packages.json index 78cbcec3..6cb063b2 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -4,14 +4,14 @@ "contract/valory/keep3r_test_job/0.1.0": "bafybeihznhhs4arespznzw2szjbze4x42ewzfokgitnzhyaskn7xhbas7e", "contract/valory/keep3r_v1/0.1.0": "bafybeidz5bjdkrujrte2hzaauvpgwxl24ecpsost47xk5tc3wwqhtvmlaq", "skill/valory/keep3r_job_abci/0.1.0": "bafybeig3hxmmonae2w3ocis7aoyu3ql2mkugaoreqsdd5bfendyigqs7hy", - "skill/valory/keep3r_abci/0.1.0": "bafybeidsyeocdtogrdhik55edpwkhx3rm6khuagf3em2mszij4icotevjq", - "agent/valory/keep3r_bot/0.1.0": "bafybeiamd2hycga2qwagrdqs3tow2l7p6ocrhrfpcc6prx7fkybmfqf4au", + "skill/valory/keep3r_abci/0.1.0": "bafybeia337jrmytjn2yc7vjyoris32kxucp6a2dcwzssbk4fq3ujglp6he", + "agent/valory/keep3r_bot/0.1.0": "bafybeicnrnf5f62ftaqyd56iag4oifjiy5k6nzl63ojkxgyub4ckqktvpq", "contract/valory/keep3r_v2/0.1.0": "bafybeiapby775eg6nferyeo6hi7p5dwpbq6z6xqinvw76ehtrjhsky63su", "contract/valory/deposit_manager_job/0.1.0": "bafybeidgftrpx2ow4nc57edh3jnpfuahhobcownec7w6lro6nctt4roa2e", "contract/valory/phuture_harvesting_job/0.1.0": "bafybeigzwhmaxkzqpzx7vlo7aw7hagsnrr77yb32zv5epzzigfoaqcbgfq", "contract/valory/keep3r_my_job/0.1.0": "bafybeif3gus6t2hn6z6wh3tzxgf6osvtyw2iwehe3l2dicluyex3mk7izi", - "service/valory/keep3r_bot/0.1.0": "bafybeihliyoa3pzpr7qmk4lwzpd7uktdcsxi53mx5vwkjnnie4req5yspu", - "service/valory/keep3r_bot_goerli/0.1.0": "bafybeifwtdglk3gju2lix5dllnsxl6fzs437f7g2qvndaqufkd55utnwia", + "service/valory/keep3r_bot/0.1.0": "bafybeih7mri6z4puogwe4dog7hocagtel76iloavxaw772ngwhv7nlxhrq", + "service/valory/keep3r_bot_goerli/0.1.0": "bafybeidzootex4uehkeoyjgtatzus3rbsmdekq33ijkpjuzouoxhik2xzi", "contract/valory/yearn_factory_harvest_job/0.1.0": "bafybeibfkyp2q3737vpt3aphexxun5pphgr43o34khaht3fjtbwuceteka", "protocol/valory/ledger_api/1.0.0": "bafybeigpn6ysm53qkcllkzgdwc5xxpxz32xn2zoux3phdm2i3yty2i3thu", "connection/valory/ledger/0.19.0": "bafybeiav5ibf62d6k7loc7glpva6yadkuese6xsscrpe5l2f2fpnvnpeni", @@ -40,6 +40,6 @@ "contract/valory/multisend/0.1.0": "bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y", "protocol/valory/ipfs/0.1.0": "bafybeiedxeismnx3k5ty4mvvhlqideixlhqmi5mtcki4lxqfa7uqh7p33u", "connection/valory/ipfs/0.1.0": "bafybeihx7wb5hngjobw2salzqqryrhxvmxfuw7o2npjyqd2talmh2flqeq", - "connection/fetchai/http_server/0.22.0": "bafybeihvscddpxjbtqsetngmxo3kiht2wqhosmwiyuh3f6zjti3x3byu5u" + "connection/valory/http_server/0.22.0": "bafybeiesafy2af2wakqvsal4hz6ldycb73j5w62szhwy25iyhlf2wgyg44" } } \ No newline at end of file diff --git a/packages/valory/agents/keep3r_bot/aea-config.yaml b/packages/valory/agents/keep3r_bot/aea-config.yaml index 62595389..22bca454 100644 --- a/packages/valory/agents/keep3r_bot/aea-config.yaml +++ b/packages/valory/agents/keep3r_bot/aea-config.yaml @@ -133,7 +133,7 @@ connections: - valory/ipfs:0.1.0:bafybeihx7wb5hngjobw2salzqqryrhxvmxfuw7o2npjyqd2talmh2flqeq - valory/ledger:0.19.0:bafybeiav5ibf62d6k7loc7glpva6yadkuese6xsscrpe5l2f2fpnvnpeni - valory/p2p_libp2p_client:0.1.0:bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq -- fetchai/http_server:0.22.0:bafybeihvscddpxjbtqsetngmxo3kiht2wqhosmwiyuh3f6zjti3x3byu5u +- valory/http_server:0.22.0:bafybeiesafy2af2wakqvsal4hz6ldycb73j5w62szhwy25iyhlf2wgyg44 contracts: - valory/curve_pool:0.1.0:bafybeihjfv2jiygzan2x24dtsnhndokcdtmrjg2vx7cufi6qzwbsunacnq - valory/gnosis_safe:0.1.0:bafybeidll7frtdsq2ckiluazkwk4zpkp7natt4kdejjehwvykqwzyuf6ei @@ -155,7 +155,7 @@ protocols: skills: - valory/abstract_abci:0.1.0:bafybeiflcfufixmsrhobf56bn5745m2iipcfqyulwk2qegtnagb3kvaaxi - valory/abstract_round_abci:0.1.0:bafybeibxtwtlbo47gffdzh2njuaydixnpsmvvmjvtodh4g45vkxh73dr4m -- valory/keep3r_abci:0.1.0:bafybeidsyeocdtogrdhik55edpwkhx3rm6khuagf3em2mszij4icotevjq +- valory/keep3r_abci:0.1.0:bafybeia337jrmytjn2yc7vjyoris32kxucp6a2dcwzssbk4fq3ujglp6he - valory/keep3r_job_abci:0.1.0:bafybeig3hxmmonae2w3ocis7aoyu3ql2mkugaoreqsdd5bfendyigqs7hy - valory/registration_abci:0.1.0:bafybeied4xkeza33c3apfpsbcwvws4rg6xu3nottdu3ikhtrfadffjjflu - valory/reset_pause_abci:0.1.0:bafybeibzdhcu6hzcsrkgoy3prjlviudm6awyn5246uuxpa5pyugkdfa2am @@ -316,7 +316,7 @@ cert_requests: save_path: .certs/acn_cosmos_9005.txt is_abstract: false --- -public_id: fetchai/http_server:0.22.0:bafybeicblltx7ha3ulthg7bzfccuqqyjmihhrvfeztlgrlcoxhr7kf6nbq +public_id: valory/http_server:0.22.0:bafybeicblltx7ha3ulthg7bzfccuqqyjmihhrvfeztlgrlcoxhr7kf6nbq type: connection config: host: 0.0.0.0 diff --git a/packages/valory/services/keep3r_bot/service.yaml b/packages/valory/services/keep3r_bot/service.yaml index 704c1355..5119dd19 100644 --- a/packages/valory/services/keep3r_bot/service.yaml +++ b/packages/valory/services/keep3r_bot/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeig26ntff2vdtmum3crflwqrybmonwdxahvlrst2brnazbo3mjvtqu fingerprint_ignore_patterns: [] -agent: valory/keep3r_bot:0.1.0:bafybeiamd2hycga2qwagrdqs3tow2l7p6ocrhrfpcc6prx7fkybmfqf4au +agent: valory/keep3r_bot:0.1.0:bafybeicnrnf5f62ftaqyd56iag4oifjiy5k6nzl63ojkxgyub4ckqktvpq number_of_agents: 1 deployment: tendermint: diff --git a/packages/valory/services/keep3r_bot_goerli/service.yaml b/packages/valory/services/keep3r_bot_goerli/service.yaml index d82db2fb..f732099f 100644 --- a/packages/valory/services/keep3r_bot_goerli/service.yaml +++ b/packages/valory/services/keep3r_bot_goerli/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeiblcg3qti2cyz4ytufdkmqzcm6svbo5cwgsu2srjovvljdi35iz6i fingerprint_ignore_patterns: [] -agent: valory/keep3r_bot:0.1.0:bafybeiamd2hycga2qwagrdqs3tow2l7p6ocrhrfpcc6prx7fkybmfqf4au +agent: valory/keep3r_bot:0.1.0:bafybeicnrnf5f62ftaqyd56iag4oifjiy5k6nzl63ojkxgyub4ckqktvpq number_of_agents: 4 deployment: tendermint: diff --git a/packages/valory/skills/keep3r_abci/handlers.py b/packages/valory/skills/keep3r_abci/handlers.py index 2e34d3f6..bd1465d4 100644 --- a/packages/valory/skills/keep3r_abci/handlers.py +++ b/packages/valory/skills/keep3r_abci/handlers.py @@ -28,7 +28,7 @@ from aea.protocols.base import Message -from packages.fetchai.connections.http_server.connection import ( +from packages.valory.connections.http_server.connection import ( PUBLIC_ID as HTTP_SERVER_PUBLIC_ID, ) from packages.valory.protocols.http.message import HttpMessage diff --git a/packages/valory/skills/keep3r_abci/skill.yaml b/packages/valory/skills/keep3r_abci/skill.yaml index b1ab71a1..2a152778 100644 --- a/packages/valory/skills/keep3r_abci/skill.yaml +++ b/packages/valory/skills/keep3r_abci/skill.yaml @@ -12,7 +12,7 @@ fingerprint: composition.py: bafybeiemid5ug3sx2lxmcoa3dl6b74m24assbqnyefjemprtdwohc2ppz4 dialogues.py: bafybeidfvafboay732zd7ez4yblojbzohujfwtp3e5elit7ztenepk6q3a fsm_specification.yaml: bafybeiglxtz2wcczhyl2zirrrc7aq6recrvkwzczvzujvapjdsm556kwbu - handlers.py: bafybeibrtayhuvphvgycqamabimjnea6iszcmedyszztmk2xewrq5dwcsa + handlers.py: bafybeidzrnd3fz3ufxvlvxegnfl4hbps2vzssuv3tgv6oii3l3sajf2nci models.py: bafybeihd33rgyt5tmpct2fotsli5ep5bco4nnwf2vwksmy3lfn7qme6rbm payloads.py: bafybeihcmvruwttq5vtzwzli22kntuqb43remqfzgi3vrt7ijel52ichua fingerprint_ignore_patterns: [] diff --git a/tox.ini b/tox.ini index 8d9acfa2..c8583fc3 100644 --- a/tox.ini +++ b/tox.ini @@ -16,7 +16,7 @@ whitelist_externals = /bin/sh passenv = * extras = all deps = - aiohttp==3.7.4.post0 + aiohttp<4.0.0,>=3.8.5 asn1crypto==1.5.1 certifi==2021.10.8 grpcio==1.53.0 @@ -36,8 +36,8 @@ deps = open-aea-cli-ipfs==1.42.0 open-aea-test-autonomy==0.13.8 open-autonomy==0.13.8 - openapi-core==0.13.2 - openapi-spec-validator==0.2.8 + openapi-core==0.15.0 + openapi-spec-validator<0.5.0,>=0.4.0 pandas protobuf<4.25.0,>=4.21.6