From 3434777c6a53837a24781928c59cd945a4b7077a Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Fri, 26 Apr 2024 10:30:57 +0200 Subject: [PATCH 01/11] Relax deps --- plugins/aea-test-autonomy/setup.py | 4 ++-- setup.py | 20 +++++++++----------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/plugins/aea-test-autonomy/setup.py b/plugins/aea-test-autonomy/setup.py index d52a0a68d7..66854415e1 100644 --- a/plugins/aea-test-autonomy/setup.py +++ b/plugins/aea-test-autonomy/setup.py @@ -25,9 +25,9 @@ base_deps = [ "open-aea[all]>=1.51.0,<2.0.0", - "pytest==7.2.1", + "pytest>=7.2.1,<8", "open-aea-ledger-ethereum>=1.51.0,<2.0.0", - "docker==6.1.2", + "docker>=6.1.2,<7", ] setup( diff --git a/setup.py b/setup.py index 77ad3c714a..bc2c7d5d93 100644 --- a/setup.py +++ b/setup.py @@ -31,9 +31,9 @@ def get_all_extras() -> Dict: cli_deps = [ - "click==8.0.2", - "open-aea-cli-ipfs==1.51.0", - "texttable==1.6.7", + "click>=8.0.2,<9", + "open-aea-cli-ipfs>=1.51.0,<2", + "texttable>=1.6.7,<2", "python-dotenv>=0.14.5,<0.22.0", "pytest>=7.0.0,<7.3.0", "coverage>=6.4.4,<8.0.0", @@ -53,17 +53,17 @@ def get_all_extras() -> Dict: base_deps = [ "Flask>=2.0.2,<3.0.0", - "open-aea[all]==1.51.0", + "open-aea[all]>=1.51.0,<2", "watchdog>=2.1.6", - "pytest==7.2.1", + "pytest>=7.2.1,<8", "valory-docker-compose==1.29.3", - "werkzeug==2.0.3", - "docker==6.1.2", + "werkzeug>=2.0.3,<3", + "docker>=6.1.2,<2", "hexbytes", "jsonschema<4.4.0,>=4.3.0", "protobuf<4.25.0,>=4.21.6", - "gql==3.5.0", - "requests-toolbelt==1.0.0", # Required for graphql client + "gql>=3.5.0,<4", + "requests-toolbelt>=1.0.0,<2", # Required for graphql client "aiohttp<4.0.0,>=3.8.5", "typing_extensions>=3.10.0.2", ] @@ -153,5 +153,3 @@ def parse_readme(): "Source": "https://github.com/valory/open-autonomy", }, ) - - From 879bab8d044e82299bc1e093028cb208b2a6f7a5 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Fri, 26 Apr 2024 11:42:02 +0200 Subject: [PATCH 02/11] fix dep --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index bc2c7d5d93..d5c6163cab 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,7 @@ def get_all_extras() -> Dict: "pytest>=7.2.1,<8", "valory-docker-compose==1.29.3", "werkzeug>=2.0.3,<3", - "docker>=6.1.2,<2", + "docker>=6.1.2,<7", "hexbytes", "jsonschema<4.4.0,>=4.3.0", "protobuf<4.25.0,>=4.21.6", From 59fa8676b266e00a5b30f44eba7ef57d7c42b78d Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Fri, 26 Apr 2024 11:45:10 +0200 Subject: [PATCH 03/11] bump ver --- autonomy/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autonomy/__version__.py b/autonomy/__version__.py index 05211eb00e..2e7c90a2a7 100644 --- a/autonomy/__version__.py +++ b/autonomy/__version__.py @@ -22,7 +22,7 @@ __title__ = "open-autonomy" __description__ = "A framework for the creation of autonomous agent services." __url__ = "https://github.com/valory-xyz/open-autonomy.git" -__version__ = "0.14.11.post1" +__version__ = "0.14.12.post1" __author__ = "Valory AG" __license__ = "Apache-2.0" __copyright__ = "2021-2022 Valory AG" From d0c00a12512c10eee37d75dc0f15b0a927b1a118 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Fri, 26 Apr 2024 12:23:22 +0200 Subject: [PATCH 04/11] try to bump versions --- docs/upgrading.md | 4 ++++ plugins/aea-test-autonomy/aea_test_autonomy/configurations.py | 2 +- plugins/aea-test-autonomy/setup.py | 2 +- tests/test_base.py | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/upgrading.md b/docs/upgrading.md index 42a19a4007..c7453ac997 100644 --- a/docs/upgrading.md +++ b/docs/upgrading.md @@ -5,6 +5,10 @@ Below we describe the additional manual steps required to upgrade between differ # Open Autonomy +## `v0.14.11.post1` to `v0.14.12.post1` + +No backwards incompatible changes + ## `v0.14.11` to `v0.14.11.post1` No backwards incompatible changes diff --git a/plugins/aea-test-autonomy/aea_test_autonomy/configurations.py b/plugins/aea-test-autonomy/aea_test_autonomy/configurations.py index 33af4a9eae..411ed0df76 100644 --- a/plugins/aea-test-autonomy/aea_test_autonomy/configurations.py +++ b/plugins/aea-test-autonomy/aea_test_autonomy/configurations.py @@ -37,7 +37,7 @@ def get_key(key_path: Path) -> str: HTTP_LOCALHOST = f"http://{LOCALHOST}" DEFAULT_IMAGE_VERSION = "latest" -MATCHING_FRAMEWORK_VERSION = "0.14.11.post1" +MATCHING_FRAMEWORK_VERSION = "0.14.12.post1" TENDERMINT_IMAGE_VERSION = os.environ.get( "TENDERMINT_IMAGE_VERSION", MATCHING_FRAMEWORK_VERSION ) diff --git a/plugins/aea-test-autonomy/setup.py b/plugins/aea-test-autonomy/setup.py index 66854415e1..676e761a5d 100644 --- a/plugins/aea-test-autonomy/setup.py +++ b/plugins/aea-test-autonomy/setup.py @@ -32,7 +32,7 @@ setup( name="open-aea-test-autonomy", - version="0.14.11.post1", + version="0.14.12.post1", author="Valory AG", license="Apache-2.0", description="Plugin containing test tools for open-autonomy packages.", diff --git a/tests/test_base.py b/tests/test_base.py index cf0bcfc26b..09238a78dd 100644 --- a/tests/test_base.py +++ b/tests/test_base.py @@ -62,7 +62,7 @@ def get_test_files(package_type: PackageType) -> List[Path]: def test_version() -> None: """Test the version.""" - assert autonomy.__version__ == "0.14.11.post1" + assert autonomy.__version__ == "0.14.12.post1" @pytest.mark.parametrize( From 6c297317b025e76bef3b0469bfd78add00080a50 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Fri, 26 Apr 2024 12:24:21 +0200 Subject: [PATCH 05/11] try no limit on docker --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d5c6163cab..34cf65c535 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,7 @@ def get_all_extras() -> Dict: "pytest>=7.2.1,<8", "valory-docker-compose==1.29.3", "werkzeug>=2.0.3,<3", - "docker>=6.1.2,<7", + "docker>=6.1.2", "hexbytes", "jsonschema<4.4.0,>=4.3.0", "protobuf<4.25.0,>=4.21.6", From cd11d71ca18d7bbf773a7d1abe4cf773f21e9e02 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Fri, 26 Apr 2024 12:25:46 +0200 Subject: [PATCH 06/11] aaa --- plugins/aea-test-autonomy/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/aea-test-autonomy/setup.py b/plugins/aea-test-autonomy/setup.py index 676e761a5d..c999b81eab 100644 --- a/plugins/aea-test-autonomy/setup.py +++ b/plugins/aea-test-autonomy/setup.py @@ -27,7 +27,7 @@ "open-aea[all]>=1.51.0,<2.0.0", "pytest>=7.2.1,<8", "open-aea-ledger-ethereum>=1.51.0,<2.0.0", - "docker>=6.1.2,<7", + "docker>=6.1.2", ] setup( From b86a7f1ff938e71d6cb3c73349c64b9049a2dbba Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Fri, 26 Apr 2024 15:32:55 +0200 Subject: [PATCH 07/11] try to comment out docker --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 34cf65c535..2025f5364f 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,7 @@ def get_all_extras() -> Dict: "pytest>=7.2.1,<8", "valory-docker-compose==1.29.3", "werkzeug>=2.0.3,<3", - "docker>=6.1.2", + # "docker>=6.1.2", "hexbytes", "jsonschema<4.4.0,>=4.3.0", "protobuf<4.25.0,>=4.21.6", From 788ae0856547e847d4778ee2c74dbf9ffa22a564 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Fri, 26 Apr 2024 15:40:23 +0200 Subject: [PATCH 08/11] fix build-backend --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4618ca7559..9787c3bdf0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,3 @@ [build-system] requires = ["setuptools", "wheel"] -build_backend = "setuptools.build_meta" +build-backend = "setuptools.build_meta" From 13344d6551222224492024623cd10aa79ad1a13e Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Fri, 26 Apr 2024 15:42:08 +0200 Subject: [PATCH 09/11] add back docker --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2025f5364f..34cf65c535 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,7 @@ def get_all_extras() -> Dict: "pytest>=7.2.1,<8", "valory-docker-compose==1.29.3", "werkzeug>=2.0.3,<3", - # "docker>=6.1.2", + "docker>=6.1.2", "hexbytes", "jsonschema<4.4.0,>=4.3.0", "protobuf<4.25.0,>=4.21.6", From d62e71c024b79d33ef768eb147ad3696675cf465 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Tue, 16 Jul 2024 14:19:24 +0200 Subject: [PATCH 10/11] just noticed the docker --- plugins/aea-test-autonomy/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/aea-test-autonomy/setup.py b/plugins/aea-test-autonomy/setup.py index bb244f8b4d..b5ad6d6339 100644 --- a/plugins/aea-test-autonomy/setup.py +++ b/plugins/aea-test-autonomy/setup.py @@ -27,7 +27,7 @@ "open-aea[all]>=1.53.0,<2.0.0", "pytest>=7.2.1,<8", "open-aea-ledger-ethereum>=1.53.0,<2.0.0", - "docker>=6.1.2", + "docker>=6.1.2,<7", ] setup( From f377efeac65d6d6c79b2c9893596ad7991197581 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Tue, 16 Jul 2024 15:20:11 +0200 Subject: [PATCH 11/11] fix docker --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4335766336..d9bb770448 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,7 @@ def get_all_extras() -> Dict: "pytest>=7.2.1,<8", "valory-docker-compose==1.29.3", "werkzeug>=2.0.3,<3", - "docker>=6.1.2", + "docker>=6.1.2,<7", "hexbytes", "jsonschema<4.4.0,>=4.3.0", "protobuf<4.25.0,>=4.21.6",