diff --git a/.github/workflows/main_workflow.yml b/.github/workflows/main_workflow.yml index 9e5c22c69..f28876871 100644 --- a/.github/workflows/main_workflow.yml +++ b/.github/workflows/main_workflow.yml @@ -55,7 +55,7 @@ jobs: sudo apt-get update --fix-missing sudo apt-get autoremove sudo apt-get autoclean - pip install tomte[tox,cli]==0.2.12 + pip install tomte[tox,cli]==0.2.15 pip install --user --upgrade setuptools - name: Check copyright headers run: tomte check-copyright --author valory --exclude-part connections --exclude-part contracts --exclude-part protocols --exclude-part abstract_abci --exclude-part abstract_round_abci --exclude-part registration_abci --exclude-part reset_pause_abci --exclude-part termination_abci --exclude-part transaction_settlement_abci @@ -89,7 +89,7 @@ jobs: sudo apt-get update --fix-missing sudo apt-get autoremove sudo apt-get autoclean - pip install tomte[tox,cli]==0.2.12 + pip install tomte[tox,cli]==0.2.15 pip install --user --upgrade setuptools # install Protobuf compiler @@ -174,7 +174,7 @@ jobs: sudo apt-get update --fix-missing sudo apt-get autoremove sudo apt-get autoclean - pip install tomte[tox]==0.2.12 + pip install tomte[tox]==0.2.15 pip install --user --upgrade setuptools # install Protobuf compiler @@ -195,7 +195,7 @@ jobs: - if: matrix.os == 'macos-latest' name: Install dependencies (macos-latest) run: | - pip install tomte[tox]==0.2.12 + pip install tomte[tox]==0.2.15 brew install gcc # brew install protobuf # brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/72457f0166d5619a83f508f2345b22d0617b5021/Formula/protobuf.rb @@ -223,7 +223,7 @@ jobs: choco install make -y # to check make was installed make --version - pip install tomte[tox]==0.2.12 + pip install tomte[tox]==0.2.15 - if: matrix.os == 'windows-latest' name: Packages unit tests windows-latest @@ -267,7 +267,7 @@ jobs: sudo apt-get update --fix-missing sudo apt-get autoremove sudo apt-get autoclean - pip install tomte[tox]==0.2.12 + pip install tomte[tox]==0.2.15 pip install --user --upgrade setuptools # install Protobuf compiler diff --git a/HISTORY.md b/HISTORY.md index 9c38ea7ca..cedc1edf9 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -22,7 +22,7 @@ ## 0.10.6 (2023-05-31) -- Bumps to `tomte@v0.2.12` and cleans up the repo #69 +- Bumps to `tomte@v0.2.15` and cleans up the repo #69 - Bumps `open-aea` and `open-autonomy` frameworks to `v1.34.0` and `v0.10.5.post1` correspondingly #68 diff --git a/Pipfile b/Pipfile index d0cf6bdad..98a339ce2 100644 --- a/Pipfile +++ b/Pipfile @@ -9,27 +9,27 @@ name = "pypi" [dev-packages] ### package deps -aiohttp = "==3.7.4.post0" -requests = "==2.28.2" +aiohttp = "<4.0.0,>=3.8.5" +requests = "==2.28.1" asn1crypto = "==1.4.0" grpcio = "==1.53.0" hypothesis = "==6.21.6" eth-abi = "==4.0.0" -open-aea = {version = "==1.41.0.post1", extras = ["all"]} -open-aea-ledger-ethereum = "==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"]} +open-aea = {version = "==1.42.0", extras = ["all"]} +open-aea-ledger-ethereum = "==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"]} pytz = "==2022.2.1" py-ecc = "==6.0.0" ### tests deps mistune = "==2.0.3" -tomte = {version = "==0.2.12", extras = ["cli", "tests"]} +tomte = {version = "==0.2.15", extras = ["cli", "tests"]} # for http server connection -openapi-core = "==0.13.2" -openapi-spec-validator = "==0.2.8" -jsonschema = ">=4.16.0,<=4.19.0" +openapi-core = "==0.15.0" +openapi-spec-validator = "<0.5.0,>=0.4.0" +jsonschema = "<4.4.0,>=4.3.0" [requires] python_version = "3.10" diff --git a/docs/index.md b/docs/index.md index 7992c835c..9fb7ae55b 100644 --- a/docs/index.md +++ b/docs/index.md @@ -34,7 +34,7 @@ In order to run a local demo of the Price Oracle service with a Hardhat node: 2. Fetch the Price Oracle service. ```bash - autonomy fetch valory/oracle:0.1.0:bafybeidt5zldigsgcowby72mgnxgolnwtq6llb3uc4iu2rucu23643xzei --service + autonomy fetch valory/oracle:0.1.0:bafybeiejskhux6r6limm4s3bwfvhuniwbfbvl36di6t67ablgigqt37w5u --service ``` 3. Build the Docker image of the service agents diff --git a/mkdocs.yml b/mkdocs.yml index e7076b036..694ffbc38 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: diff --git a/packages/packages.json b/packages/packages.json index 03963d86e..d5e7bcadf 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,36 +1,36 @@ { "dev": { - "contract/valory/offchain_aggregator/0.1.0": "bafybeicd5xzhzzc3lbi5iulbffrteikybwk4v6s3y5ptm46larlctjefii", - "skill/valory/oracle_deployment_abci/0.1.0": "bafybeicmf757sitno5tvtbdlztfsjma4ofxpn45lrlknnl7zr4mj5w34xu", - "skill/valory/price_estimation_abci/0.1.0": "bafybeiemvnlpkuzluanp2nkg3akw4og4dyr3izo5qe3bmwslyilatiyd4i", - "skill/valory/oracle_abci/0.1.0": "bafybeiawndkwm6ijkyqmxihytaobbtx6ubwl3xdqwn4m5befw5jpp7cmbe", - "agent/valory/oracle/0.1.0": "bafybeigjl3aj6rnczjezwgnipsjiji4fxdhzpntbkgb2richhdjiutac6u", - "service/valory/oracle/0.1.0": "bafybeidt5zldigsgcowby72mgnxgolnwtq6llb3uc4iu2rucu23643xzei" + "contract/valory/offchain_aggregator/0.1.0": "bafybeiggq6jexouybigjiphcf45jsovf5np4uln4r375d43e6yq5mtcrba", + "skill/valory/oracle_deployment_abci/0.1.0": "bafybeiazzh72unnh2izmsr223sttxzsxoykkznehzjcapnccpp6yokyxk4", + "skill/valory/price_estimation_abci/0.1.0": "bafybeidrjhemcvlloveepkcmuggqq5l22tdbk5gaktkvgaayxdrrvyfcce", + "skill/valory/oracle_abci/0.1.0": "bafybeib2qozxnpgzq63dwim47zuvjbihzmpx2o4gl6fccu4lsatbc5meda", + "agent/valory/oracle/0.1.0": "bafybeih6vsbx5kadbzkda6gzxtxlrucj73e3fpieokfetquh4nd5ecxs2i", + "service/valory/oracle/0.1.0": "bafybeiejskhux6r6limm4s3bwfvhuniwbfbvl36di6t67ablgigqt37w5u" }, "third_party": { - "connection/valory/ipfs/0.1.0": "bafybeigfmqvlzbp67fttccpl4hsu3zaztbxv6vd7ikzra2hfppfkalgpji", + "connection/valory/ipfs/0.1.0": "bafybeihx7wb5hngjobw2salzqqryrhxvmxfuw7o2npjyqd2talmh2flqeq", "protocol/valory/ipfs/0.1.0": "bafybeiedxeismnx3k5ty4mvvhlqideixlhqmi5mtcki4lxqfa7uqh7p33u", "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", "protocol/valory/ledger_api/1.0.0": "bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru", - "connection/valory/http_client/0.23.0": "bafybeifgeqgryx6b3s6eseyzyezygmeitcpt3tkor2eiycozoi6clgdrny", - "connection/valory/ledger/0.19.0": "bafybeigdckv3e6bz6kfloz4ucqrsufft6k4jp6bwkbbcvh4fxvgbmzq3dm", - "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", + "connection/valory/ledger/0.19.0": "bafybeia47rr37ianvwsh77tjjpv3nwif5sywhhy2fbdshnz4a2icwln76a", + "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", - "skill/valory/abstract_round_abci/0.1.0": "bafybeigrqhygo2hl2owisj5rqyh3acdvee773ajije64snlzalcgtaac7q", + "skill/valory/abstract_round_abci/0.1.0": "bafybeiaqcl7h2famylusiffigwem7tevkcsyocdu5xd42jkmgq6kvowzgq", "connection/valory/p2p_libp2p_client/0.1.0": "bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq", - "skill/valory/transaction_settlement_abci/0.1.0": "bafybeigxkdujugzvve2dszkwr5kgfx4uhz2epofo4lorbcnthmzfjegwzi", - "skill/valory/registration_abci/0.1.0": "bafybeib2whqixp5265d53sa6szkz7woet4awuqr4dekb2hokpgps5codme", - "skill/valory/reset_pause_abci/0.1.0": "bafybeiflxcl2dtzayyzzddc4f2astzxunyp66meutornanrgeemicdea5q", + "skill/valory/transaction_settlement_abci/0.1.0": "bafybeiaefgqbs7zsn5xe5kdwrujj7ivygkn3ujpw6crnvi3knvxw75qmja", + "skill/valory/registration_abci/0.1.0": "bafybeic2ynseiak7jpta7jfwuqwyp453b4p7lolr4wihxmpn633uekv5am", + "skill/valory/reset_pause_abci/0.1.0": "bafybeidzajbe3erygeh2xbd6lrjv7nsptznjuzrt24ykgvhgotdeyhfnba", "contract/valory/multisend/0.1.0": "bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y", - "skill/valory/termination_abci/0.1.0": "bafybeifazwrksp756h7z42qqfcgi6lya6wmhbx46l7ghlaooe45gqnju7q", - "connection/fetchai/http_server/0.22.0": "bafybeihvscddpxjbtqsetngmxo3kiht2wqhosmwiyuh3f6zjti3x3byu5u" + "skill/valory/termination_abci/0.1.0": "bafybeie4zvjfxvdu7qrulmur3chpjz3kpj5m4bjsxvpk4gvj5zbyyayfaa", + "connection/valory/http_server/0.22.0": "bafybeiesafy2af2wakqvsal4hz6ldycb73j5w62szhwy25iyhlf2wgyg44" } } \ No newline at end of file diff --git a/packages/valory/agents/oracle/aea-config.yaml b/packages/valory/agents/oracle/aea-config.yaml index 3ddd9c57f..88b20405c 100644 --- a/packages/valory/agents/oracle/aea-config.yaml +++ b/packages/valory/agents/oracle/aea-config.yaml @@ -8,19 +8,19 @@ fingerprint: README.md: bafybeia6rbpcaovvels4mn3ufkbbvwrsibury3x5g6eyo4lws4w2uk3x4q __init__.py: bafybeieja6fkcncllqarspvtzsnm25g6ttxkxfdk2jduuozvt5a3uin6t4 tests/__init__.py: bafybeiddkyv7ohqiylizxurzs4ihom2o5rpqbwf5xufzkz3jpa7umpwgmm - tests/test_oracle.py: bafybeidkhguqtwdm46mwybyrsergajqfyqu262ikfqwu7vxfzsox5bli5i + tests/test_oracle.py: bafybeihglxaoll54hfsbkaqykysldjg5usbk26hjhrrckob7tohdvpizmy fingerprint_ignore_patterns: [] connections: -- fetchai/http_server:0.22.0:bafybeihvscddpxjbtqsetngmxo3kiht2wqhosmwiyuh3f6zjti3x3byu5u -- valory/abci:0.1.0:bafybeigzgupmh6kwwx4jbqkw7qri5vr6vz53xbi4uksulh6oiovdplmviu -- valory/http_client:0.23.0:bafybeifgeqgryx6b3s6eseyzyezygmeitcpt3tkor2eiycozoi6clgdrny -- valory/ledger:0.19.0:bafybeigdckv3e6bz6kfloz4ucqrsufft6k4jp6bwkbbcvh4fxvgbmzq3dm +- valory/http_server:0.22.0:bafybeiesafy2af2wakqvsal4hz6ldycb73j5w62szhwy25iyhlf2wgyg44 +- valory/abci:0.1.0:bafybeiejo5uyurbmafretedivyci2ktastxclbmgrkwcwc2yt36jftyqgm +- valory/http_client:0.23.0:bafybeiddrfvomrmgvh5yuv2coq7ci72wcdf663stayi3m5aawnj4srggce +- valory/ledger:0.19.0:bafybeia47rr37ianvwsh77tjjpv3nwif5sywhhy2fbdshnz4a2icwln76a - valory/p2p_libp2p_client:0.1.0:bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq contracts: -- valory/gnosis_safe:0.1.0:bafybeifmsjpgbifvk7y462rhfczvjvpigkdniavghhg5utza3hbnffioq4 -- valory/gnosis_safe_proxy_factory:0.1.0:bafybeigejiv4fkksyjwmr6doo23kfpicfbktuwspbamasyvjusfdyjtrxy -- valory/offchain_aggregator:0.1.0:bafybeicd5xzhzzc3lbi5iulbffrteikybwk4v6s3y5ptm46larlctjefii -- valory/service_registry:0.1.0:bafybeic4bgql6x5jotp43ddazybmyb7macifjzudavqll3547ayhawttpi +- valory/gnosis_safe:0.1.0:bafybeidll7frtdsq2ckiluazkwk4zpkp7natt4kdejjehwvykqwzyuf6ei +- valory/gnosis_safe_proxy_factory:0.1.0:bafybeidvcgnbbmjtha6tl7st2ysna2l3iiqfhnzjfasyvml5unecozeeka +- valory/offchain_aggregator:0.1.0:bafybeiggq6jexouybigjiphcf45jsovf5np4uln4r375d43e6yq5mtcrba +- valory/service_registry:0.1.0:bafybeia2swgpmczn3iykmptigabklk2eqbqxzhmbnunq3givmjygvmgtbm protocols: - open_aea/signing:1.0.0:bafybeie7xyems76v5b4wc2lmaidcujizpxfzjnnwdeokmhje53g7ym25ii - valory/abci:0.1.0:bafybeihmzlmmb4pdo3zkhg6ehuyaa4lhw7bfpclln2o2z7v3o6fcep26iu @@ -30,15 +30,15 @@ protocols: - valory/ledger_api:1.0.0:bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru - valory/tendermint:0.1.0:bafybeig6g6twajlwssfbfp5rlnu5mwzuu5kgak5cs4fich7rlkx6whesnu skills: -- valory/abstract_abci:0.1.0:bafybeifmfv4bgt5vzvgawlocksacqeadzg72zs4usvgjaf245hbbptpiki -- valory/abstract_round_abci:0.1.0:bafybeigrqhygo2hl2owisj5rqyh3acdvee773ajije64snlzalcgtaac7q -- valory/oracle_abci:0.1.0:bafybeiawndkwm6ijkyqmxihytaobbtx6ubwl3xdqwn4m5befw5jpp7cmbe -- valory/oracle_deployment_abci:0.1.0:bafybeicmf757sitno5tvtbdlztfsjma4ofxpn45lrlknnl7zr4mj5w34xu -- valory/price_estimation_abci:0.1.0:bafybeiemvnlpkuzluanp2nkg3akw4og4dyr3izo5qe3bmwslyilatiyd4i -- valory/registration_abci:0.1.0:bafybeib2whqixp5265d53sa6szkz7woet4awuqr4dekb2hokpgps5codme -- valory/reset_pause_abci:0.1.0:bafybeiflxcl2dtzayyzzddc4f2astzxunyp66meutornanrgeemicdea5q -- valory/termination_abci:0.1.0:bafybeifazwrksp756h7z42qqfcgi6lya6wmhbx46l7ghlaooe45gqnju7q -- valory/transaction_settlement_abci:0.1.0:bafybeigxkdujugzvve2dszkwr5kgfx4uhz2epofo4lorbcnthmzfjegwzi +- valory/abstract_abci:0.1.0:bafybeiflcfufixmsrhobf56bn5745m2iipcfqyulwk2qegtnagb3kvaaxi +- valory/abstract_round_abci:0.1.0:bafybeiaqcl7h2famylusiffigwem7tevkcsyocdu5xd42jkmgq6kvowzgq +- valory/oracle_abci:0.1.0:bafybeib2qozxnpgzq63dwim47zuvjbihzmpx2o4gl6fccu4lsatbc5meda +- valory/oracle_deployment_abci:0.1.0:bafybeiazzh72unnh2izmsr223sttxzsxoykkznehzjcapnccpp6yokyxk4 +- valory/price_estimation_abci:0.1.0:bafybeidrjhemcvlloveepkcmuggqq5l22tdbk5gaktkvgaayxdrrvyfcce +- valory/registration_abci:0.1.0:bafybeic2ynseiak7jpta7jfwuqwyp453b4p7lolr4wihxmpn633uekv5am +- valory/reset_pause_abci:0.1.0:bafybeidzajbe3erygeh2xbd6lrjv7nsptznjuzrt24ykgvhgotdeyhfnba +- valory/termination_abci:0.1.0:bafybeie4zvjfxvdu7qrulmur3chpjz3kpj5m4bjsxvpk4gvj5zbyyayfaa +- valory/transaction_settlement_abci:0.1.0:bafybeiaefgqbs7zsn5xe5kdwrujj7ivygkn3ujpw6crnvi3knvxw75qmja default_ledger: ethereum required_ledgers: - ethereum @@ -70,11 +70,11 @@ logging_config: propagate: true dependencies: open-aea-ledger-cosmos: - version: ==1.41.0.post1 + version: ==1.42.0 open-aea-ledger-ethereum: - version: ==1.41.0.post1 + version: ==1.42.0 open-aea-test-autonomy: - version: ==0.13.4 + version: ==0.13.8 skill_exception_policy: stop_and_exit connection_exception_policy: just_log default_connection: null @@ -172,7 +172,7 @@ config: poa_chain: ${bool:false} default_gas_price_strategy: ${str:eip1559} --- -public_id: fetchai/http_server:0.22.0 +public_id: valory/http_server:0.22.0 type: connection config: api_spec_path: ${str:null} diff --git a/packages/valory/agents/oracle/tests/test_oracle.py b/packages/valory/agents/oracle/tests/test_oracle.py index 455781dea..c6a9bf413 100644 --- a/packages/valory/agents/oracle/tests/test_oracle.py +++ b/packages/valory/agents/oracle/tests/test_oracle.py @@ -183,7 +183,7 @@ def prepare(self, nb_nodes: int) -> None: self.set_agent_context(agent_name) port = self.BASE_PORT + i self.set_config( - dotted_path="vendor.fetchai.connections.http_server.config.port", + dotted_path="vendor.valory.connections.http_server.config.port", value=port, type_="int", ) diff --git a/packages/valory/contracts/offchain_aggregator/contract.yaml b/packages/valory/contracts/offchain_aggregator/contract.yaml index 770a57463..cb5ced2c1 100644 --- a/packages/valory/contracts/offchain_aggregator/contract.yaml +++ b/packages/valory/contracts/offchain_aggregator/contract.yaml @@ -21,8 +21,8 @@ dependencies: eth-abi: version: ==4.0.0 open-aea-ledger-ethereum: - version: ==1.41.0.post1 + version: ==1.42.0 open-aea-test-autonomy: - version: ==0.13.4 + version: ==0.13.8 eth-typing: version: ==3.4.0 diff --git a/packages/valory/services/oracle/service.yaml b/packages/valory/services/oracle/service.yaml index 51a2e3fff..b02585cc2 100644 --- a/packages/valory/services/oracle/service.yaml +++ b/packages/valory/services/oracle/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeidfvq6yso3dpxgglq7fvviy42xjf3s7bn5thmi7ogv2j6pag3rene fingerprint_ignore_patterns: [] -agent: valory/oracle:0.1.0:bafybeigjl3aj6rnczjezwgnipsjiji4fxdhzpntbkgb2richhdjiutac6u +agent: valory/oracle:0.1.0:bafybeih6vsbx5kadbzkda6gzxtxlrucj73e3fpieokfetquh4nd5ecxs2i number_of_agents: 4 deployment: agent: diff --git a/packages/valory/skills/oracle_abci/skill.yaml b/packages/valory/skills/oracle_abci/skill.yaml index d9e1090e6..b4d3e995e 100644 --- a/packages/valory/skills/oracle_abci/skill.yaml +++ b/packages/valory/skills/oracle_abci/skill.yaml @@ -23,20 +23,20 @@ fingerprint: tests/test_models.py: bafybeibqcmwyunbxdoyhorypukrt3bxgvvm3yff7prdkbaenysxoix4e3u fingerprint_ignore_patterns: [] connections: -- valory/ledger:0.19.0:bafybeigdckv3e6bz6kfloz4ucqrsufft6k4jp6bwkbbcvh4fxvgbmzq3dm +- valory/ledger:0.19.0:bafybeia47rr37ianvwsh77tjjpv3nwif5sywhhy2fbdshnz4a2icwln76a contracts: [] protocols: - open_aea/signing:1.0.0:bafybeie7xyems76v5b4wc2lmaidcujizpxfzjnnwdeokmhje53g7ym25ii - valory/contract_api:1.0.0:bafybeialhbjvwiwcnqq3ysxcyemobcbie7xza66gaofcvla5njezkvhcka - valory/ledger_api:1.0.0:bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru skills: -- valory/abstract_round_abci:0.1.0:bafybeigrqhygo2hl2owisj5rqyh3acdvee773ajije64snlzalcgtaac7q -- valory/oracle_deployment_abci:0.1.0:bafybeicmf757sitno5tvtbdlztfsjma4ofxpn45lrlknnl7zr4mj5w34xu -- valory/price_estimation_abci:0.1.0:bafybeiemvnlpkuzluanp2nkg3akw4og4dyr3izo5qe3bmwslyilatiyd4i -- valory/registration_abci:0.1.0:bafybeib2whqixp5265d53sa6szkz7woet4awuqr4dekb2hokpgps5codme -- valory/reset_pause_abci:0.1.0:bafybeiflxcl2dtzayyzzddc4f2astzxunyp66meutornanrgeemicdea5q -- valory/termination_abci:0.1.0:bafybeifazwrksp756h7z42qqfcgi6lya6wmhbx46l7ghlaooe45gqnju7q -- valory/transaction_settlement_abci:0.1.0:bafybeigxkdujugzvve2dszkwr5kgfx4uhz2epofo4lorbcnthmzfjegwzi +- valory/abstract_round_abci:0.1.0:bafybeiaqcl7h2famylusiffigwem7tevkcsyocdu5xd42jkmgq6kvowzgq +- valory/oracle_deployment_abci:0.1.0:bafybeiazzh72unnh2izmsr223sttxzsxoykkznehzjcapnccpp6yokyxk4 +- valory/price_estimation_abci:0.1.0:bafybeidrjhemcvlloveepkcmuggqq5l22tdbk5gaktkvgaayxdrrvyfcce +- valory/registration_abci:0.1.0:bafybeic2ynseiak7jpta7jfwuqwyp453b4p7lolr4wihxmpn633uekv5am +- valory/reset_pause_abci:0.1.0:bafybeidzajbe3erygeh2xbd6lrjv7nsptznjuzrt24ykgvhgotdeyhfnba +- valory/termination_abci:0.1.0:bafybeie4zvjfxvdu7qrulmur3chpjz3kpj5m4bjsxvpk4gvj5zbyyayfaa +- valory/transaction_settlement_abci:0.1.0:bafybeiaefgqbs7zsn5xe5kdwrujj7ivygkn3ujpw6crnvi3knvxw75qmja behaviours: main: args: {} @@ -213,5 +213,5 @@ models: class_name: TendermintDialogues dependencies: open-aea-test-autonomy: - version: ==0.13.4 + version: ==0.13.8 is_abstract: false diff --git a/packages/valory/skills/oracle_deployment_abci/skill.yaml b/packages/valory/skills/oracle_deployment_abci/skill.yaml index e2dcb3630..c6a7999de 100644 --- a/packages/valory/skills/oracle_deployment_abci/skill.yaml +++ b/packages/valory/skills/oracle_deployment_abci/skill.yaml @@ -23,13 +23,13 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] contracts: -- valory/offchain_aggregator:0.1.0:bafybeicd5xzhzzc3lbi5iulbffrteikybwk4v6s3y5ptm46larlctjefii +- valory/offchain_aggregator:0.1.0:bafybeiggq6jexouybigjiphcf45jsovf5np4uln4r375d43e6yq5mtcrba protocols: - open_aea/signing:1.0.0:bafybeie7xyems76v5b4wc2lmaidcujizpxfzjnnwdeokmhje53g7ym25ii - valory/contract_api:1.0.0:bafybeialhbjvwiwcnqq3ysxcyemobcbie7xza66gaofcvla5njezkvhcka - valory/ledger_api:1.0.0:bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru skills: -- valory/abstract_round_abci:0.1.0:bafybeigrqhygo2hl2owisj5rqyh3acdvee773ajije64snlzalcgtaac7q +- valory/abstract_round_abci:0.1.0:bafybeiaqcl7h2famylusiffigwem7tevkcsyocdu5xd42jkmgq6kvowzgq behaviours: main: args: {} @@ -163,5 +163,5 @@ models: class_name: TendermintDialogues dependencies: open-aea-ledger-ethereum: - version: ==1.41.0.post1 + version: ==1.42.0 is_abstract: true diff --git a/packages/valory/skills/price_estimation_abci/handlers.py b/packages/valory/skills/price_estimation_abci/handlers.py index 7bb741b5a..9dc8900e1 100644 --- a/packages/valory/skills/price_estimation_abci/handlers.py +++ b/packages/valory/skills/price_estimation_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/price_estimation_abci/skill.yaml b/packages/valory/skills/price_estimation_abci/skill.yaml index 9a3475d96..29ce88f53 100644 --- a/packages/valory/skills/price_estimation_abci/skill.yaml +++ b/packages/valory/skills/price_estimation_abci/skill.yaml @@ -12,7 +12,7 @@ fingerprint: behaviours.py: bafybeiaipavir3wtyhi6vgby2zgnoidjrytvxqmbsa2blrwtixgle2h5p4 dialogues.py: bafybeigabhaykiyzbluu4mk6bbrmqhzld2kyp32pg24bvjmzrrb74einwm fsm_specification.yaml: bafybeihumi2e44hgpqktsprko7x2e6qslusjqkzjml7hdyc7t3nsnjbu2i - handlers.py: bafybeidjxgkfdoor3xhvxnh2yrwigd4zds7iwicsphr22vtrevp4bivyq4 + handlers.py: bafybeibap6g2zryv7zswyodhi6wf4pid4gviijahyjlqwb33ywykhu2m2i models.py: bafybeieosai5i4budnvipufzbvs3mbpvddfqu2ajswj6x4qjiwjbqjhrje payloads.py: bafybeici2wnrin4jdbbnjcxo7cjvsoevztvsjl7v4gsivgdbisydq6li4m rounds.py: bafybeifbvnqeivfuakcev5k4sxt7npzfl7rjjegkb4r724p3zlrqb4sbva @@ -24,25 +24,25 @@ fingerprint: tests/test_apis.py: bafybeib3w4tlsxmolmfouv37lhle6hqkxdkt6vfi4e57drouua4a7rd5ga tests/test_behaviours.py: bafybeicne2qpq2sfobsrxwtfa5jt5ughyvxnxqvfzxoriixpxkoyslz75m tests/test_dialogues.py: bafybeigmz5coi27zy7sgwnlhsvk7hg5auxexzbtdsw6uie375x3zjhzd4e - tests/test_handlers.py: bafybeia7ialzvyqfzswjl2a3ry4e2qxy6r2lwqnrj64nwzkhwhs3pvr354 + tests/test_handlers.py: bafybeibkomnglmam76i2feqzk2yxfcoeoo262ueq6dpslq2ei7ggjst2ba tests/test_models.py: bafybeifjn64lb2xo5blgpynfc5t6jrgwi6belth4gt3nel6lm4snv4ctoa tests/test_payloads.py: bafybeiaoxctskz5qbs33tdrbazembviryr55qudqwvxx2tga6jv6dmhhha tests/test_rounds.py: bafybeifolrkfy4slb45yuxm47aa6brva33j22kcmybcplvlsuw373jyo6i tests/test_tools.py: bafybeicvwyu4csbn3foyp5mvcdlnu3uiwwvmvnh5m74sspe77nws5ulm6i fingerprint_ignore_patterns: [] connections: -- fetchai/http_server:0.22.0:bafybeihvscddpxjbtqsetngmxo3kiht2wqhosmwiyuh3f6zjti3x3byu5u +- valory/http_server:0.22.0:bafybeiesafy2af2wakqvsal4hz6ldycb73j5w62szhwy25iyhlf2wgyg44 contracts: -- valory/gnosis_safe:0.1.0:bafybeifmsjpgbifvk7y462rhfczvjvpigkdniavghhg5utza3hbnffioq4 -- valory/offchain_aggregator:0.1.0:bafybeicd5xzhzzc3lbi5iulbffrteikybwk4v6s3y5ptm46larlctjefii +- valory/gnosis_safe:0.1.0:bafybeidll7frtdsq2ckiluazkwk4zpkp7natt4kdejjehwvykqwzyuf6ei +- valory/offchain_aggregator:0.1.0:bafybeiggq6jexouybigjiphcf45jsovf5np4uln4r375d43e6yq5mtcrba protocols: - open_aea/signing:1.0.0:bafybeie7xyems76v5b4wc2lmaidcujizpxfzjnnwdeokmhje53g7ym25ii - valory/contract_api:1.0.0:bafybeialhbjvwiwcnqq3ysxcyemobcbie7xza66gaofcvla5njezkvhcka - valory/http:1.0.0:bafybeiejoqgv7finfxo3rcvvovrlj5ccrbgxodjq43uo26ylpowsa3llfe skills: -- valory/abstract_round_abci:0.1.0:bafybeigrqhygo2hl2owisj5rqyh3acdvee773ajije64snlzalcgtaac7q -- valory/oracle_deployment_abci:0.1.0:bafybeicmf757sitno5tvtbdlztfsjma4ofxpn45lrlknnl7zr4mj5w34xu -- valory/transaction_settlement_abci:0.1.0:bafybeigxkdujugzvve2dszkwr5kgfx4uhz2epofo4lorbcnthmzfjegwzi +- valory/abstract_round_abci:0.1.0:bafybeiaqcl7h2famylusiffigwem7tevkcsyocdu5xd42jkmgq6kvowzgq +- valory/oracle_deployment_abci:0.1.0:bafybeiazzh72unnh2izmsr223sttxzsxoykkznehzjcapnccpp6yokyxk4 +- valory/transaction_settlement_abci:0.1.0:bafybeiaefgqbs7zsn5xe5kdwrujj7ivygkn3ujpw6crnvi3knvxw75qmja behaviours: main: args: {} @@ -212,5 +212,5 @@ models: class_name: TendermintDialogues dependencies: open-aea-test-autonomy: - version: ==0.13.4 + version: ==0.13.8 is_abstract: true diff --git a/packages/valory/skills/price_estimation_abci/tests/test_handlers.py b/packages/valory/skills/price_estimation_abci/tests/test_handlers.py index b3f91f00a..5aa7f668d 100644 --- a/packages/valory/skills/price_estimation_abci/tests/test_handlers.py +++ b/packages/valory/skills/price_estimation_abci/tests/test_handlers.py @@ -29,7 +29,7 @@ from aea.protocols.dialogue.base import DialogueMessage from aea.test_tools.test_skill import BaseSkillTestCase -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/scripts/bump.py b/scripts/bump.py new file mode 100644 index 000000000..a868d23cf --- /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 919f41050..b4dc687c7 100644 --- a/tox.ini +++ b/tox.ini @@ -12,33 +12,33 @@ skip_missing_interpreters = true [deps-tests] deps = - tomte[tests]==0.2.12 + tomte[tests]==0.2.15 mistune==2.0.3 [deps-packages] deps = {[deps-tests]deps} - aiohttp==3.7.4.post0 + aiohttp<4.0.0,>=3.8.5 asn1crypto==1.4.0 grpcio==1.53.0 hypothesis==6.21.6 joblib==1.1.0 numpy>=1.21.6 - open-aea-ledger-cosmos==1.41.0.post1 - open-aea-test-autonomy==0.13.4 - open-autonomy[all]==0.13.4 + open-aea-ledger-cosmos==1.42.0 + open-aea-test-autonomy==0.13.8 + open-autonomy[all]==0.13.8 pandas>=1.5.3 pandas-stubs==1.2.0.62 pytz==2022.2.1 py-ecc==6.0.0 scikit-learn>=1.0.2 statsmodels>=0.13.2 - requests==2.28.2 + requests==2.28.1 # for http server connection - 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 eth-abi==4.0.0 - jsonschema>=4.16.0,<=4.19.0 + jsonschema<4.4.0,>=4.3.0 protobuf<4.25.0,>=4.21.6 [deps-base] @@ -235,7 +235,7 @@ commands = {[commands-e2e]commands} [testenv:bandit] skipsdist = True skip_install = True -deps = tomte[bandit]==0.2.12 +deps = tomte[bandit]==0.2.15 commands = bandit -s B101 -r {env:SKILLS_PATHS}/oracle_abci bandit -s B101 -r {env:SKILLS_PATHS}/oracle_deployment_abci @@ -245,25 +245,25 @@ commands = [testenv:black] skipsdist = True skip_install = True -deps = tomte[black]==0.2.12 +deps = tomte[black]==0.2.15 commands = black {env:SKILLS_PATHS}/oracle_abci {env:SKILLS_PATHS}/oracle_deployment_abci {env:SKILLS_PATHS}/price_estimation_abci scripts [testenv:black-check] skipsdist = True skip_install = True -deps = tomte[black]==0.2.12 +deps = tomte[black]==0.2.15 commands = black --check {env:SKILLS_PATHS}/oracle_abci {env:SKILLS_PATHS}/oracle_deployment_abci {env:SKILLS_PATHS}/price_estimation_abci [testenv:isort] skipsdist = True skip_install = True -deps = tomte[isort]==0.2.12 +deps = tomte[isort]==0.2.15 commands = isort --gitignore {env:PACKAGES_PATHS} scripts [testenv:isort-check] skipsdist = True skip_install = True -deps = tomte[isort]==0.2.12 +deps = tomte[isort]==0.2.15 commands = isort --check-only --gitignore {env:PACKAGES_PATHS} scripts [testenv:check-hash] @@ -271,7 +271,7 @@ skipsdist = True usedevelop = True deps = protobuf<4.25.0,>=4.21.6 - open-autonomy[all]==0.13.4 + open-autonomy[all]==0.13.8 commands = autonomy init --reset --author ci --remote --ipfs --ipfs-node "/dns/registry.autonolas.tech/tcp/443/https" autonomy packages sync @@ -296,13 +296,13 @@ commands = {toxinidir}/scripts/check_pipfiles.py [testenv:flake8] skipsdist = True skip_install = True -deps = tomte[flake8]==0.2.12 +deps = tomte[flake8]==0.2.15 commands = flake8 {env:SKILLS_PATHS}/oracle_abci {env:SKILLS_PATHS}/oracle_deployment_abci {env:SKILLS_PATHS}/price_estimation_abci scripts [testenv:mypy] skipsdist = True skip_install = True -deps = tomte[mypy]==0.2.12 +deps = tomte[mypy]==0.2.15 commands = mypy {env:SKILLS_PATHS}/oracle_abci {env:SKILLS_PATHS}/oracle_deployment_abci {env:SKILLS_PATHS}/price_estimation_abci scripts --disallow-untyped-defs --config-file tox.ini [testenv:pylint] @@ -310,19 +310,19 @@ whitelist_externals = /bin/sh skipsdist = True deps = {[deps-packages]deps} - tomte[pylint]==0.2.12 + tomte[pylint]==0.2.15 commands = pylint --ignore-patterns=".*_pb2.py" --ignore-paths="^packages/valory/.*$" --disable=C0103,R0801,R0912,C0301,C0201,C0204,C0209,W1203,C0302,R1735,R1729,W0511 {env:SKILLS_PATHS}/oracle_abci {env:SKILLS_PATHS}/oracle_deployment_abci {env:SKILLS_PATHS}/price_estimation_abci scripts [testenv:safety] skipsdist = True skip_install = True -deps = tomte[safety]==0.2.12 +deps = 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 +deps = tomte[darglint]==0.2.15 commands = darglint {env:SKILLS_PATHS}/oracle_abci {env:SKILLS_PATHS}/oracle_deployment_abci {env:SKILLS_PATHS}/price_estimation_abci scripts [testenv:check-generate-all-protocols] @@ -330,8 +330,8 @@ skipsdist = True usedevelop = True deps = {[deps-packages]deps} - tomte[isort]==0.2.12 - tomte[black]==0.2.12 + tomte[isort]==0.2.15 + tomte[black]==0.2.15 commands = autonomy generate-all-protocols --check-clean [testenv:spell-check] @@ -380,7 +380,7 @@ commands = {toxinidir}/scripts/check_doc_ipfs_hashes.py --fix [testenv:liccheck] skipsdist = True usedevelop = True -deps = tomte[liccheck,cli]==0.2.12 +deps = tomte[liccheck,cli]==0.2.15 commands = tomte freeze-dependencies --output-path {envtmpdir}/requirements.txt liccheck -s tox.ini -r {envtmpdir}/requirements.txt -l PARANOID @@ -513,6 +513,12 @@ ignore_missing_imports = True [mypy-web3.*] ignore_missing_imports = True +[mypy-click.*] +ignore_missing_imports = True + +[mypy-autonomy.*] +ignore_missing_imports = True + [darglint] docstring_style=sphinx strictness=short