Skip to content

Commit a62c194

Browse files
authored
Merge pull request #2303 from valory-xyz/chore/continue-on-error
Remove `continue-on-error` so the default applies
2 parents 52e180f + 0efdab7 commit a62c194

File tree

63 files changed

+578
-494
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+578
-494
lines changed

.github/workflows/main_workflow.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ env:
1212

1313
jobs:
1414
lock_check:
15-
continue-on-error: False
1615
runs-on: ${{ matrix.os }}
1716

1817
strategy:
@@ -46,7 +45,6 @@ jobs:
4645
ptime pipenv lock
4746
4847
install_check:
49-
continue-on-error: False
5048
runs-on: ${{ matrix.os }}
5149
strategy:
5250
matrix:
@@ -64,7 +62,6 @@ jobs:
6462
autonomy --help
6563
6664
copyright_doc_and_dependencies_check:
67-
continue-on-error: False
6865
runs-on: ${{ matrix.os }}
6966

7067
strategy:
@@ -102,7 +99,6 @@ jobs:
10299
run: tox -e check-dependencies
103100

104101
linter_checks:
105-
continue-on-error: False
106102
runs-on: ${{ matrix.os }}
107103

108104
strategy:
@@ -186,7 +182,6 @@ jobs:
186182
gitleaks detect --report-format json --report-path leak_report -v
187183
188184
test:
189-
continue-on-error: True
190185
needs:
191186
- lock_check
192187
- install_check
@@ -195,6 +190,7 @@ jobs:
195190
runs-on: ${{ matrix.os }}
196191

197192
strategy:
193+
fail-fast: false # prevents all matrix jobs from canceling if one fails
198194
matrix:
199195
os: [ ubuntu-latest, macos-latest-large, windows-latest ]
200196
python-version: [ "3.8", "3.9", "3.10.9", "3.11" ]
@@ -381,7 +377,6 @@ jobs:
381377
fail_ci_if_error: false
382378

383379
e2e:
384-
continue-on-error: True
385380
needs:
386381
- lock_check
387382
- install_check

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ jobs:
135135
136136
publish-user-images:
137137
name: Publish User Images
138-
runs-on: ubuntu-latest
138+
runs-on: ubuntu-22.04
139139
needs:
140140
- publish-autonomy-packages
141141
steps:

HISTORY.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,32 @@
11
# Release History - `open-autonomy`
22

3+
4+
# 0.19.4 (2025-02-18)
5+
6+
Autonomy:
7+
- Fixes infinite loop in dev mode #2304
8+
- Fixes autonomy deploy build command #2305
9+
- Fixes the regressed CLI tests #2306
10+
11+
Packages:
12+
- Fixes typo in `gas_pricing` #2308
13+
- Fixes the regressed packages' tests #2310
14+
15+
CI:
16+
- Removes `continue-on-error` so the default applies #2303
17+
318
# 0.19.3 (2025-02-13)
19+
420
Chores:
521
- Bumps `open-aea@1.64.0` #2307
622

723
# 0.19.2 (2025-02-05)
24+
825
Packages:
926
- Fixes char encodings for Windows #2300
1027

1128
# 0.19.1 (2025-02-04)
29+
1230
Autonomy:
1331
- Temporarily works around an issue with the path directory when using the build command #2292
1432

autonomy/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
__title__ = "open-autonomy"
2323
__description__ = "A framework for the creation of autonomous agent services."
2424
__url__ = "https://github.com/valory-xyz/open-autonomy.git"
25-
__version__ = "0.19.3"
25+
__version__ = "0.19.4"
2626
__author__ = "Valory AG"
2727
__license__ = "Apache-2.0"
2828
__copyright__ = "2021-2024 Valory AG"

autonomy/cli/deploy.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22
# ------------------------------------------------------------------------------
33
#
4-
# Copyright 2022-2024 Valory AG
4+
# Copyright 2022-2025 Valory AG
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
2121

2222
import os
2323
import shutil
24+
from itertools import chain
2425
from pathlib import Path
2526
from typing import List, Optional, cast
2627

@@ -33,7 +34,8 @@
3334
reraise_as_click_exception,
3435
)
3536
from aea.cli.utils.context import Context
36-
from aea.configurations.constants import DEFAULT_ENV_DOTFILE
37+
from aea.configurations.constants import DEFAULT_ENV_DOTFILE, PACKAGES
38+
from aea.package_manager.base import PACKAGES_FILE
3739

3840
from autonomy.chain.config import ChainType
3941
from autonomy.cli.helpers.deployment import (
@@ -65,14 +67,13 @@
6567

6668

6769
def _validate_packages_path(path: Optional[Path] = None) -> Path:
68-
"""Find packages dir for development mode."""
69-
path = Path(path or Path.cwd()).resolve()
70-
while path != path.root:
71-
if path.name == "packages" and (path / "packages.json").exists():
72-
return path
73-
path = path.parent
70+
"""Find the 'packages' directory for development mode by traversing up the path."""
71+
path = (path or Path.cwd()).resolve()
72+
for current_path in chain({path}, path.parents):
73+
if current_path.name == PACKAGES and (current_path / PACKAGES_FILE).is_file():
74+
return current_path
7475
raise click.ClickException(
75-
"Please provide path to packages directory for development mode"
76+
"Please provide a valid path to the `packages` directory for development mode."
7677
)
7778

7879

autonomy/cli/helpers/deployment.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22
# ------------------------------------------------------------------------------
33
#
4-
# Copyright 2022-2024 Valory AG
4+
# Copyright 2022-2025 Valory AG
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -66,10 +66,10 @@
6666
from autonomy.deploy.image import build_image
6767

6868

69-
def _build_dirs(build_dir: Path, mkdir: List[str]) -> None:
70-
"""Build necessary directories."""
69+
def _build_dirs(build_dir: Path, mkdir: Optional[List[str]] = None) -> None:
70+
"""Build the necessary directories."""
7171

72-
mkdirs = [(new_dir_name,) for new_dir_name in mkdir]
72+
mkdirs = [(new_dir_name,) for new_dir_name in mkdir] if mkdir else []
7373

7474
for dir_path in [
7575
(PERSISTENT_DATA_DIR,),
@@ -282,6 +282,7 @@ def build_deployment( # pylint: disable=too-many-arguments, too-many-locals
282282
build_dir.mkdir()
283283
if service_hash_id is None:
284284
service_hash_id = build_hash_id()
285+
_build_dirs(build_dir, mkdir)
285286

286287
report = generate_deployment(
287288
service_hash_id=service_hash_id,
@@ -306,8 +307,6 @@ def build_deployment( # pylint: disable=too-many-arguments, too-many-locals
306307
image_author=image_author,
307308
resources=resources,
308309
)
309-
if mkdir is not None:
310-
_build_dirs(build_dir, mkdir)
311310

312311
click.echo(report)
313312

autonomy/constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,5 @@
6565
ACN_IMAGE_NAME = os.environ.get("ACN_IMAGE_NAME", "valory/open-acn-node")
6666
DEFAULT_DOCKER_IMAGE_AUTHOR = "valory"
6767
OAR_IMAGE = "{image_author}/oar-{agent}:{version}"
68-
ABSTRACT_ROUND_ABCI_SKILL_WITH_HASH = "valory/abstract_round_abci:0.1.0:bafybeigyuls35k6rc2x5j5pcnrghfyojzqzjshhfoaco47ctfm3wjiapce"
68+
ABSTRACT_ROUND_ABCI_SKILL_WITH_HASH = "valory/abstract_round_abci:0.1.0:bafybeia27qmw6w5ds5fcrpj2475brnz742aampe3sgochloijs2l7jovai"
6969
OLAS_DOCS_URL = "https://docs.autonolas.network"

autonomy/deploy/base.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22
# ------------------------------------------------------------------------------
33
#
4-
# Copyright 2021-2024 Valory AG
4+
# Copyright 2021-2025 Valory AG
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -99,6 +99,7 @@
9999
DEFAULT_AGENT_CPU_LIMIT = float(os.environ.get("AUTONOMY_AGENT_CPU_LIMIT", 1.0))
100100
DEFAULT_AGENT_MEMORY_REQUEST = int(os.environ.get("AUTONOMY_AGENT_MEMORY_REQUEST", 256))
101101
DEFAULT_AGENT_CPU_REQUEST = float(os.environ.get("AUTONOMY_AGENT_CPU_REQUEST", 1.0))
102+
AUTONOMY_PKEY_PASSWORD = "OPEN_AUTONOMY_PRIVATE_KEY_PASSWORD" # nosec
102103

103104

104105
def tm_write_to_log() -> bool:
@@ -729,9 +730,7 @@ def generate_common_vars(self, agent_n: int) -> Dict:
729730
ENV_VAR_ID: agent_n,
730731
ENV_VAR_AEA_AGENT: self.service.agent,
731732
ENV_VAR_LOG_LEVEL: self.log_level,
732-
ENV_VAR_AEA_PASSWORD: os.environ.get(
733-
"OPEN_AUTONOMY_PRIVATE_KEY_PASSWORD", ""
734-
),
733+
ENV_VAR_AEA_PASSWORD: os.environ.get(AUTONOMY_PKEY_PASSWORD, ""),
735734
}
736735
return agent_vars
737736

autonomy/deploy/generators/docker_compose/base.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import ipaddress
2323
import os
2424
from pathlib import Path
25+
from string import Template
2526
from typing import Dict, List, Optional, Set, cast
2627

2728
import yaml
@@ -77,6 +78,7 @@
7778

7879
DEFAULT_PACKAGES_PATH = Path.cwd().absolute() / "packages"
7980
DEFAULT_OPEN_AEA_DIR: Path = Path.home().absolute() / "open-aea"
81+
AGENT_ENV_TEMPLATE = Template("agent_${node_id}.env")
8082

8183

8284
def get_docker_client() -> DockerClient:
@@ -136,7 +138,7 @@ def to_env_file(agent_vars: Dict, node_id: int, build_dir: Path) -> None:
136138
"""Create a env file under the `agent_build` folder."""
137139
agent_vars["PYTHONHASHSEED"] = 0
138140
agent_vars["LOG_FILE"] = f"/logs/aea_{node_id}.txt"
139-
env_file_path = build_dir / f"agent_{node_id}.env"
141+
env_file_path = build_dir / AGENT_ENV_TEMPLATE.substitute(node_id=node_id)
140142
with open(env_file_path, "w", encoding=DEFAULT_ENCODING) as env_file:
141143
for key, value in agent_vars.items():
142144
env_file.write(f"{key}={value}\n")
@@ -444,7 +446,7 @@ def _populate_keys(self) -> None:
444446
)
445447
key = cast(List[Dict[str, str]], self.service_builder.keys)[x][PRIVATE_KEY]
446448
keys_file = path / PRIVATE_KEY_PATH_SCHEMA.format(ledger)
447-
path.mkdir(parents=True)
449+
path.mkdir()
448450
with keys_file.open(mode="w", encoding=DEFAULT_ENCODING) as f:
449451
f.write(key)
450452

deployments/Dockerfiles/autonomy-user/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
open-autonomy[all]==0.19.3
1+
open-autonomy[all]==0.19.4
22
open-aea[all]==1.64.0
33
open-aea-cli-ipfs==1.64.0
44
open-aea-ledger-ethereum==1.64.0

0 commit comments

Comments
 (0)