From 3a17c088ae3981e313787dcb7798bb9fd0d407f8 Mon Sep 17 00:00:00 2001 From: David Minarsch Date: Tue, 6 Sep 2022 11:50:20 +0200 Subject: [PATCH] chore: v1.18.0.post1 --- HISTORY.md | 11 +++++++++++ aea/__version__.py | 2 +- deploy-image/Dockerfile | 2 +- deploy-image/README.md | 2 +- develop-image/docker-env.sh | 2 +- examples/tac_deploy/Dockerfile | 2 +- scripts/install.ps1 | 2 +- scripts/install.sh | 2 +- skaffold.yaml | 4 ++-- .../test_bash_yaml/md_files/bash-quickstart.md | 2 +- user-image/docker-env.sh | 2 +- walk.py | 5 ----- 12 files changed, 22 insertions(+), 16 deletions(-) delete mode 100644 walk.py diff --git a/HISTORY.md b/HISTORY.md index a29ca8e5c5..d91b961535 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,16 @@ # Release History - open AEA +## 1.18.0.post1 (2022-09-06) + +AEA: +- Reverts a problematic package loading logic introduced in `1.18.0` + +Tests: +- Fixes flaky tests + +Chores: +- Restructures CI to avoid environment cross-effects between the package and framework tests + ## 1.18.0 (2022-09-04) AEA: diff --git a/aea/__version__.py b/aea/__version__.py index ffd3523263..e7186d16fa 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.18.0" +__version__ = "1.18.0.post1" __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 c651288765..e9f3f195d3 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.18.0 "open-aea-cli-ipfs<2.0.0,>=1.18.0" +RUN pip install --upgrade --force-reinstall open-aea[all]==1.18.0.post1 "open-aea-cli-ipfs<2.0.0,>=1.18.0" # directories and aea cli config WORKDIR /home/agents diff --git a/deploy-image/README.md b/deploy-image/README.md index 287b752aba..a865977c6a 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.18.0/packages packages +svn checkout https://github.com/valory-xyz/open-aea/tags/v1.18.0.post1/packages packages ``` ### Modify scripts diff --git a/develop-image/docker-env.sh b/develop-image/docker-env.sh index b483f11d27..073be51626 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.18.0 +DOCKER_IMAGE_TAG=valory/open-aea-develop:1.18.0.post1 # 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 9754a73624..b94c5f3051 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 aea[all]==1.18.0 +RUN pip install --upgrade --force-reinstall aea[all]==1.18.0.post1 # directories and aea cli config COPY /.aea /home/.aea diff --git a/scripts/install.ps1 b/scripts/install.ps1 index e8ad5ad88d..90f802ea8b 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.18.0 --force --no-cache-dir 2>&1 |out-string; + $output=pip install open-aea[all]==1.18.0.post1 --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 0a52ab4773..483d0da940 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.18.0 --force --no-cache-dir) + output=$(pip3 install --user open-aea[all]==1.18.0.post1 --force --no-cache-dir) if [[ $? -ne 0 ]]; then echo "$output" diff --git a/skaffold.yaml b/skaffold.yaml index fb72598f90..a2fc39f0eb 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -5,7 +5,7 @@ metadata: build: tagPolicy: envTemplate: - template: "1.18.0" + template: "1.18.0.post1" artifacts: - image: valory/open-aea-develop docker: @@ -24,7 +24,7 @@ profiles: build: tagPolicy: envTemplate: - template: "1.18.0" + template: "1.18.0.post1" artifacts: - image: valory/open-aea-docs docker: diff --git a/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md b/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md index a2ca0e12fd..2591edd527 100644 --- a/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md +++ b/tests/test_docs/test_bash_yaml/md_files/bash-quickstart.md @@ -44,7 +44,7 @@ pip install open-aea[all] pip install open-aea-cli-ipfs ``` ``` -svn checkout https://github.com/valory-xyz/open-aea/tags/v1.18.0/packages packages +svn checkout https://github.com/valory-xyz/open-aea/tags/v1.18.0.post1/packages packages ``` ``` bash diff --git a/user-image/docker-env.sh b/user-image/docker-env.sh index 4ea7ab9a92..b987032aad 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.18.0 +DOCKER_IMAGE_TAG=valory/open-aea-user:1.18.0.post1 # DOCKER_IMAGE_TAG=valory/open-aea-user:latest DOCKER_BUILD_CONTEXT_DIR=.. diff --git a/walk.py b/walk.py deleted file mode 100644 index a0eb0bc593..0000000000 --- a/walk.py +++ /dev/null @@ -1,5 +0,0 @@ -import os - -for dir, sub_dirs, files in os.walk("packages"): - if "__init__.py" not in files: - print(dir) \ No newline at end of file