From 6786f780c222b94d44f20615b1d0dd7dbfa74f89 Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Fri, 26 Apr 2024 15:37:47 +0530 Subject: [PATCH 1/4] feat: bump open-aea to v1.52.0 --- aea/__version__.py | 2 +- deploy-image/Dockerfile | 2 +- deploy-image/README.md | 2 +- develop-image/docker-env.sh | 2 +- examples/tac_deploy/Dockerfile | 2 +- plugins/aea-cli-benchmark/setup.py | 2 +- plugins/aea-cli-ipfs/setup.py | 2 +- plugins/aea-ledger-cosmos/setup.py | 2 +- plugins/aea-ledger-ethereum-flashbots/setup.py | 4 ++-- plugins/aea-ledger-ethereum-hwi/setup.py | 4 ++-- plugins/aea-ledger-ethereum/setup.py | 2 +- plugins/aea-ledger-fetchai/setup.py | 4 ++-- plugins/aea-ledger-solana/setup.py | 2 +- scripts/install.ps1 | 2 +- scripts/install.sh | 2 +- skaffold.yaml | 4 ++-- user-image/Dockerfile | 2 +- user-image/docker-env.sh | 2 +- 18 files changed, 22 insertions(+), 22 deletions(-) diff --git a/aea/__version__.py b/aea/__version__.py index 5e76a7b157..2448f19b39 100644 --- a/aea/__version__.py +++ b/aea/__version__.py @@ -23,7 +23,7 @@ __title__ = "open-aea" __description__ = "Open Autonomous Economic Agent framework (without vendor lock-in)" __url__ = "https://github.com/valory-xyz/open-aea.git" -__version__ = "1.51.0" +__version__ = "1.52.0" __author__ = "Valory AG" __license__ = "Apache-2.0" __copyright__ = "2021 Valory AG, 2019 Fetch.AI Limited" diff --git a/deploy-image/Dockerfile b/deploy-image/Dockerfile index 69a41b46f5..9a5bdd7b00 100644 --- a/deploy-image/Dockerfile +++ b/deploy-image/Dockerfile @@ -16,7 +16,7 @@ RUN apk add --no-cache go # aea installation RUN pip install --upgrade pip -RUN pip install --upgrade --force-reinstall open-aea[all]==1.51.0 "open-aea-cli-ipfs<2.0.0,>=1.51.0" +RUN pip install --upgrade --force-reinstall open-aea[all]==1.52.0 "open-aea-cli-ipfs<2.0.0,>=1.52.0" # directories and aea cli config WORKDIR /home/agents diff --git a/deploy-image/README.md b/deploy-image/README.md index 02a71f884c..1d84e01532 100644 --- a/deploy-image/README.md +++ b/deploy-image/README.md @@ -11,7 +11,7 @@ The example uses the `fetchai/my_first_aea` project. You will likely want to mod Install subversion, then download the example directory to your local working directory ``` bash -svn checkout https://github.com/valory-xyz/open-aea/tags/v1.51.0/packages packages +svn checkout https://github.com/valory-xyz/open-aea/tags/v1.52.0/packages packages ``` ### Modify scripts diff --git a/develop-image/docker-env.sh b/develop-image/docker-env.sh index 87fff4af2e..06b787f8a4 100755 --- a/develop-image/docker-env.sh +++ b/develop-image/docker-env.sh @@ -1,7 +1,7 @@ #!/bin/bash # Swap the following lines if you want to work with 'latest' -DOCKER_IMAGE_TAG=valory/open-aea-develop:1.51.0 +DOCKER_IMAGE_TAG=valory/open-aea-develop:1.52.0 # DOCKER_IMAGE_TAG=valory/open-aea-develop:latest DOCKER_BUILD_CONTEXT_DIR=.. diff --git a/examples/tac_deploy/Dockerfile b/examples/tac_deploy/Dockerfile index c246cba1fa..ef31da78cc 100644 --- a/examples/tac_deploy/Dockerfile +++ b/examples/tac_deploy/Dockerfile @@ -19,7 +19,7 @@ RUN apk add --no-cache go # aea installation RUN python -m pip install --upgrade pip -RUN pip install --upgrade --force-reinstall open-aea[all]==1.51.0 +RUN pip install --upgrade --force-reinstall open-aea[all]==1.52.0 # directories and aea cli config COPY /.aea /home/.aea diff --git a/plugins/aea-cli-benchmark/setup.py b/plugins/aea-cli-benchmark/setup.py index 1f14810b7a..19176dc4f9 100755 --- a/plugins/aea-cli-benchmark/setup.py +++ b/plugins/aea-cli-benchmark/setup.py @@ -26,7 +26,7 @@ setup( name="open-aea-cli-benchmark", - version="1.51.0", + version="1.52.0", author="Valory AG", license="Apache-2.0", description="CLI extension for AEA framework benchmarking.", diff --git a/plugins/aea-cli-ipfs/setup.py b/plugins/aea-cli-ipfs/setup.py index 728d069dd9..eaa4e842e1 100755 --- a/plugins/aea-cli-ipfs/setup.py +++ b/plugins/aea-cli-ipfs/setup.py @@ -28,7 +28,7 @@ setup( name="open-aea-cli-ipfs", - version="1.51.0", + version="1.52.0", author="Valory AG", license="Apache-2.0", description="CLI extension for open AEA framework wrapping IPFS functionality.", diff --git a/plugins/aea-ledger-cosmos/setup.py b/plugins/aea-ledger-cosmos/setup.py index 44f69e225e..151beea22b 100644 --- a/plugins/aea-ledger-cosmos/setup.py +++ b/plugins/aea-ledger-cosmos/setup.py @@ -26,7 +26,7 @@ setup( name="open-aea-ledger-cosmos", - version="1.51.0", + version="1.52.0", author="Valory AG", license="Apache-2.0", description="Python package wrapping the public and private key cryptography and ledger api of Cosmos.", diff --git a/plugins/aea-ledger-ethereum-flashbots/setup.py b/plugins/aea-ledger-ethereum-flashbots/setup.py index 36f648eafe..ca10892069 100644 --- a/plugins/aea-ledger-ethereum-flashbots/setup.py +++ b/plugins/aea-ledger-ethereum-flashbots/setup.py @@ -25,7 +25,7 @@ setup( name="open-aea-ledger-ethereum-flashbots", - version="1.51.0", + version="1.52.0", author="Valory AG", license="Apache-2.0", description="Python package extending the default open-aea ethereum ledger plugin to add support for flashbots.", @@ -41,7 +41,7 @@ }, python_requires=">=3.9,<4.0", install_requires=[ - "open-aea-ledger-ethereum~=1.51.0", + "open-aea-ledger-ethereum~=1.52.0", "open-aea-flashbots==1.4.0", ], tests_require=["pytest"], diff --git a/plugins/aea-ledger-ethereum-hwi/setup.py b/plugins/aea-ledger-ethereum-hwi/setup.py index e295ff12ed..f8f7f39372 100644 --- a/plugins/aea-ledger-ethereum-hwi/setup.py +++ b/plugins/aea-ledger-ethereum-hwi/setup.py @@ -25,7 +25,7 @@ setup( name="open-aea-ledger-ethereum-hwi", - version="1.51.0", + version="1.52.0", author="Valory AG", license="Apache-2.0", description="Python package wrapping the public and private key cryptography and support for hardware wallet interactions.", @@ -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", + "open-aea-ledger-ethereum~=1.52.0", "ledgerwallet==0.1.3", "protobuf<4.25.0,>=4.21.6", "construct<=2.10.61", diff --git a/plugins/aea-ledger-ethereum/setup.py b/plugins/aea-ledger-ethereum/setup.py index 099153128f..b4ed7e057c 100644 --- a/plugins/aea-ledger-ethereum/setup.py +++ b/plugins/aea-ledger-ethereum/setup.py @@ -26,7 +26,7 @@ setup( name="open-aea-ledger-ethereum", - version="1.51.0", + version="1.52.0", author="Valory AG", license="Apache-2.0", description="Python package wrapping the public and private key cryptography and ledger api of Ethereum.", diff --git a/plugins/aea-ledger-fetchai/setup.py b/plugins/aea-ledger-fetchai/setup.py index b84d15b424..87fa02b5eb 100644 --- a/plugins/aea-ledger-fetchai/setup.py +++ b/plugins/aea-ledger-fetchai/setup.py @@ -31,7 +31,7 @@ setup( name="open-aea-ledger-fetchai", - version="1.51.0", + version="1.52.0", author="Valory AG", license="Apache-2.0", description="Python package wrapping the public and private key cryptography and ledger API of Fetch.AI.", @@ -44,7 +44,7 @@ "test_tools/data/*", ] }, - install_requires=["open-aea-ledger-cosmos~=1.51.0"], + install_requires=["open-aea-ledger-cosmos~=1.52.0"], 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 80427db9a0..03bb8298a3 100644 --- a/plugins/aea-ledger-solana/setup.py +++ b/plugins/aea-ledger-solana/setup.py @@ -25,7 +25,7 @@ setup( name="open-aea-ledger-solana", - version="1.51.0", + version="1.52.0", author="dassy23", license="Apache-2.0", description="Python package wrapping the public and private key cryptography and ledger api of solana.", diff --git a/scripts/install.ps1 b/scripts/install.ps1 index 2a25246ce2..36164bfad9 100644 --- a/scripts/install.ps1 +++ b/scripts/install.ps1 @@ -34,7 +34,7 @@ function instal_choco_golang_gcc { } function install_aea { echo "Install aea" - $output=pip install open-aea[all]==1.51.0 --force --no-cache-dir 2>&1 |out-string; + $output=pip install open-aea[all]==1.52.0 --force --no-cache-dir 2>&1 |out-string; if ($LastExitCode -ne 0) { echo $output echo "AEA install failed!" diff --git a/scripts/install.sh b/scripts/install.sh index 383a4f8fe1..8f19260726 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -42,7 +42,7 @@ function is_python_version_ok() { function install_aea (){ echo "Install AEA" - output=$(pip3 install --user open-aea[all]==1.51.0 --force --no-cache-dir) + output=$(pip3 install --user open-aea[all]==1.52.0 --force --no-cache-dir) if [[ $? -ne 0 ]]; then echo "$output" diff --git a/skaffold.yaml b/skaffold.yaml index ae9068268a..621cfd4cb6 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -5,7 +5,7 @@ metadata: build: tagPolicy: envTemplate: - template: "1.51.0" + template: "1.52.0" artifacts: - image: valory/open-aea-develop docker: @@ -24,7 +24,7 @@ profiles: build: tagPolicy: envTemplate: - template: "1.51.0" + template: "1.52.0" artifacts: - image: valory/open-aea-docs docker: diff --git a/user-image/Dockerfile b/user-image/Dockerfile index 4c701e92ad..7472ae80e5 100644 --- a/user-image/Dockerfile +++ b/user-image/Dockerfile @@ -7,7 +7,7 @@ ENV LANG C.UTF-8 RUN apt update && apt install -y python3.11-dev python3-pip -y && apt autoremove && apt autoclean RUN pip3 install --upgrade pip -RUN pip3 install "open-aea[all]==1.51.0" open-aea-cli-ipfs==1.51.0 +RUN pip3 install "open-aea[all]==1.52.0" open-aea-cli-ipfs==1.52.0 COPY user-image/openssl.cnf /etc/ssl diff --git a/user-image/docker-env.sh b/user-image/docker-env.sh index 6bdc9f9d1f..568eb8fb59 100644 --- a/user-image/docker-env.sh +++ b/user-image/docker-env.sh @@ -1,7 +1,7 @@ #!/bin/bash # Swap the following lines if you want to work with 'latest' -DOCKER_IMAGE_TAG=valory/open-aea-user:1.51.0 +DOCKER_IMAGE_TAG=valory/open-aea-user:1.52.0 # DOCKER_IMAGE_TAG=valory/open-aea-user:latest DOCKER_BUILD_CONTEXT_DIR=.. From f5b3d7ebd2488655cdff85ad2a9eddb91554404e Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Fri, 26 Apr 2024 16:01:25 +0530 Subject: [PATCH 2/4] chore: release notes --- HISTORY.md | 14 ++++++++++++-- SECURITY.md | 4 ++-- docs/upgrading.md | 9 ++++++++- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 207e865151..dbaf5ea043 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,9 +1,19 @@ # Release History - open AEA -## 1.52.0 (2024-04-18) +## 1.52.0 (2024-04-26) AEA: -- Relax dependencies +- Loosens up the version range for several dependencies to allow better integration with other frameworks + +Plugins: +- Implements a custom filtering method to handle RPC timeouts. + +Packages: +- Adds `Celo` to ledger connection configurations + +Chore: +- Adds whitelist for component mint check + ## 1.51.0 (2024-04-10) diff --git a/SECURITY.md b/SECURITY.md index 834335db17..710e27cbf3 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -8,8 +8,8 @@ The following table shows which versions of `open-aea` are currently being suppo | Version | Supported | | --------- | ------------------ | -| `1.51.x` | :white_check_mark: | -| `< 1.51.0` | :x: | +| `1.52.x` | :white_check_mark: | +| `< 1.52.0` | :x: | ## Reporting a Vulnerability diff --git a/docs/upgrading.md b/docs/upgrading.md index 18c7847dc2..300b77c553 100644 --- a/docs/upgrading.md +++ b/docs/upgrading.md @@ -11,7 +11,14 @@ Below we describe the additional manual steps required to upgrade between differ ## `v1.51.0` to `v1.52.0` -- No backwards incompatible changes +This release contains updated version range for several dependencies so please update you environments with following dependency versions + +- `psutil>=5.7.0,<6.0.0` +- `bech32>=1.2.0,<2` +- `PyNaCl>=1.5.0,<2` +- `click>=8.1.0,<9` +- `pyyaml>=6.0.1,<9` +- `requests>=2.28.1,<3` ## `v1.50.0` to `v1.51.0` From 94ca9f753a05fd00a9142f0b7ccd47a8ca34b629 Mon Sep 17 00:00:00 2001 From: Viraj <35092918+angrybayblade@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:09:30 +0530 Subject: [PATCH 3/4] Update HISTORY.md Co-authored-by: Adamantios Zaras --- HISTORY.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index dbaf5ea043..249871b848 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -6,7 +6,7 @@ AEA: - Loosens up the version range for several dependencies to allow better integration with other frameworks Plugins: -- Implements a custom filtering method to handle RPC timeouts. +- Implements a custom filtering method to handle RPC timeouts and hanging. Packages: - Adds `Celo` to ledger connection configurations From 385f2dbd0ec779b584560c518b3f9da077f2c4d1 Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Mon, 29 Apr 2024 11:25:32 +0200 Subject: [PATCH 4/4] fix: use macOS amd64 image for CI --- .github/workflows/workflow.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index e80ad31cfd..909d8b6d37 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -240,7 +240,7 @@ jobs: continue-on-error: False strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, macos-12, windows-latest] python_version: ["3.10",] timeout-minutes: 10 runs-on: ${{ matrix.os }} @@ -271,7 +271,7 @@ jobs: sys: - { os: windows-latest, shell: "msys2 {0}" } - { os: ubuntu-latest, shell: bash } -# - { os: macos-latest, shell: bash } +# - { os: macos-12, shell: bash } python_version: ["3.10",] timeout-minutes: 15 steps: @@ -433,7 +433,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, macos-12, windows-latest] python_version: ['3.8', '3.9', '3.10', '3.11'] timeout-minutes: 120 steps: @@ -469,8 +469,8 @@ jobs: # sudo apt-get install -y protobuf-compiler # use sudo rm /var/lib/apt/lists/lock above in line above update if dependency install failures persist # use sudo apt-get dist-upgrade above in line below update if dependency install failures persist - - if: matrix.os == 'macos-latest' - name: Install dependencies (macos-latest) + - if: matrix.os == 'macos-12' + name: Install dependencies (macos-12) run: | pip install tomte[tox]==0.2.13 brew install gcc @@ -558,7 +558,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, macos-12, windows-latest] python-version: ["3.10"] timeout-minutes: 45 steps: