Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore/bump oa 0.3.1 #29

Merged
merged 5 commits into from
Sep 27, 2022
Merged

chore/bump oa 0.3.1 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5fc7faf
chore: bump to `open-autonomy@v0.3.1`
0xArdi Sep 26, 2022
c5d220e
chore: use `open-aea@v1.20.0`
0xArdi Sep 26, 2022
f46cdfd
chore: generators
0xArdi Sep 26, 2022
afd6e75
chore: check balancer packages only
0xArdi Sep 26, 2022
ff08e9c
chore: pin python version to `3.10.6` for static checks to pass
0xArdi Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main_workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest ]
python-version: [ "3.10" ]
python-version: [ "3.10.6" ]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why so explicit? I think we shouldn't do that

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it has to do with this.

It's not architecture dependent, it's only about the specific version of Python you have in your image. If you have Python 3.10.7 you'll see the error, if you have Python 3.10.6 you won't. In all cases, upgrading to mypy 0.981 will fix.

I can reproduce the problem locally when running tox -e mypy.


timeout-minutes: 30

Expand Down
12 changes: 6 additions & 6 deletions Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ types-pyyaml = "==6.0.7"
types-protobuf = "==3.19.20"
types-requests = "==2.27.25"
vulture = "==2.3"
open-aea = "==1.19.0"
open-aea-ledger-ethereum = "==1.19.0"
open-aea-ledger-cosmos = "==1.19.0"
open-aea-cli-ipfs = "==1.19.0"
open-aea-test-autonomy = "==0.3.0"
open-autonomy = {version = "==0.3.0", extras = [ "all"]}
open-aea = "==1.20.0"
open-aea-ledger-ethereum = "==1.20.0"
open-aea-ledger-cosmos = "==1.20.0"
open-aea-cli-ipfs = "==1.20.0"
open-aea-test-autonomy = "==0.3.1"
open-autonomy = {version = "==0.3.1", extras = [ "all"]}
tox = "==3.24.4"
typing-extensions = "*"

Expand Down
17 changes: 17 additions & 0 deletions packages/balancer/skills/fear_and_greed_oracle_abci/skill.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,23 @@ models:
drand_public_key: 868f005eb8e6e4ca0a47c8a77ceaa5309a47978a7c71bc5cce96366b5d7a569937c529eeda66c7293784a9402801af31
fear_and_greed_endpoint: https://api.alternative.me/fng/?format=json
fear_and_greed_num_points: 2
genesis_config:
genesis_time: '2022-09-26T00:00:00.000000000Z'
chain_id: chain-c4daS1
consensus_params:
block:
max_bytes: '22020096'
max_gas: '-1'
time_iota_ms: '1000'
evidence:
max_age_num_blocks: '100000'
max_age_duration: '172800000000000'
max_bytes: '1048576'
validator:
pub_key_types:
- ed25519
version: {}
voting_power: '10'
keeper_timeout: 30.0
max_healthcheck: 120
max_index_change: 0.00040509259
Expand Down
17 changes: 17 additions & 0 deletions packages/balancer/skills/pool_manager_abci/skill.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,23 @@ models:
consensus:
max_participants: 1
drand_public_key: 868f005eb8e6e4ca0a47c8a77ceaa5309a47978a7c71bc5cce96366b5d7a569937c529eeda66c7293784a9402801af31
genesis_config:
genesis_time: '2022-09-26T00:00:00.000000000Z'
chain_id: chain-c4daS1
consensus_params:
block:
max_bytes: '22020096'
max_gas: '-1'
time_iota_ms: '1000'
evidence:
max_age_num_blocks: '100000'
max_age_duration: '172800000000000'
max_bytes: '1048576'
validator:
pub_key_types:
- ed25519
version: {}
voting_power: '10'
keeper_timeout: 30.0
managed_pool_controller_address: '0xb821BFfE924E18F8B3d92473C5279d60F0Dfc6eA'
max_healthcheck: 120
Expand Down
4 changes: 2 additions & 2 deletions packages/packages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"skill/valory/transaction_settlement_abci/0.1.0": "bafybeia2gs36s2mz32yaznhlidiolhw5swkumiej4vgwywphppjvurldie",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should also update this to the matching hashes here: https://github.com/valory-xyz/open-autonomy/blob/v0.3.1/packages/packages.json

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The hashes are correct, and that is on accident.
What happened is I had #27 and #29 on my local. As I was bumping to v0.3.1 I needed to add a fix to #27, the local packages were from v0.3.1 and were updated when I ran make generators.

"agent/balancer/autonomous_fund/0.1.0": "bafybeidv4f27lal2v77b6jek75eggvyqol2p5z3bqmaytx2pla7et4oaqy",
"contract/valory/multisend/0.1.0": "bafybeig45676hbh4c3p3mujrrskxgxww4cxdyyginlg5rmmav6orv4gtya",
"skill/balancer/fear_and_greed_oracle_abci/0.1.0": "bafybeige2io4ljan7zunegdhrvqkplfswpjri5vlsqqczu5h7lhzf6wwjm",
"skill/balancer/pool_manager_abci/0.1.0": "bafybeiaujq2t2v7yaojdisj3rkanxpwhmqlkbvcqlxp3t3qlq3hawz6naa",
"skill/balancer/fear_and_greed_oracle_abci/0.1.0": "bafybeigkxsjyti4lva6nnlorbzgs5noe573v2ce2vjj5wifztnzu4vsiom",
"skill/balancer/pool_manager_abci/0.1.0": "bafybeidxy3av4i2oqplf7wjy5xxntufryqvvp6ackfu4i7qr6lpwekzifi",
"skill/valory/registration_abci/0.1.0": "bafybeie7lxe5spcitc7pwfilapsu5wlictp4ibz7gbko5yg3nx6llcjisu",
"skill/valory/reset_pause_abci/0.1.0": "bafybeiamkbck2c35uc6h7c6sotmsobr7h6tc2vzskoxztlu7o6af6mcacm",
"skill/valory/safe_deployment_abci/0.1.0": "bafybeifgljjbc2x42xcynmirchrno7iwwq6ufnhpqr37ypeoqstfnjujli"
Expand Down
54 changes: 27 additions & 27 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ deps =
hypothesis==6.21.6
py-eth-sig-utils==0.4.0
aiohttp==3.7.4.post0
open-autonomy==0.3.0
open-aea[all]==1.19.0
open-aea-ledger-ethereum==1.19.0
open-aea-ledger-cosmos==1.19.0
open-aea-cli-ipfs==1.19.0
open-aea-test-autonomy==0.3.0
open-autonomy==0.3.1
open-aea[all]==1.20.0
open-aea-ledger-ethereum==1.20.0
open-aea-ledger-cosmos==1.20.0
open-aea-cli-ipfs==1.20.0
open-aea-test-autonomy==0.3.1
grpcio==1.43.0
pandas==1.3.5
setuptools==60.10.0
Expand Down Expand Up @@ -98,7 +98,7 @@ skip_install = True
deps =
black==21.6b0
click==8.0.4
commands = black --check packages scripts tests
commands = black --check packages/balancer scripts tests

[testenv:isort]
skipsdist = True
Expand All @@ -114,7 +114,7 @@ skipsdist = True
skip_install = True
deps = isort==5.9.3
commands =
isort --check-only packages/
isort --check-only packages/balancer
isort --check-only scripts/
isort --check-only tests/

Expand All @@ -134,17 +134,17 @@ commands = {toxinidir}/scripts/check_copyright.py --check
skipsdist = True
skip_install = True
deps =
open-aea-cli-ipfs==1.19.0
open-autonomy==0.3.0
open-aea==1.19.0
open-aea-cli-ipfs==1.20.0
open-autonomy==0.3.1
open-aea==1.20.0
commands = python -m autonomy.cli packages lock --check {posargs}

[testenv:check-packages]
skipsdist = True
skip_install = True
deps =
open-autonomy==0.3.0
open-aea==1.19.0
open-autonomy==0.3.1
open-aea==1.20.0
commands = {toxinidir}/scripts/check_packages.py

[testenv:flake8]
Expand All @@ -169,11 +169,11 @@ deps =
types-requests
types-jsonschema
types-setuptools
open-autonomy==0.3.0
open-aea==1.19.0
open-aea-ledger-ethereum==1.19.0
open-aea-cli-ipfs==1.19.0
open-aea-test-autonomy==0.3.0
open-autonomy==0.3.1
open-aea==1.20.0
open-aea-ledger-ethereum==1.20.0
open-aea-cli-ipfs==1.20.0
open-aea-test-autonomy==0.3.1
pandas==1.3.5
commands = autonomy init --reset --author CI --remote --ipfs --ipfs-node "/dns/registry.autonolas.tech/tcp/443/https"
autonomy packages sync
Expand All @@ -191,10 +191,10 @@ deps =
aiohttp==3.7.4.post0
multidict==5.2.0
certifi==2021.10.8
open-autonomy==0.3.0
open-aea==1.19.0
open-aea-ledger-ethereum==1.19.0
open-aea-cli-ipfs==1.19.0
open-autonomy==0.3.1
open-aea==1.20.0
open-aea-ledger-ethereum==1.20.0
open-aea-cli-ipfs==1.20.0
grpcio==1.43.0
pandas==1.3.5
commands = pylint packages/balancer scripts
Expand All @@ -220,7 +220,7 @@ deps =
ipfshttpclient==0.8.0a2
black==21.6b0
isort==5.9.3
open-aea[all]==1.19.0
open-aea[all]==1.20.0
commands = aea generate-all-protocols --check-clean

[testenv:abci-docstrings]
Expand All @@ -229,16 +229,16 @@ usedevelop = True
deps =
grpcio==1.43.0
py-eth-sig-utils==0.4.0
open-aea==1.19.0
open-aea-ledger-ethereum==1.19.0
open-autonomy==0.3.0
open-aea==1.20.0
open-aea-ledger-ethereum==1.20.0
open-autonomy==0.3.1
commands = autonomy analyse abci docstrings

[testenv:check-abciapp-specs]
skipsdist = True
usedevelop = True
deps =
open-autonomy==0.3.0
open-autonomy==0.3.1
grpcio==1.43.0
py-eth-sig-utils==0.4.0
commands = autonomy init --reset --author CI --remote --ipfs --ipfs-node "/dns/registry.autonolas.tech/tcp/443/https"
Expand Down