From 53e2854fd1518df7176e1cc65cf25bbc15772f3e Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Thu, 18 Apr 2024 09:18:39 +0200 Subject: [PATCH 01/13] Relax dependency versioning --- setup.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index 32d864d9f1..f47d79a134 100644 --- a/setup.py +++ b/setup.py @@ -31,18 +31,20 @@ def get_all_extras() -> Dict: cli_deps = [ - "click==8.0.2", - "pyyaml==6.0.1", + "click>=8.0.2,<9", + "pyyaml>=6.0.1,<9", "packaging>=23.1,<24.0", - "pytest>=7.0.0,<7.3.0", "coverage>=6.4.4,<8.0.0", "jsonschema<4.4.0,>=4.3.0", "semver>=2.9.1,<3.0.0", ] + test_deps = [ + "pytest>=7.0.0,<8", + ] extras = { "cli": cli_deps, - "test_tools": cli_deps, + "test_tools": test_deps, } # add "all" extras @@ -58,9 +60,9 @@ def get_all_extras() -> Dict: "jsonschema<4.4.0,>=4.3.0", "packaging>=23.1,<24.0", "protobuf<4.25.0,>=4.21.6", - "pymultihash==0.8.2", - "pyyaml==6.0.1", - "requests==2.28.1", + "pymultihash>=0.8.2", + "pyyaml>=6.0.1,<7", + "requests>=2.28.1,<3", "python-dotenv>=0.14.0,<0.22.0", "ecdsa>=0.15,<0.17.0", "morphys>=1.0", From 5dac1f0d78174aad1a81e6f9ff1ff8c80729d5f0 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Thu, 18 Apr 2024 09:39:58 +0200 Subject: [PATCH 02/13] add notes --- HISTORY.md | 5 +++++ docs/upgrading.md | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/HISTORY.md b/HISTORY.md index 6eb45e77e6..207e865151 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,10 @@ # Release History - open AEA +## 1.52.0 (2024-04-18) + +AEA: +- Relax dependencies + ## 1.51.0 (2024-04-10) AEA: diff --git a/docs/upgrading.md b/docs/upgrading.md index 78696ab9ed..18c7847dc2 100644 --- a/docs/upgrading.md +++ b/docs/upgrading.md @@ -9,6 +9,10 @@ Below we describe the additional manual steps required to upgrade between differ ### Upgrade guide +## `v1.51.0` to `v1.52.0` + +- No backwards incompatible changes + ## `v1.50.0` to `v1.51.0` - No backwards incompatible changes From 031204d6812a375e264f06045e55de214782d3ed Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Thu, 18 Apr 2024 09:50:19 +0200 Subject: [PATCH 03/13] relax plugins as well --- plugins/aea-cli-benchmark/setup.py | 2 +- plugins/aea-cli-ipfs/setup.py | 2 ++ plugins/aea-ledger-cosmos/setup.py | 4 ++-- plugins/aea-ledger-ethereum-flashbots/setup.py | 4 ++-- plugins/aea-ledger-ethereum-hwi/setup.py | 4 ++-- plugins/aea-ledger-fetchai/setup.py | 2 +- plugins/aea-ledger-solana/setup.py | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/plugins/aea-cli-benchmark/setup.py b/plugins/aea-cli-benchmark/setup.py index 4ead526f36..1f14810b7a 100755 --- a/plugins/aea-cli-benchmark/setup.py +++ b/plugins/aea-cli-benchmark/setup.py @@ -37,7 +37,7 @@ ), package_data={"aea_cli_benchmark": ["py.typed"]}, entry_points={"aea.cli": ["benchmark = aea_cli_benchmark.core:benchmark"]}, - install_requires=["open-aea>=1.0.0, <2.0.0", "psutil==5.7.0"], + install_requires=["open-aea>=1.0.0, <2.0.0", "psutil>=5.7.0, <6.0.0"], classifiers=[ "Environment :: Console", "Environment :: Web Environment", diff --git a/plugins/aea-cli-ipfs/setup.py b/plugins/aea-cli-ipfs/setup.py index 728d069dd9..c2129c70c6 100755 --- a/plugins/aea-cli-ipfs/setup.py +++ b/plugins/aea-cli-ipfs/setup.py @@ -40,6 +40,8 @@ install_requires=[ "open-aea>=1.0.0, <2.0.0", "ipfshttpclient>=0.8.0a2", + ], + tests_require=[ "pytest>=7.0.0,<7.3.0", ], classifiers=[ diff --git a/plugins/aea-ledger-cosmos/setup.py b/plugins/aea-ledger-cosmos/setup.py index 7475a60615..e122d0dba9 100644 --- a/plugins/aea-ledger-cosmos/setup.py +++ b/plugins/aea-ledger-cosmos/setup.py @@ -41,9 +41,9 @@ install_requires=[ "open-aea>=1.0.0, <2.0.0", "ecdsa>=0.15,<0.17.0", - "bech32==1.2.0", + "bech32>=1.2.0,<2", "pycryptodome>=3.10.1,<4.0.0", - "cosmpy==0.9.2", + "cosmpy>0.9.2,<1", ], tests_require=["pytest"], entry_points={ diff --git a/plugins/aea-ledger-ethereum-flashbots/setup.py b/plugins/aea-ledger-ethereum-flashbots/setup.py index 36f648eafe..3b2d51d576 100644 --- a/plugins/aea-ledger-ethereum-flashbots/setup.py +++ b/plugins/aea-ledger-ethereum-flashbots/setup.py @@ -41,8 +41,8 @@ }, python_requires=">=3.9,<4.0", install_requires=[ - "open-aea-ledger-ethereum~=1.51.0", - "open-aea-flashbots==1.4.0", + "open-aea-ledger-ethereum>=1.51.0,<2", + "open-aea-flashbots>=1.4.0,<2", ], tests_require=["pytest"], entry_points={ diff --git a/plugins/aea-ledger-ethereum-hwi/setup.py b/plugins/aea-ledger-ethereum-hwi/setup.py index e295ff12ed..ba4ffd19a0 100644 --- a/plugins/aea-ledger-ethereum-hwi/setup.py +++ b/plugins/aea-ledger-ethereum-hwi/setup.py @@ -42,8 +42,8 @@ "web3>=6.0.0,<7", "ipfshttpclient==0.8.0a2", "eth-account>=0.8.0,<0.9.0", - "open-aea-ledger-ethereum~=1.51.0", - "ledgerwallet==0.1.3", + "open-aea-ledger-ethereum>=1.51.0,<2", + "ledgerwallet~=0.1.3", "protobuf<4.25.0,>=4.21.6", "construct<=2.10.61", ], diff --git a/plugins/aea-ledger-fetchai/setup.py b/plugins/aea-ledger-fetchai/setup.py index b84d15b424..ffd4e4dd72 100644 --- a/plugins/aea-ledger-fetchai/setup.py +++ b/plugins/aea-ledger-fetchai/setup.py @@ -44,7 +44,7 @@ "test_tools/data/*", ] }, - install_requires=["open-aea-ledger-cosmos~=1.51.0"], + install_requires=["open-aea-ledger-cosmos>=1.51.0,<2"], tests_require=["pytest"], entry_points={ "aea.cryptos": ["fetchai = aea_ledger_fetchai:FetchAICrypto"], diff --git a/plugins/aea-ledger-solana/setup.py b/plugins/aea-ledger-solana/setup.py index a94a9b774f..80427db9a0 100644 --- a/plugins/aea-ledger-solana/setup.py +++ b/plugins/aea-ledger-solana/setup.py @@ -36,7 +36,7 @@ install_requires=[ "open-aea>=1.0.0, <2.0.0", "cryptography", - "PyNaCl==1.5.0", + "PyNaCl>=1.5.0,<2", "solders>=0.14.0", "solana>=0.29.0", "anchorpy>=0.17.0,<0.19.0", From 1a63b24f9ae64b065a8a6c4d8d5f621f0d47ec71 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Wed, 24 Apr 2024 09:12:33 +0200 Subject: [PATCH 04/13] fix cosmpy --- plugins/aea-ledger-cosmos/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/aea-ledger-cosmos/setup.py b/plugins/aea-ledger-cosmos/setup.py index e122d0dba9..44f69e225e 100644 --- a/plugins/aea-ledger-cosmos/setup.py +++ b/plugins/aea-ledger-cosmos/setup.py @@ -43,7 +43,7 @@ "ecdsa>=0.15,<0.17.0", "bech32>=1.2.0,<2", "pycryptodome>=3.10.1,<4.0.0", - "cosmpy>0.9.2,<1", + "cosmpy==0.9.2", ], tests_require=["pytest"], entry_points={ From f8b680f9fcb49ec93296219ef2916f57a08fdc7a Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Wed, 24 Apr 2024 09:14:12 +0200 Subject: [PATCH 05/13] fix ledgerwallet --- plugins/aea-ledger-ethereum-hwi/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/aea-ledger-ethereum-hwi/setup.py b/plugins/aea-ledger-ethereum-hwi/setup.py index ba4ffd19a0..8ead1d25a7 100644 --- a/plugins/aea-ledger-ethereum-hwi/setup.py +++ b/plugins/aea-ledger-ethereum-hwi/setup.py @@ -43,7 +43,7 @@ "ipfshttpclient==0.8.0a2", "eth-account>=0.8.0,<0.9.0", "open-aea-ledger-ethereum>=1.51.0,<2", - "ledgerwallet~=0.1.3", + "ledgerwallet==0.1.3", "protobuf<4.25.0,>=4.21.6", "construct<=2.10.61", ], From fabfb6f82133e67a39b38cbfbd57521fe7dbe450 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Wed, 24 Apr 2024 09:16:05 +0200 Subject: [PATCH 06/13] fix back --- plugins/aea-ledger-ethereum-flashbots/setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/aea-ledger-ethereum-flashbots/setup.py b/plugins/aea-ledger-ethereum-flashbots/setup.py index 3b2d51d576..36f648eafe 100644 --- a/plugins/aea-ledger-ethereum-flashbots/setup.py +++ b/plugins/aea-ledger-ethereum-flashbots/setup.py @@ -41,8 +41,8 @@ }, python_requires=">=3.9,<4.0", install_requires=[ - "open-aea-ledger-ethereum>=1.51.0,<2", - "open-aea-flashbots>=1.4.0,<2", + "open-aea-ledger-ethereum~=1.51.0", + "open-aea-flashbots==1.4.0", ], tests_require=["pytest"], entry_points={ From 8bceb07d5c255a1df696fc0a662661449c2fe76d Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Wed, 24 Apr 2024 09:16:37 +0200 Subject: [PATCH 07/13] fix back --- plugins/aea-ledger-ethereum-hwi/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/aea-ledger-ethereum-hwi/setup.py b/plugins/aea-ledger-ethereum-hwi/setup.py index 8ead1d25a7..e295ff12ed 100644 --- a/plugins/aea-ledger-ethereum-hwi/setup.py +++ b/plugins/aea-ledger-ethereum-hwi/setup.py @@ -42,7 +42,7 @@ "web3>=6.0.0,<7", "ipfshttpclient==0.8.0a2", "eth-account>=0.8.0,<0.9.0", - "open-aea-ledger-ethereum>=1.51.0,<2", + "open-aea-ledger-ethereum~=1.51.0", "ledgerwallet==0.1.3", "protobuf<4.25.0,>=4.21.6", "construct<=2.10.61", From b3df02dcd22ccb0a1a06a8742f2e2b12f554e5ac Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Wed, 24 Apr 2024 09:17:11 +0200 Subject: [PATCH 08/13] fix --- plugins/aea-ledger-fetchai/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/aea-ledger-fetchai/setup.py b/plugins/aea-ledger-fetchai/setup.py index ffd4e4dd72..b84d15b424 100644 --- a/plugins/aea-ledger-fetchai/setup.py +++ b/plugins/aea-ledger-fetchai/setup.py @@ -44,7 +44,7 @@ "test_tools/data/*", ] }, - install_requires=["open-aea-ledger-cosmos>=1.51.0,<2"], + install_requires=["open-aea-ledger-cosmos~=1.51.0"], tests_require=["pytest"], entry_points={ "aea.cryptos": ["fetchai = aea_ledger_fetchai:FetchAICrypto"], From 55017ad5bd387dd53090ce8f182cec6cc58764ce Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Wed, 24 Apr 2024 09:36:23 +0200 Subject: [PATCH 09/13] revert pytest changes --- plugins/aea-cli-ipfs/setup.py | 2 -- setup.py | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/plugins/aea-cli-ipfs/setup.py b/plugins/aea-cli-ipfs/setup.py index c2129c70c6..728d069dd9 100755 --- a/plugins/aea-cli-ipfs/setup.py +++ b/plugins/aea-cli-ipfs/setup.py @@ -40,8 +40,6 @@ install_requires=[ "open-aea>=1.0.0, <2.0.0", "ipfshttpclient>=0.8.0a2", - ], - tests_require=[ "pytest>=7.0.0,<7.3.0", ], classifiers=[ diff --git a/setup.py b/setup.py index f47d79a134..aa08115e5b 100644 --- a/setup.py +++ b/setup.py @@ -34,17 +34,15 @@ def get_all_extras() -> Dict: "click>=8.0.2,<9", "pyyaml>=6.0.1,<9", "packaging>=23.1,<24.0", + "pytest>=7.0.0,<7.3.0", "coverage>=6.4.4,<8.0.0", "jsonschema<4.4.0,>=4.3.0", "semver>=2.9.1,<3.0.0", ] - test_deps = [ - "pytest>=7.0.0,<8", - ] extras = { "cli": cli_deps, - "test_tools": test_deps, + "test_tools": cli_deps, } # add "all" extras From 4753a618d60c156b7abc5f775f520accd59f7a85 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Wed, 24 Apr 2024 09:37:22 +0200 Subject: [PATCH 10/13] fix version of pymultihash --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index aa08115e5b..0fafd9849e 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,7 @@ def get_all_extras() -> Dict: "jsonschema<4.4.0,>=4.3.0", "packaging>=23.1,<24.0", "protobuf<4.25.0,>=4.21.6", - "pymultihash>=0.8.2", + "pymultihash==0.8.2", "pyyaml>=6.0.1,<7", "requests>=2.28.1,<3", "python-dotenv>=0.14.0,<0.22.0", From 90e14d6b9dc12c2544064180b814806ae620da6f Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Thu, 25 Apr 2024 08:57:16 +0200 Subject: [PATCH 11/13] Hopefully fix click --- docs/api/plugins/aea_cli_ipfs/core.md | 2 +- plugins/aea-cli-ipfs/aea_cli_ipfs/core.py | 2 +- pytest.ini | 1 - setup.py | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/api/plugins/aea_cli_ipfs/core.md b/docs/api/plugins/aea_cli_ipfs/core.md index 85d8f36360..441ee0d915 100644 --- a/docs/api/plugins/aea_cli_ipfs/core.md +++ b/docs/api/plugins/aea_cli_ipfs/core.md @@ -21,7 +21,7 @@ IPFS Commands #### process`_`result ```python -@ipfs.resultcallback() +@ipfs.result_callback() @click.pass_context def process_result(click_context: click.Context, *_: Any, **__: Any) -> None ``` diff --git a/plugins/aea-cli-ipfs/aea_cli_ipfs/core.py b/plugins/aea-cli-ipfs/aea_cli_ipfs/core.py index f3845b73bd..62ecd32cd0 100644 --- a/plugins/aea-cli-ipfs/aea_cli_ipfs/core.py +++ b/plugins/aea-cli-ipfs/aea_cli_ipfs/core.py @@ -51,7 +51,7 @@ def ipfs(click_context: click.Context) -> None: ipfs_tool.daemon.start() -@ipfs.resultcallback() +@ipfs.result_callback() @click.pass_context def process_result(click_context: click.Context, *_: Any, **__: Any) -> None: """Tear down command group.""" diff --git a/pytest.ini b/pytest.ini index 30fe83cd65..68ef4864f1 100644 --- a/pytest.ini +++ b/pytest.ini @@ -20,6 +20,5 @@ filterwarnings = ignore:Call to deprecated create function EnumValueDescriptor(). ignore:Call to deprecated create function EnumDescriptor(). ignore:The 'asyncio_mode' default value will change to 'strict' in future, please explicitly use 'asyncio_mode=strict' or 'asyncio_mode=auto' in pytest configuration file. - ignore:'resultcallback' has been renamed to 'result_callback'. The old name will be removed in Click 8.1. ignore:There is no current event loop ignore::DeprecationWarning diff --git a/setup.py b/setup.py index 0fafd9849e..b5c9dc8647 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ def get_all_extras() -> Dict: cli_deps = [ - "click>=8.0.2,<9", + "click>=8.1.0,<9", "pyyaml>=6.0.1,<9", "packaging>=23.1,<24.0", "pytest>=7.0.0,<7.3.0", From a6e5b939ed8bc9ce4261b206207014d42bf3adba Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Thu, 25 Apr 2024 11:55:50 +0200 Subject: [PATCH 12/13] Fix click version --- tests/test_test_tools/test_click_testing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_test_tools/test_click_testing.py b/tests/test_test_tools/test_click_testing.py index 1961ec36c7..4ddc27a801 100644 --- a/tests/test_test_tools/test_click_testing.py +++ b/tests/test_test_tools/test_click_testing.py @@ -105,7 +105,7 @@ def test_click_version(): When this tests fails you need to ensure that the current versions implementation of the click.testing.CliRunner remains compatible with our monkey-patched version """ - assert click.__version__ == "8.0.2", message + assert click.__version__ == "8.1.7", message @pytest.mark.parametrize("mix_stderr", [True, False]) From 55ff0af0213676077b485cd63e8de2ae373bc248 Mon Sep 17 00:00:00 2001 From: evangriffiths Date: Thu, 25 Apr 2024 16:11:40 +0100 Subject: [PATCH 13/13] Run scripts/check_copyright_notice.py --- plugins/aea-cli-ipfs/aea_cli_ipfs/core.py | 2 +- tests/test_test_tools/test_click_testing.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/aea-cli-ipfs/aea_cli_ipfs/core.py b/plugins/aea-cli-ipfs/aea_cli_ipfs/core.py index 62ecd32cd0..d54d21b7cf 100644 --- a/plugins/aea-cli-ipfs/aea_cli_ipfs/core.py +++ b/plugins/aea-cli-ipfs/aea_cli_ipfs/core.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2021-2022 Valory AG +# Copyright 2021-2024 Valory AG # Copyright 2018-2020 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/test_test_tools/test_click_testing.py b/tests/test_test_tools/test_click_testing.py index 4ddc27a801..fb7c1594a2 100644 --- a/tests/test_test_tools/test_click_testing.py +++ b/tests/test_test_tools/test_click_testing.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2022-2023 Valory AG +# Copyright 2022-2024 Valory AG # Copyright 2018-2020 Fetch.AI Limited # # Licensed under the Apache License, Version 2.0 (the "License");