Merge pull request #736 from kongzii/peter/relax

Relax dependencies versions
valory-xyz · Apr 26, 2024 · 79f0714 · 79f0714
2 parents 614dd04 + 20f91aa
commit 79f0714
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 13 deletions.
diff --git 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/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/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

diff --git 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/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");
@@ -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/plugins/aea-ledger-cosmos/setup.py b/plugins/aea-ledger-cosmos/setup.py
@@ -41,7 +41,7 @@
     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",
     ],

diff --git 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",

diff --git 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
@@ -31,8 +31,8 @@
 
 def get_all_extras() -> Dict:
     cli_deps = [
-        "click==8.0.2",
-        "pyyaml==6.0.1",
+        "click>=8.1.0,<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",
@@ -59,8 +59,8 @@ def get_all_extras() -> Dict:
     "packaging>=23.1,<24.0",
     "protobuf<4.25.0,>=4.21.6",
     "pymultihash==0.8.2",
-    "pyyaml==6.0.1",
-    "requests==2.28.1",
+    "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",

diff --git 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");
@@ -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])